diff --git a/examples/Makefile.am b/examples/Makefile.am index fabd7b2..38619c1 100644 --- a/examples/Makefile.am +++ b/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) diff --git a/examples/xm/drawing-area.scm b/examples/motif/drawing-area.scm similarity index 89% rename from examples/xm/drawing-area.scm rename to examples/motif/drawing-area.scm index 570d2ad..f026d59 100644 --- a/examples/xm/drawing-area.scm +++ b/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) diff --git a/examples/xm/list.scm b/examples/motif/list.scm similarity index 98% rename from examples/xm/list.scm rename to examples/motif/list.scm index 7ded4dc..dcce25a 100644 --- a/examples/xm/list.scm +++ b/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) diff --git a/examples/xm/main-window.scm b/examples/motif/main-window.scm similarity index 93% rename from examples/xm/main-window.scm rename to examples/motif/main-window.scm index 5836325..42adde0 100644 --- a/examples/xm/main-window.scm +++ b/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) diff --git a/examples/xm/menu-stuff.scm b/examples/motif/menu-stuff.scm similarity index 100% rename from examples/xm/menu-stuff.scm rename to examples/motif/menu-stuff.scm diff --git a/examples/xm/message-dialog.scm b/examples/motif/message-dialog.scm similarity index 95% rename from examples/xm/message-dialog.scm rename to examples/motif/message-dialog.scm index 2b7e977..782950a 100644 --- a/examples/xm/message-dialog.scm +++ b/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)) diff --git a/examples/xm/option-menu.scm b/examples/motif/option-menu.scm similarity index 93% rename from examples/xm/option-menu.scm rename to examples/motif/option-menu.scm index f32dfe0..71e3735 100644 --- a/examples/xm/option-menu.scm +++ b/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)) diff --git a/examples/xm/popup-menu.scm b/examples/motif/popup-menu.scm similarity index 88% rename from examples/xm/popup-menu.scm rename to examples/motif/popup-menu.scm index 136733a..6de3653 100644 --- a/examples/xm/popup-menu.scm +++ b/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)) diff --git a/examples/xm/pulldown-menu.scm b/examples/motif/pulldown-menu.scm similarity index 95% rename from examples/xm/pulldown-menu.scm rename to examples/motif/pulldown-menu.scm index a74d414..326929d 100644 --- a/examples/xm/pulldown-menu.scm +++ b/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)) diff --git a/examples/xm/radio-stuff.scm b/examples/motif/radio-stuff.scm similarity index 100% rename from examples/xm/radio-stuff.scm rename to examples/motif/radio-stuff.scm diff --git a/examples/xm/radio.scm b/examples/motif/radio.scm similarity index 96% rename from examples/xm/radio.scm rename to examples/motif/radio.scm index 9938309..dba6d60 100644 --- a/examples/xm/radio.scm +++ b/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)) diff --git a/examples/xm/scroll-bar.scm b/examples/motif/scroll-bar.scm similarity index 95% rename from examples/xm/scroll-bar.scm rename to examples/motif/scroll-bar.scm index 515880e..49116ba 100644 --- a/examples/xm/scroll-bar.scm +++ b/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) diff --git a/examples/xm/selection-box.scm b/examples/motif/selection-box.scm similarity index 96% rename from examples/xm/selection-box.scm rename to examples/motif/selection-box.scm index c7e3fec..fa5d060 100644 --- a/examples/xm/selection-box.scm +++ b/examples/motif/selection-box.scm @@ -3,7 +3,6 @@ ;;; Selection box demo (require 'motif) -(load-widgets shell selection-box) (define top (application-initialize 'selection)) diff --git a/examples/xm/vcr.scm b/examples/motif/vcr.scm similarity index 98% rename from examples/xm/vcr.scm rename to examples/motif/vcr.scm index 174791c..f162f1a 100644 --- a/examples/xm/vcr.scm +++ b/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)) diff --git a/examples/xaw/accel.scm b/examples/xaw/accel.scm index 8e05af4..39ca9b5 100644 --- a/examples/xaw/accel.scm +++ b/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" diff --git a/examples/xaw/clickcount.scm b/examples/xaw/clickcount.scm index bd6e341..92da934 100644 --- a/examples/xaw/clickcount.scm +++ b/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)) diff --git a/examples/xaw/dialog.scm b/examples/xaw/dialog.scm index 48a865d..cb402f7 100644 --- a/examples/xaw/dialog.scm +++ b/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)) diff --git a/examples/xaw/grip.scm b/examples/xaw/grip.scm index d39986a..1cbca53 100644 --- a/examples/xaw/grip.scm +++ b/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) diff --git a/examples/xaw/list.scm b/examples/xaw/list.scm index c757dea..2a3ee40 100644 --- a/examples/xaw/list.scm +++ b/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) diff --git a/examples/xaw/paned.scm b/examples/xaw/paned.scm index 304972e..64abfb1 100644 --- a/examples/xaw/paned.scm +++ b/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)) diff --git a/examples/xaw/panner.scm b/examples/xaw/panner.scm index b4f3e9d..bda533b 100644 --- a/examples/xaw/panner.scm +++ b/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) diff --git a/examples/xaw/popup.scm b/examples/xaw/popup.scm index 11d91e3..926cc95 100644 --- a/examples/xaw/popup.scm +++ b/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)) diff --git a/examples/xaw/porthole.scm b/examples/xaw/porthole.scm index c9e3b0f..4965489 100644 --- a/examples/xaw/porthole.scm +++ b/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)) diff --git a/examples/xaw/pulldown.scm b/examples/xaw/pulldown.scm index d459b53..3c40efc 100644 --- a/examples/xaw/pulldown.scm +++ b/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)) diff --git a/examples/xaw/scrollbar.scm b/examples/xaw/scrollbar.scm index 3b70de5..11e96ab 100644 --- a/examples/xaw/scrollbar.scm +++ b/examples/xaw/scrollbar.scm @@ -2,8 +2,7 @@ ;;; ;;; Scrollbar widget demo -(require 'xwidgets) -(load-widgets shell scrollbar) +(require 'xaw) (define top (application-initialize 'scrollbar)) diff --git a/examples/xaw/scrollbox.scm b/examples/xaw/scrollbox.scm index 307c8af..19c2ebc 100644 --- a/examples/xaw/scrollbox.scm +++ b/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)) diff --git a/examples/xaw/stripchart.scm b/examples/xaw/stripchart.scm index 2d4d661..d67477b 100644 --- a/examples/xaw/stripchart.scm +++ b/examples/xaw/stripchart.scm @@ -2,8 +2,7 @@ ;;; ;;; Stripchart widget demo -(require 'xwidgets) -(load-widgets shell stripchart) +(require 'xaw) (define top (application-initialize 'stripchart)) diff --git a/examples/xaw/text.scm b/examples/xaw/text.scm index 741401f..cc8aacf 100644 --- a/examples/xaw/text.scm +++ b/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)) diff --git a/examples/xaw/tree.scm b/examples/xaw/tree.scm index 607f0cf..a67d48e 100644 --- a/examples/xaw/tree.scm +++ b/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)) diff --git a/examples/xaw/viewport.scm b/examples/xaw/viewport.scm index 14e59ad..52f705a 100644 --- a/examples/xaw/viewport.scm +++ b/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))