Author: junrue Date: Mon Mar 20 01:52:46 2006 New Revision: 57

Modified: trunk/docs/website/index.html trunk/src/packages.lisp trunk/src/tests/uitoolkit/event-tester.lisp trunk/src/tests/uitoolkit/hello-world.lisp trunk/src/tests/uitoolkit/image-tester.lisp trunk/src/tests/uitoolkit/layout-tester.lisp trunk/src/tests/uitoolkit/windlg.lisp trunk/src/uitoolkit/widgets/menu-language.lisp Log: last round of fixes before screenshot upload; renamed menu language macro to defmenu

Modified: trunk/docs/website/index.html ============================================================================== --- trunk/docs/website/index.html (original) +++ trunk/docs/website/index.html Mon Mar 20 01:52:46 2006 @@ -15,7 +15,7 @@

<div class="NavBar"> <a class="barfirst" href="http://awayrepl.blogspot.com/">News</a> - <a class="barcenter" href="screenshots.html">Screenshots</a> + <a class="barcenter" href="https://sourceforge.net/project/screenshots.php?group_id=163034">Screenshots</a> <a class="barcenter" href="download.html">Download</a> <a class="barcenter" href="docs.html">Documentation</a> <a class="barlast" href="http://sourceforge.net/tracker/?group_id=163034&atid=826145">Bug Database</a>

Modified: trunk/src/packages.lisp ============================================================================== --- trunk/src/packages.lisp (original) +++ trunk/src/packages.lisp Mon Mar 20 01:52:46 2006 @@ -332,7 +332,7 @@ #:cursor #:cut #:default-item - #:defmenusystem + #:defmenu #:disabled-image #:dispatcher #:display-to-object

Modified: trunk/src/tests/uitoolkit/event-tester.lisp ============================================================================== --- trunk/src/tests/uitoolkit/event-tester.lisp (original) +++ trunk/src/tests/uitoolkit/event-tester.lisp Mon Mar 20 01:52:46 2006 @@ -192,18 +192,18 @@ (menubar nil)) (setf *event-tester-window* (make-instance 'gfw:top-level :dispatcher (make-instance 'event-tester-window-events) :style '(:style-workspace))) - (setf menubar (gfw:defmenusystem ((:item "&File" :dispatcher echo-md - :submenu ((:item "&Open..." :dispatcher echo-md) - (:item "&Save..." :disabled :dispatcher echo-md) - (:item "" :separator) - (:item "E&xit" :dispatcher exit-md))) - (:item "&Options" :dispatcher echo-md - :submenu ((:item "&Enabled" :checked :dispatcher echo-md) - (:item "&Tools" :dispatcher echo-md - :submenu ((:item "&Fonts" :dispatcher echo-md :disabled) - (:item "&Colors" :dispatcher echo-md))))) - (:item "&Help" :dispatcher echo-md - :submenu ((:item "&About" :dispatcher echo-md)))))) + (setf menubar (gfw:defmenu ((:item "&File" :dispatcher echo-md + :submenu ((:item "&Open..." :dispatcher echo-md) + (:item "&Save..." :disabled :dispatcher echo-md) + (:item "" :separator) + (:item "E&xit" :dispatcher exit-md))) + (:item "&Options" :dispatcher echo-md + :submenu ((:item "&Enabled" :checked :dispatcher echo-md) + (:item "&Tools" :dispatcher echo-md + :submenu ((:item "&Fonts" :dispatcher echo-md :disabled) + (:item "&Colors" :dispatcher echo-md))))) + (:item "&Help" :dispatcher echo-md + :submenu ((:item "&About" :dispatcher echo-md)))))) (setf (gfw:menu-bar *event-tester-window*) menubar) (gfw:show *event-tester-window* t)))

Modified: trunk/src/tests/uitoolkit/hello-world.lisp ============================================================================== --- trunk/src/tests/uitoolkit/hello-world.lisp (original) +++ trunk/src/tests/uitoolkit/hello-world.lisp Mon Mar 20 01:52:46 2006 @@ -62,8 +62,8 @@ (let ((menubar nil)) (setf *hello-win* (make-instance 'gfw:top-level :dispatcher (make-instance 'hellowin-events) :style '(:style-workspace))) - (setf menubar (gfw:defmenusystem ((:item "&File" - :submenu ((:item "E&xit" :callback #'exit-fn)))))) + (setf menubar (gfw:defmenu ((:item "&File" + :submenu ((:item "E&xit" :callback #'exit-fn)))))) (setf (gfw:menu-bar *hello-win*) menubar) (gfw:show *hello-win* t)))

Modified: trunk/src/tests/uitoolkit/image-tester.lisp ============================================================================== --- trunk/src/tests/uitoolkit/image-tester.lisp (original) +++ trunk/src/tests/uitoolkit/image-tester.lisp Mon Mar 20 01:52:46 2006 @@ -105,8 +105,8 @@ :style '(:style-workspace))) (setf (gfw:size *image-win*) (gfi:make-size :width 250 :height 200)) (setf (gfw:text *image-win*) "Image Tester") - (setf menubar (gfw:defmenusystem ((:item "&File" - :submenu ((:item "E&xit" :callback #'exit-image-fn)))))) + (setf menubar (gfw:defmenu ((:item "&File" + :submenu ((:item "E&xit" :callback #'exit-image-fn)))))) (setf (gfw:menu-bar *image-win*) menubar) (gfw:show *image-win* t)))

Modified: trunk/src/tests/uitoolkit/layout-tester.lisp ============================================================================== --- trunk/src/tests/uitoolkit/layout-tester.lisp (original) +++ trunk/src/tests/uitoolkit/layout-tester.lisp Mon Mar 20 01:52:46 2006 @@ -293,38 +293,38 @@ (declare (ignore disp time)) (gfw:clear-all menu) (let ((it nil) - (margin-menu (gfw:defmenusystem ((:item "Left" - :callback #'enable-left-flow-margin-items - :submenu ((:item "Decrease" - :callback #'dec-left-flow-margin) - (:item "Increase" - :callback #'inc-left-flow-margin))) - (:item "Top" - :callback #'enable-top-flow-margin-items - :submenu ((:item "Decrease" - :callback #'dec-top-flow-margin) - (:item "Increase" - :callback #'inc-top-flow-margin))) - (:item "Right" - :callback #'enable-right-flow-margin-items - :submenu ((:item "Decrease" - :callback #'dec-right-flow-margin) - (:item "Increase" - :callback #'inc-right-flow-margin))) - (:item "Bottom" - :callback #'enable-bottom-flow-margin-items - :submenu ((:item "Decrease" - :callback #'dec-bottom-flow-margin) - (:item "Increase" - :callback #'inc-bottom-flow-margin)))))) - (orient-menu (gfw:defmenusystem ((:item "Horizontal" - :callback #'set-flow-horizontal) - (:item "Vertical" - :callback #'set-flow-vertical)))) - (spacing-menu (gfw:defmenusystem ((:item "Decrease" - :callback #'decrease-flow-spacing) - (:item "Increase" - :callback #'increase-flow-spacing))))) + (margin-menu (gfw:defmenu ((:item "Left" + :callback #'enable-left-flow-margin-items + :submenu ((:item "Decrease" + :callback #'dec-left-flow-margin) + (:item "Increase" + :callback #'inc-left-flow-margin))) + (:item "Top" + :callback #'enable-top-flow-margin-items + :submenu ((:item "Decrease" + :callback #'dec-top-flow-margin) + (:item "Increase" + :callback #'inc-top-flow-margin))) + (:item "Right" + :callback #'enable-right-flow-margin-items + :submenu ((:item "Decrease" + :callback #'dec-right-flow-margin) + (:item "Increase" + :callback #'inc-right-flow-margin))) + (:item "Bottom" + :callback #'enable-bottom-flow-margin-items + :submenu ((:item "Decrease" + :callback #'dec-bottom-flow-margin) + (:item "Increase" + :callback #'inc-bottom-flow-margin)))))) + (orient-menu (gfw:defmenu ((:item "Horizontal" + :callback #'set-flow-horizontal) + (:item "Vertical" + :callback #'set-flow-vertical)))) + (spacing-menu (gfw:defmenu ((:item "Decrease" + :callback #'decrease-flow-spacing) + (:item "Increase" + :callback #'increase-flow-spacing))))) (gfw:append-submenu menu "Margin" margin-menu nil) (gfw:append-submenu menu "Orientation" orient-menu #'check-flow-orient-items) (gfw:append-submenu menu "Spacing" spacing-menu #'enable-flow-spacing-items) @@ -352,27 +352,28 @@ :layout (make-instance 'gfw:flow-layout :spacing +spacing-delta+ :margins +margin-delta+))) - (setf menubar (gfw:defmenusystem ((:item "&File" - :submenu ((:item "E&xit" - :callback #'exit-layout-callback))) - (:item "&Children" - :submenu ((:item "Add" - :submenu ((:item "Button" :dispatcher add-btn-disp) - (:item "Label" :dispatcher add-text-label-disp) - (:item "Panel" :dispatcher add-panel-disp))) - (:item "Remove" :dispatcher rem-menu-disp - :submenu ((:item ""))) - (:item "Visible" :dispatcher vis-menu-disp - :submenu ((:item ""))))) - (:item "&Window" - :submenu ((:item "Modify Layout" :callback #'flow-mod-callback - :submenu ((:item ""))) - (:item "Select Layout" - :submenu ((:item "Flow"))) - (:item "Pack" :dispatcher pack-disp)))))) + (setf menubar (gfw:defmenu ((:item "&File" + :submenu ((:item "E&xit" + :callback #'exit-layout-callback))) + (:item "&Children" + :submenu ((:item "Add" + :submenu ((:item "Button" :dispatcher add-btn-disp) + (:item "Label" :dispatcher add-text-label-disp) + (:item "Panel" :dispatcher add-panel-disp))) + (:item "Remove" :dispatcher rem-menu-disp + :submenu ((:item ""))) + (:item "Visible" :dispatcher vis-menu-disp + :submenu ((:item ""))))) + (:item "&Window" + :submenu ((:item "Modify Layout" :callback #'flow-mod-callback + :submenu ((:item ""))) + (:item "Select Layout" + :submenu ((:item "Flow"))) + (:item "Pack" :dispatcher pack-disp)))))) (setf (gfw:menu-bar *layout-tester-win*) menubar) (dotimes (i 3) (add-layout-tester-widget 'gfw:button :push-button)) + (setf (gfw:text *layout-tester-win*) "Layout Tester") (gfw:pack *layout-tester-win*) (gfw:show *layout-tester-win* t)))

Modified: trunk/src/tests/uitoolkit/windlg.lisp ============================================================================== --- trunk/src/tests/uitoolkit/windlg.lisp (original) +++ trunk/src/tests/uitoolkit/windlg.lisp Mon Mar 20 01:52:46 2006 @@ -103,12 +103,12 @@ (let ((menubar nil)) (setf *main-win* (make-instance 'gfw:top-level :dispatcher (make-instance 'main-win-events) :style '(:style-workspace))) - (setf menubar (gfw:defmenusystem ((:item "&File" - :submenu ((:item "E&xit" :callback #'exit-callback))) - (:item "&Windows" - :submenu ((:item "&Borderless" :callback #'create-borderless-win) - (:item "&Mini Frame" :callback #'create-miniframe-win) - (:item "&Palette" :callback #'create-palette-win)))))) + (setf menubar (gfw:defmenu ((:item "&File" + :submenu ((:item "E&xit" :callback #'exit-callback))) + (:item "&Windows" + :submenu ((:item "&Borderless" :callback #'create-borderless-win) + (:item "&Mini Frame" :callback #'create-miniframe-win) + (:item "&Palette" :callback #'create-palette-win)))))) (setf (gfw:menu-bar *main-win*) menubar) (gfw:show *main-win* t)))

Modified: trunk/src/uitoolkit/widgets/menu-language.lisp ============================================================================== --- trunk/src/uitoolkit/widgets/menu-language.lisp (original) +++ trunk/src/uitoolkit/widgets/menu-language.lisp Mon Mar 20 01:52:46 2006 @@ -38,14 +38,14 @@ ;;;

#| -(gfw:defmenusystem ((:item "&File" :submenu ((:item "&Open...") - (:item "&Save..." :disabled) - (:item :separator) - (:item "E&xit" :callback #'some-fn))) - (:item "&Options" :submenu ((:item "&Enabled" :checked) - (:item "&Tools" :submenu ((:item "&Fonts" :disabled) - (:item "&Colors"))))) - (:item "&Help" :submenu ((:item "&About" :image some-image))))) +(gfw:defmenu ((:item "&File" :submenu ((:item "&Open...") + (:item "&Save..." :disabled) + (:item :separator) + (:item "E&xit" :callback #'some-fn))) + (:item "&Options" :submenu ((:item "&Enabled" :checked) + (:item "&Tools" :submenu ((:item "&Fonts" :disabled) + (:item "&Colors"))))) + (:item "&Help" :submenu ((:item "&About" :image some-image))))) |#

;;; @@ -224,7 +224,7 @@ ;;; top-level API for the menu language ;;;

-(defmacro defmenusystem (sexp) +(defmacro defmenu (sexp) (let ((gen (gensym))) `(let ((,gen (make-instance 'win32-menu-generator))) ,@(generate-menusystem-code sexp gen)