* Renamed examples/xm into examples/motif.

* Fixed example files so that they fit with the new xaw.scm and motif.scm.


git-svn-id: svn://svn.zoy.org/elk/trunk@88 55e467fa-43c5-0310-a8a2-de718669efc6

examples/Makefile.am

@@ -85,20 +85,20 @@ xlib_DATA = \
 	xlib/picture.scm \
 	$(NULL)
 
-xmdir = $(examplesdir)/xm
-xm_DATA = \
-	xm/scroll-bar.scm \
-	xm/radio.scm \
-	xm/message-dialog.scm \
-	xm/drawing-area.scm \
-	xm/radio-stuff.scm \
-	xm/popup-menu.scm \
-	xm/pulldown-menu.scm \
-	xm/main-window.scm \
-	xm/menu-stuff.scm \
-	xm/vcr.scm \
-	xm/option-menu.scm \
-	xm/list.scm \
-	xm/selection-box.scm \
+motifdir = $(examplesdir)/motif
+motif_DATA = \
+	motif/scroll-bar.scm \
+	motif/radio.scm \
+	motif/message-dialog.scm \
+	motif/drawing-area.scm \
+	motif/radio-stuff.scm \
+	motif/popup-menu.scm \
+	motif/pulldown-menu.scm \
+	motif/main-window.scm \
+	motif/menu-stuff.scm \
+	motif/vcr.scm \
+	motif/option-menu.scm \
+	motif/list.scm \
+	motif/selection-box.scm \
 	$(NULL)
 

examples/motif/drawing-area.scm

@@ -3,8 +3,6 @@
 ;;; Drawing area demo
 
 (require 'motif)
-(print "loading widgets\n")
-(load-widgets shell drawing-area)
 
 (define top (application-initialize 'drawing-area))
 (set-values! top 'width 300 'height 100)

examples/motif/list.scm

@@ -3,7 +3,6 @@
 ;;; List widget demo (directory browser) for Motif
 
 (require 'motif)
-(load-widgets shell form label push-button list)
 (require 'unix)
 (require 'sort 'qsort.scm)
 

examples/motif/main-window.scm

@@ -3,8 +3,6 @@
 ;;; Main window demo
 
 (require 'motif)
-(load-widgets drawing-area shell main-window scroll-bar row-column
-	      cascade-button command)
 
 (define top (application-initialize 'main-window))
 (set-values! top 'width 500 'height 800)

examples/motif/message-dialog.scm

@@ -3,7 +3,6 @@
 ;;; Message box dialog demo
 
 (require 'motif)
-(load-widgets shell message-box row-column toggle-button push-button)
 (load 'radio-stuff.scm)
 
 (define top (application-initialize 'message-box))

examples/motif/option-menu.scm

@@ -3,7 +3,6 @@
 ;;; Option menu demo
 
 (require 'motif)
-(load-widgets shell row-column cascade-button push-button label separator)
 (load 'menu-stuff.scm)
 
 (define top (application-initialize 'option))

examples/motif/popup-menu.scm

@@ -3,8 +3,6 @@
 ;;; Popup menu demo
 
 (require 'motif)
-(load-widgets shell row-column cascade-button push-button label separator
-              drawing-area)
 (load 'menu-stuff.scm)
 
 (define top (application-initialize 'popup))

examples/motif/pulldown-menu.scm

@@ -3,7 +3,6 @@
 ;;; Pulldown menu demo
 
 (require 'motif)
-(load-widgets shell row-column cascade-button push-button label separator)
 (load 'menu-stuff.scm)
 
 (define top (application-initialize 'pulldown))

examples/motif/radio.scm

@@ -3,7 +3,6 @@
 ;;; Radio box and button demo
 
 (require 'motif)
-(load-widgets shell row-column arrow-button push-button toggle-button)
 (load 'radio-stuff.scm)
 
 (define top (application-initialize 'radio))

examples/motif/scroll-bar.scm

@@ -3,7 +3,6 @@
 ;;; Scroll bar demo
 
 (require 'motif)
-(load-widgets shell scroll-bar)
 
 (define top (application-initialize 'scrollbar))
 (set-values! top 'allow-shell-resize #t)

examples/motif/selection-box.scm

@@ -3,7 +3,6 @@
 ;;; Selection box demo
 
 (require 'motif)
-(load-widgets shell selection-box)
 
 (define top (application-initialize 'selection))
 

examples/motif/vcr.scm

@@ -6,7 +6,6 @@
 ;; Initialization
 
 (require 'motif)
-(load-widgets shell bulletin-board row-column label push-button)
 
 (define top (application-initialize 'vcr))
 (define con (widget-context top))

examples/xaw/accel.scm

@@ -5,8 +5,7 @@
 ;;; Based on an example program (xtryaccel.c) from the O'Reilly
 ;;; book `X Toolkit Intrinsics Programming Manual'
 
-(require 'xwidgets)
-(load-widgets command box shell)
+(require 'xaw)
 
 (define top (application-initialize 'accel
   "*bye.label:    Goodbye"

examples/xaw/clickcount.scm

@@ -5,8 +5,7 @@
 ;;; Based on an example program (xclickcount.c) from the O'Reilly
 ;;; collection of Xt example programs.
 
-(require 'xwidgets)
-(load-widgets shell label)
+(require 'xaw)
 
 (define top (application-initialize 'clickcount))
 (define con (widget-context top))

examples/xaw/dialog.scm

@@ -2,8 +2,7 @@
 ;;;
 ;;; Dialog box demo
 
-(require 'xwidgets)
-(load-widgets shell ascii dialog command box label)
+(require 'xaw)
 
 (define top (application-initialize 'dialog))
 (define dpy (widget-display top))

examples/xaw/grip.scm

@@ -2,8 +2,7 @@
 ;;;
 ;;; Grip widget demo
 
-(require 'xwidgets)
-(load-widgets shell grip)
+(require 'xaw)
 
 (define top (application-initialize 'grip))
 (set-values! top 'width 50 'height 50)

examples/xaw/list.scm

@@ -2,8 +2,7 @@
 ;;;
 ;;; List widget demo (directory browser)
 
-(require 'xwidgets)
-(load-widgets shell form label command list)
+(require 'xaw)
 (require 'unix)
 (require 'sort 'qsort.scm)
 

examples/xaw/paned.scm

@@ -2,8 +2,7 @@
 ;;;
 ;;; Paned widget demo
 
-(require 'xwidgets)
-(load-widgets shell label command paned)
+(require 'xaw)
 
 (define top (application-initialize 'paned))
 

examples/xaw/panner.scm

@@ -2,8 +2,7 @@
 ;;;
 ;;; Panner widget demo
 
-(require 'xwidgets)
-(load-widgets shell panner)
+(require 'xaw)
 
 (define top (application-initialize 'panner))
 (set-values! top 'width 150 'height 150)

examples/xaw/popup.scm

@@ -2,8 +2,7 @@
 ;;;
 ;;; Popup menu demo
 
-(require 'xwidgets)
-(load-widgets shell simplemenu smebsb label)
+(require 'xaw)
 
 (define top (application-initialize 'popup))
 

examples/xaw/porthole.scm

@@ -3,8 +3,7 @@
 ;;; Porthole widget demo
 ;;; This only works with X11R5; there is no clock widget in X11R6-Xaw.
 
-(require 'xwidgets)
-(load-widgets shell clock form panner porthole)
+(require 'xaw)
 
 (define top (application-initialize 'porthole))
 

examples/xaw/pulldown.scm

@@ -2,8 +2,7 @@
 ;;;
 ;;; Pulldown menu demo
 
-(require 'xwidgets)
-(load-widgets shell menubutton simplemenu smebsb smeline sme)
+(require 'xaw)
 
 (define top (application-initialize 'pulldown))
 

examples/xaw/scrollbar.scm

@@ -2,8 +2,7 @@
 ;;;
 ;;; Scrollbar widget demo
 
-(require 'xwidgets)
-(load-widgets shell scrollbar)
+(require 'xaw)
 
 (define top (application-initialize 'scrollbar))
 

examples/xaw/scrollbox.scm

@@ -2,8 +2,7 @@
 ;;;
 ;;; Scroll box demo
 
-(require 'xwidgets)
-(load-widgets shell command box label)
+(require 'xaw)
 
 (define items (list 'Helvetica 'Courier 'Times 'Palatino 'Zapf\ Chancery
 		    'Zapf\ Dingbats))

examples/xaw/stripchart.scm

@@ -2,8 +2,7 @@
 ;;;
 ;;; Stripchart widget demo
 
-(require 'xwidgets)
-(load-widgets shell stripchart)
+(require 'xaw)
 
 (define top (application-initialize 'stripchart))
 

examples/xaw/text.scm

@@ -3,8 +3,7 @@
 ;;; Trivial text widget demo (the text widget isn't fully supported
 ;;; by Elk)
 
-(require 'xwidgets)
-(load-widgets shell ascii box command label)
+(require 'xaw)
 
 (define top (application-initialize 'text))
 

examples/xaw/tree.scm

@@ -12,8 +12,7 @@
 					    'label (car l))))
 	      (set-values! w 'tree-parent p))))))
 
-(require 'xwidgets)
-(load-widgets shell label tree)
+(require 'xaw)
 
 (define top (application-initialize 'tree))
 

examples/xaw/viewport.scm

@@ -3,8 +3,7 @@
 ;;; Viewport widget demo
 ;;; This only works with X11R5; there is no clock widget in X11R6-Xaw.
 
-(require 'xwidgets)
-(load-widgets shell clock viewport)
+(require 'xaw)
 
 (define top (application-initialize 'viewport))