diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ee9e23e873..c6fc965d0e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -108,11 +108,6 @@ jobs:
configure_flags: --with-directfb --enable-pch --disable-stc
skip_samples: true
allow_warnings: true
- - name: Ubuntu 18.04 wxMotif
- runner: ubuntu-latest
- container: ubuntu:18.04
- configure_flags: --with-motif --enable-pch --disable-stc
- skip_samples: true
- name: Ubuntu 18.04 wxQt
runner: ubuntu-latest
container: ubuntu:18.04
diff --git a/.github/workflows/ci_mac.yml b/.github/workflows/ci_mac.yml
index 466121d77f..da7880569b 100644
--- a/.github/workflows/ci_mac.yml
+++ b/.github/workflows/ci_mac.yml
@@ -19,14 +19,12 @@ on:
- 'include/wx/dfb/**'
- 'include/wx/gtk/**'
- 'include/wx/gtk1/**'
- - 'include/wx/motif/**'
- 'include/wx/msw/**'
- 'include/wx/x11/**'
- 'locale/**'
- 'src/dfb/**'
- 'src/gtk/**'
- 'src/gtk1/**'
- - 'src/motif/**'
- 'src/msw/**'
- 'src/x11/**'
- '*.md'
@@ -49,14 +47,12 @@ on:
- 'include/wx/dfb/**'
- 'include/wx/gtk/**'
- 'include/wx/gtk1/**'
- - 'include/wx/motif/**'
- 'include/wx/msw/**'
- 'include/wx/x11/**'
- 'locale/**'
- 'src/dfb/**'
- 'src/gtk/**'
- 'src/gtk1/**'
- - 'src/motif/**'
- 'src/msw/**'
- 'src/x11/**'
- '*.md'
diff --git a/.github/workflows/ci_mac_xcode.yml b/.github/workflows/ci_mac_xcode.yml
index e8017e3369..08fe26bb61 100644
--- a/.github/workflows/ci_mac_xcode.yml
+++ b/.github/workflows/ci_mac_xcode.yml
@@ -19,14 +19,12 @@ on:
- 'include/wx/dfb/**'
- 'include/wx/gtk/**'
- 'include/wx/gtk1/**'
- - 'include/wx/motif/**'
- 'include/wx/msw/**'
- 'include/wx/x11/**'
- 'locale/**'
- 'src/dfb/**'
- 'src/gtk/**'
- 'src/gtk1/**'
- - 'src/motif/**'
- 'src/msw/**'
- 'src/x11/**'
- '*.md'
@@ -49,14 +47,12 @@ on:
- 'include/wx/dfb/**'
- 'include/wx/gtk/**'
- 'include/wx/gtk1/**'
- - 'include/wx/motif/**'
- 'include/wx/msw/**'
- 'include/wx/x11/**'
- 'locale/**'
- 'src/dfb/**'
- 'src/gtk/**'
- 'src/gtk1/**'
- - 'src/motif/**'
- 'src/msw/**'
- 'src/x11/**'
- '*.md'
diff --git a/.gitignore b/.gitignore
index 17bcc0d809..da88e35d2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -178,9 +178,6 @@
# /include/wx/html/
/include/wx/html/Makefile.in
-# /include/wx/motif/
-/include/wx/motif/Makefile.in
-
# /include/wx/msw/
/include/wx/msw/Makefile.in
/include/wx/msw/Makefile
@@ -326,9 +323,6 @@
/src/jpeg/Debug
/src/jpeg/Release
-# /src/motif/
-/src/motif/Makefile.in
-
# /src/msw/
/src/msw/Makefile.in
diff --git a/Makefile.in b/Makefile.in
index 7a0758b0d1..2fd7305429 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2367,7 +2367,6 @@ COND_TOOLKIT_MSW_WEBVIEW_HDR_PLATFORM = \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@OPENGL_HDR_PLATFORM \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@ = wx/gtk/glcanvas.h wx/unix/glegl.h \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@ wx/unix/glx11.h
-@COND_TOOLKIT_MOTIF@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h
@COND_TOOLKIT_MSW@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h
@COND_TOOLKIT_OSX_COCOA@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h
@COND_TOOLKIT_QT@OPENGL_HDR_PLATFORM = wx/qt/glcanvas.h
@@ -2498,30 +2497,6 @@ COND_TOOLKIT_X11_BASE_OSX_SRC = \
src/osx/core/secretstore.cpp \
src/osx/core/uilocale.mm
@COND_TOOLKIT_X11@BASE_OSX_SRC = $(COND_TOOLKIT_X11_BASE_OSX_SRC)
-COND_TOOLKIT_MOTIF_BASE_OSX_SRC = \
- src/common/fdiodispatcher.cpp \
- src/common/selectdispatcher.cpp \
- src/unix/appunix.cpp \
- src/unix/dir.cpp \
- src/unix/dlunix.cpp \
- src/unix/epolldispatcher.cpp \
- src/unix/evtloopunix.cpp \
- src/unix/fdiounix.cpp \
- src/unix/snglinst.cpp \
- src/unix/stackwalk.cpp \
- src/unix/timerunx.cpp \
- src/unix/threadpsx.cpp \
- src/unix/utilsunx.cpp \
- src/unix/wakeuppipe.cpp \
- src/unix/fswatcher_kqueue.cpp \
- src/unix/mimetype.cpp \
- src/osx/core/cfstring.cpp \
- src/osx/core/evtloop_cf.cpp \
- src/osx/core/strconv_cf.cpp \
- src/osx/cocoa/utils_base.mm \
- src/osx/core/secretstore.cpp \
- src/osx/core/uilocale.mm
-@COND_TOOLKIT_MOTIF@BASE_OSX_SRC = $(COND_TOOLKIT_MOTIF_BASE_OSX_SRC)
COND_TOOLKIT__BASE_OSX_SRC = \
src/common/fdiodispatcher.cpp \
src/common/selectdispatcher.cpp \
@@ -2546,7 +2521,18 @@ COND_TOOLKIT__BASE_OSX_SRC = \
src/osx/core/secretstore.cpp \
src/osx/core/uilocale.mm
@COND_TOOLKIT_@BASE_OSX_SRC = $(COND_TOOLKIT__BASE_OSX_SRC)
-COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \
+COND_TOOLKIT__BASE_OSX_HDR = \
+ wx/unix/app.h \
+ wx/unix/apptbase.h \
+ wx/unix/apptrait.h \
+ wx/unix/chkconf.h \
+ wx/unix/evtloop.h \
+ wx/unix/evtloopsrc.h \
+ wx/unix/pipe.h \
+ wx/unix/stackwalk.h \
+ wx/unix/tls.h \
+ wx/unix/fswatcher_kqueue.h \
+ wx/unix/mimetype.h \
wx/osx/core/cfdataref.h \
wx/osx/core/cfref.h \
wx/osx/core/cfstring.h \
@@ -2561,19 +2547,8 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \
wx/osx/core/cftype.h \
wx/osx/core/joystick.h \
wx/osx/core/mimetype.h \
- wx/osx/core/dataview.h \
- wx/unix/app.h \
- wx/unix/apptbase.h \
- wx/unix/apptrait.h \
- wx/unix/chkconf.h \
- wx/unix/evtloop.h \
- wx/unix/evtloopsrc.h \
- wx/unix/pipe.h \
- wx/unix/stackwalk.h \
- wx/unix/tls.h \
- wx/unix/fswatcher_kqueue.h \
- wx/osx/fswatcher_fsevents.h
-@COND_TOOLKIT_OSX_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR)
+ wx/osx/core/dataview.h
+@COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR)
COND_TOOLKIT_COCOA_BASE_OSX_HDR = \
wx/unix/app.h \
wx/unix/apptbase.h \
@@ -2630,6 +2605,34 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR = \
wx/osx/core/mimetype.h \
wx/osx/core/dataview.h
@COND_TOOLKIT_GTK@BASE_OSX_HDR = $(COND_TOOLKIT_GTK_BASE_OSX_HDR)
+COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \
+ wx/osx/core/cfdataref.h \
+ wx/osx/core/cfref.h \
+ wx/osx/core/cfstring.h \
+ wx/osx/core/hid.h \
+ wx/osx/core/evtloop.h \
+ wx/osx/core/objcid.h \
+ wx/osx/core/private.h \
+ wx/osx/core/colour.h \
+ wx/osx/carbon/region.h \
+ wx/osx/core/cfdictionary.h \
+ wx/osx/core/cfarray.h \
+ wx/osx/core/cftype.h \
+ wx/osx/core/joystick.h \
+ wx/osx/core/mimetype.h \
+ wx/osx/core/dataview.h \
+ wx/unix/app.h \
+ wx/unix/apptbase.h \
+ wx/unix/apptrait.h \
+ wx/unix/chkconf.h \
+ wx/unix/evtloop.h \
+ wx/unix/evtloopsrc.h \
+ wx/unix/pipe.h \
+ wx/unix/stackwalk.h \
+ wx/unix/tls.h \
+ wx/unix/fswatcher_kqueue.h \
+ wx/osx/fswatcher_fsevents.h
+@COND_TOOLKIT_OSX_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR)
COND_TOOLKIT_X11_BASE_OSX_HDR = \
wx/unix/app.h \
wx/unix/apptbase.h \
@@ -2658,62 +2661,6 @@ COND_TOOLKIT_X11_BASE_OSX_HDR = \
wx/osx/core/mimetype.h \
wx/osx/core/dataview.h
@COND_TOOLKIT_X11@BASE_OSX_HDR = $(COND_TOOLKIT_X11_BASE_OSX_HDR)
-COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \
- wx/unix/app.h \
- wx/unix/apptbase.h \
- wx/unix/apptrait.h \
- wx/unix/chkconf.h \
- wx/unix/evtloop.h \
- wx/unix/evtloopsrc.h \
- wx/unix/pipe.h \
- wx/unix/stackwalk.h \
- wx/unix/tls.h \
- wx/unix/fswatcher_kqueue.h \
- wx/unix/mimetype.h \
- wx/osx/core/cfdataref.h \
- wx/osx/core/cfref.h \
- wx/osx/core/cfstring.h \
- wx/osx/core/hid.h \
- wx/osx/core/evtloop.h \
- wx/osx/core/objcid.h \
- wx/osx/core/private.h \
- wx/osx/core/colour.h \
- wx/osx/carbon/region.h \
- wx/osx/core/cfdictionary.h \
- wx/osx/core/cfarray.h \
- wx/osx/core/cftype.h \
- wx/osx/core/joystick.h \
- wx/osx/core/mimetype.h \
- wx/osx/core/dataview.h
-@COND_TOOLKIT_MOTIF@BASE_OSX_HDR = $(COND_TOOLKIT_MOTIF_BASE_OSX_HDR)
-COND_TOOLKIT__BASE_OSX_HDR = \
- wx/unix/app.h \
- wx/unix/apptbase.h \
- wx/unix/apptrait.h \
- wx/unix/chkconf.h \
- wx/unix/evtloop.h \
- wx/unix/evtloopsrc.h \
- wx/unix/pipe.h \
- wx/unix/stackwalk.h \
- wx/unix/tls.h \
- wx/unix/fswatcher_kqueue.h \
- wx/unix/mimetype.h \
- wx/osx/core/cfdataref.h \
- wx/osx/core/cfref.h \
- wx/osx/core/cfstring.h \
- wx/osx/core/hid.h \
- wx/osx/core/evtloop.h \
- wx/osx/core/objcid.h \
- wx/osx/core/private.h \
- wx/osx/core/colour.h \
- wx/osx/carbon/region.h \
- wx/osx/core/cfdictionary.h \
- wx/osx/core/cfarray.h \
- wx/osx/core/cftype.h \
- wx/osx/core/joystick.h \
- wx/osx/core/mimetype.h \
- wx/osx/core/dataview.h
-@COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR)
@COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR)
COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \
wx/unix/app.h \
@@ -2902,20 +2849,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_LOWLEVEL_HDR = \
wx/gtk/window.h \
wx/gtk/mimetype.h
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@LOWLEVEL_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_LOWLEVEL_HDR)
-COND_TOOLKIT_MOTIF_LOWLEVEL_HDR = \
- wx/generic/caret.h \
- wx/generic/imaglist.h \
- wx/unix/fontutil.h \
- wx/unix/utilsx11.h \
- wx/unix/sound.h \
- wx/unix/taskbarx11.h \
- wx/unix/joystick.h \
- wx/x11/bitmap.h \
- wx/x11/brush.h \
- wx/x11/palette.h \
- wx/x11/pen.h \
- wx/x11/region.h
-@COND_TOOLKIT_MOTIF@LOWLEVEL_HDR = $(COND_TOOLKIT_MOTIF_LOWLEVEL_HDR)
COND_TOOLKIT_MSW_LOWLEVEL_HDR = \
wx/msw/nonownedwnd.h \
wx/msw/ole/activex.h \
@@ -3208,76 +3141,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_GUI_HDR = \
wx/gtk/dvrenderer.h \
wx/gtk/srchctrl.h
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@GUI_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4_GUI_HDR)
-COND_TOOLKIT_MOTIF_GUI_HDR = \
- wx/generic/clrpickerg.h \
- wx/generic/collpaneg.h \
- wx/generic/colrdlgg.h \
- wx/generic/ctrlsub.h \
- wx/generic/dirdlgg.h \
- wx/generic/fdrepdlg.h \
- wx/generic/filepickerg.h \
- wx/generic/fontdlgg.h \
- wx/generic/fontpickerg.h \
- wx/generic/listctrl.h \
- wx/generic/mdig.h \
- wx/generic/notebook.h \
- wx/generic/prntdlgg.h \
- wx/generic/statline.h \
- wx/generic/statusbr.h \
- wx/generic/tabg.h \
- wx/motif/accel.h \
- wx/motif/app.h \
- wx/motif/bmpbuttn.h \
- wx/motif/bmpmotif.h \
- wx/motif/button.h \
- wx/motif/checkbox.h \
- wx/motif/checklst.h \
- wx/motif/chkconf.h \
- wx/motif/choice.h \
- wx/motif/clipbrd.h \
- wx/motif/colour.h \
- wx/motif/combobox.h \
- wx/motif/control.h \
- wx/motif/ctrlsub.h \
- wx/motif/cursor.h \
- wx/motif/dataform.h \
- wx/motif/dataobj.h \
- wx/motif/dataobj2.h \
- wx/motif/dc.h \
- wx/motif/dcclient.h \
- wx/motif/dcmemory.h \
- wx/motif/dcprint.h \
- wx/motif/dcscreen.h \
- wx/motif/dialog.h \
- wx/motif/dnd.h \
- wx/motif/filedlg.h \
- wx/motif/font.h \
- wx/motif/frame.h \
- wx/motif/gauge.h \
- wx/motif/icon.h \
- wx/motif/listbox.h \
- wx/motif/menu.h \
- wx/motif/menuitem.h \
- wx/motif/minifram.h \
- wx/motif/msgdlg.h \
- wx/motif/popupwin.h \
- wx/motif/print.h \
- wx/motif/private.h \
- wx/motif/radiobox.h \
- wx/motif/radiobut.h \
- wx/motif/scrolbar.h \
- wx/motif/slider.h \
- wx/motif/spinbutt.h \
- wx/motif/statbmp.h \
- wx/motif/statbox.h \
- wx/motif/stattext.h \
- wx/motif/textctrl.h \
- wx/motif/textentry.h \
- wx/motif/tglbtn.h \
- wx/motif/toolbar.h \
- wx/motif/toplevel.h \
- wx/motif/window.h
-@COND_TOOLKIT_MOTIF@GUI_HDR = $(COND_TOOLKIT_MOTIF_GUI_HDR)
COND_TOOLKIT_MSW_GUI_HDR = \
wx/generic/clrpickerg.h \
wx/generic/collpaneg.h \
@@ -3707,7 +3570,6 @@ COND_TOOLKIT_QT_GUI_HDR = \
@COND_TOOLKIT_QT@GUI_HDR = $(COND_TOOLKIT_QT_GUI_HDR)
@COND_TOOLKIT_COCOA@MEDIA_PLATFORM_HDR =
@COND_TOOLKIT_GTK@MEDIA_PLATFORM_HDR =
-@COND_TOOLKIT_MOTIF@MEDIA_PLATFORM_HDR =
@COND_TOOLKIT_MSW@MEDIA_PLATFORM_HDR =
@COND_TOOLKIT_OSX_COCOA@MEDIA_PLATFORM_HDR =
@COND_TOOLKIT_OSX_IPHONE@MEDIA_PLATFORM_HDR =
@@ -5189,27 +5051,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS = \
monodll_gtk_window.o \
monodll_gtk_mimetype.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS = \
- monodll_generic_caret.o \
- monodll_generic_imaglist.o \
- monodll_unix_dialup.o \
- monodll_unix_fontenum.o \
- monodll_unix_fontutil.o \
- monodll_uiactionx11.o \
- monodll_utilsx11.o \
- monodll_unix_sound.o \
- monodll_taskbarcmn.o \
- monodll_unix_joystick.o \
- monodll_taskbarx11.o \
- monodll_generic_textmeasure.o \
- monodll_x11_bitmap.o \
- monodll_x11_brush.o \
- monodll_x11_palette.o \
- monodll_x11_pen.o \
- monodll_x11_region.o \
- monodll_utilsx.o \
- monodll_displayx11.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \
monodll_activex.o \
monodll_msw_app.o \
@@ -5571,76 +5412,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS = \
monodll_animate.o \
monodll_gtk_srchctrl.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS)
-COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \
- monodll_motif_accel.o \
- monodll_motif_app.o \
- monodll_motif_bmpbuttn.o \
- monodll_bmpmotif.o \
- monodll_motif_button.o \
- monodll_motif_checkbox.o \
- monodll_motif_checklst.o \
- monodll_motif_choice.o \
- monodll_motif_clipbrd.o \
- monodll_motif_colour.o \
- monodll_motif_combobox.o \
- monodll_combobox_native.o \
- monodll_motif_control.o \
- monodll_motif_cursor.o \
- monodll_motif_data.o \
- monodll_motif_dataobj.o \
- monodll_motif_dc.o \
- monodll_motif_dcclient.o \
- monodll_motif_dcmemory.o \
- monodll_motif_dcscreen.o \
- monodll_motif_dialog.o \
- monodll_motif_evtloop.o \
- monodll_motif_filedlg.o \
- monodll_motif_font.o \
- monodll_motif_frame.o \
- monodll_motif_gauge.o \
- monodll_sockmot.o \
- monodll_motif_icon.o \
- monodll_motif_listbox.o \
- monodll_motif_main.o \
- monodll_motif_menu.o \
- monodll_motif_menuitem.o \
- monodll_motif_minifram.o \
- monodll_motif_msgdlg.o \
- monodll_motif_popupwin.o \
- monodll_motif_radiobox.o \
- monodll_motif_radiobut.o \
- monodll_motif_scrolbar.o \
- monodll_motif_settings.o \
- monodll_motif_slider.o \
- monodll_motif_spinbutt.o \
- monodll_motif_statbmp.o \
- monodll_motif_statbox.o \
- monodll_motif_stattext.o \
- monodll_motif_textctrl.o \
- monodll_motif_textentry.o \
- monodll_motif_timer.o \
- monodll_motif_toolbar.o \
- monodll_motif_toplevel.o \
- monodll_motif_utils.o \
- monodll_motif_window.o \
- monodll_xmcombo.o \
- monodll_clrpickerg.o \
- monodll_collpaneg.o \
- monodll_colrdlgg.o \
- monodll_dirdlgg.o \
- monodll_generic_fdrepdlg.o \
- monodll_filepickerg.o \
- monodll_fontdlgg.o \
- monodll_fontpickerg.o \
- monodll_generic_listctrl.o \
- monodll_mdig.o \
- monodll_generic_notebook.o \
- monodll_prntdlgg.o \
- monodll_generic_statline.o \
- monodll_generic_statusbr.o \
- monodll_tabg.o \
- monodll_generic_activityindicator.o
-@COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS)
COND_TOOLKIT_MSW___GUI_SRC_OBJECTS = \
monodll_clrpickerg.o \
monodll_collpaneg.o \
@@ -6100,27 +5871,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_1 = \
monodll_gtk_window.o \
monodll_gtk_mimetype.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_1)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_1 = \
- monodll_generic_caret.o \
- monodll_generic_imaglist.o \
- monodll_unix_dialup.o \
- monodll_unix_fontenum.o \
- monodll_unix_fontutil.o \
- monodll_uiactionx11.o \
- monodll_utilsx11.o \
- monodll_unix_sound.o \
- monodll_taskbarcmn.o \
- monodll_unix_joystick.o \
- monodll_taskbarx11.o \
- monodll_generic_textmeasure.o \
- monodll_x11_bitmap.o \
- monodll_x11_brush.o \
- monodll_x11_palette.o \
- monodll_x11_pen.o \
- monodll_x11_region.o \
- monodll_utilsx.o \
- monodll_displayx11.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_1)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \
monodll_activex.o \
monodll_msw_app.o \
@@ -6242,9 +5992,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 = \
@COND_TOOLKIT_COCOA@ monodll_src_cocoa_mediactrl.o
@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS = \
@COND_TOOLKIT_GTK@ monodll_unix_mediactrl.o monodll_mediactrl_gstplayer.o
-@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS = \
-@COND_TOOLKIT_MOTIF@ monodll_unix_mediactrl.o \
-@COND_TOOLKIT_MOTIF@ monodll_mediactrl_gstplayer.o
@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS = \
@COND_TOOLKIT_MSW@ monodll_mediactrl_am.o monodll_mediactrl_wmp10.o \
@COND_TOOLKIT_MSW@ monodll_mediactrl_qt.o
@@ -7198,27 +6945,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_2 = \
monolib_gtk_window.o \
monolib_gtk_mimetype.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_2)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_2 = \
- monolib_generic_caret.o \
- monolib_generic_imaglist.o \
- monolib_unix_dialup.o \
- monolib_unix_fontenum.o \
- monolib_unix_fontutil.o \
- monolib_uiactionx11.o \
- monolib_utilsx11.o \
- monolib_unix_sound.o \
- monolib_taskbarcmn.o \
- monolib_unix_joystick.o \
- monolib_taskbarx11.o \
- monolib_generic_textmeasure.o \
- monolib_x11_bitmap.o \
- monolib_x11_brush.o \
- monolib_x11_palette.o \
- monolib_x11_pen.o \
- monolib_x11_region.o \
- monolib_utilsx.o \
- monolib_displayx11.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_2)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \
monolib_activex.o \
monolib_msw_app.o \
@@ -7580,76 +7306,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_1 = \
monolib_animate.o \
monolib_gtk_srchctrl.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_1)
-COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \
- monolib_motif_accel.o \
- monolib_motif_app.o \
- monolib_motif_bmpbuttn.o \
- monolib_bmpmotif.o \
- monolib_motif_button.o \
- monolib_motif_checkbox.o \
- monolib_motif_checklst.o \
- monolib_motif_choice.o \
- monolib_motif_clipbrd.o \
- monolib_motif_colour.o \
- monolib_motif_combobox.o \
- monolib_combobox_native.o \
- monolib_motif_control.o \
- monolib_motif_cursor.o \
- monolib_motif_data.o \
- monolib_motif_dataobj.o \
- monolib_motif_dc.o \
- monolib_motif_dcclient.o \
- monolib_motif_dcmemory.o \
- monolib_motif_dcscreen.o \
- monolib_motif_dialog.o \
- monolib_motif_evtloop.o \
- monolib_motif_filedlg.o \
- monolib_motif_font.o \
- monolib_motif_frame.o \
- monolib_motif_gauge.o \
- monolib_sockmot.o \
- monolib_motif_icon.o \
- monolib_motif_listbox.o \
- monolib_motif_main.o \
- monolib_motif_menu.o \
- monolib_motif_menuitem.o \
- monolib_motif_minifram.o \
- monolib_motif_msgdlg.o \
- monolib_motif_popupwin.o \
- monolib_motif_radiobox.o \
- monolib_motif_radiobut.o \
- monolib_motif_scrolbar.o \
- monolib_motif_settings.o \
- monolib_motif_slider.o \
- monolib_motif_spinbutt.o \
- monolib_motif_statbmp.o \
- monolib_motif_statbox.o \
- monolib_motif_stattext.o \
- monolib_motif_textctrl.o \
- monolib_motif_textentry.o \
- monolib_motif_timer.o \
- monolib_motif_toolbar.o \
- monolib_motif_toplevel.o \
- monolib_motif_utils.o \
- monolib_motif_window.o \
- monolib_xmcombo.o \
- monolib_clrpickerg.o \
- monolib_collpaneg.o \
- monolib_colrdlgg.o \
- monolib_dirdlgg.o \
- monolib_generic_fdrepdlg.o \
- monolib_filepickerg.o \
- monolib_fontdlgg.o \
- monolib_fontpickerg.o \
- monolib_generic_listctrl.o \
- monolib_mdig.o \
- monolib_generic_notebook.o \
- monolib_prntdlgg.o \
- monolib_generic_statline.o \
- monolib_generic_statusbr.o \
- monolib_tabg.o \
- monolib_generic_activityindicator.o
-@COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1)
COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 = \
monolib_clrpickerg.o \
monolib_collpaneg.o \
@@ -8109,27 +7765,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_3 = \
monolib_gtk_window.o \
monolib_gtk_mimetype.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_3)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_3 = \
- monolib_generic_caret.o \
- monolib_generic_imaglist.o \
- monolib_unix_dialup.o \
- monolib_unix_fontenum.o \
- monolib_unix_fontutil.o \
- monolib_uiactionx11.o \
- monolib_utilsx11.o \
- monolib_unix_sound.o \
- monolib_taskbarcmn.o \
- monolib_unix_joystick.o \
- monolib_taskbarx11.o \
- monolib_generic_textmeasure.o \
- monolib_x11_bitmap.o \
- monolib_x11_brush.o \
- monolib_x11_palette.o \
- monolib_x11_pen.o \
- monolib_x11_region.o \
- monolib_utilsx.o \
- monolib_displayx11.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_3)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \
monolib_activex.o \
monolib_msw_app.o \
@@ -8251,9 +7886,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 = \
@COND_TOOLKIT_COCOA@ monolib_src_cocoa_mediactrl.o
@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
@COND_TOOLKIT_GTK@ monolib_unix_mediactrl.o monolib_mediactrl_gstplayer.o
-@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
-@COND_TOOLKIT_MOTIF@ monolib_unix_mediactrl.o \
-@COND_TOOLKIT_MOTIF@ monolib_mediactrl_gstplayer.o
@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
@COND_TOOLKIT_MSW@ monolib_mediactrl_am.o monolib_mediactrl_wmp10.o \
@COND_TOOLKIT_MSW@ monolib_mediactrl_qt.o
@@ -9361,27 +8993,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_4 = \
coredll_gtk_window.o \
coredll_mimetype.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_4)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_4 = \
- coredll_generic_caret.o \
- coredll_generic_imaglist.o \
- coredll_unix_dialup.o \
- coredll_unix_fontenum.o \
- coredll_unix_fontutil.o \
- coredll_uiactionx11.o \
- coredll_utilsx11.o \
- coredll_unix_sound.o \
- coredll_taskbarcmn.o \
- coredll_unix_joystick.o \
- coredll_taskbarx11.o \
- coredll_generic_textmeasure.o \
- coredll_x11_bitmap.o \
- coredll_x11_brush.o \
- coredll_x11_palette.o \
- coredll_x11_pen.o \
- coredll_x11_region.o \
- coredll_utilsx.o \
- coredll_displayx11.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_4)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \
coredll_activex.o \
coredll_msw_app.o \
@@ -9743,76 +9354,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_2 = \
coredll_animate.o \
coredll_gtk_srchctrl.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_2)
-COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \
- coredll_motif_accel.o \
- coredll_motif_app.o \
- coredll_motif_bmpbuttn.o \
- coredll_bmpmotif.o \
- coredll_motif_button.o \
- coredll_motif_checkbox.o \
- coredll_motif_checklst.o \
- coredll_motif_choice.o \
- coredll_motif_clipbrd.o \
- coredll_motif_colour.o \
- coredll_motif_combobox.o \
- coredll_combobox_native.o \
- coredll_motif_control.o \
- coredll_motif_cursor.o \
- coredll_motif_data.o \
- coredll_motif_dataobj.o \
- coredll_motif_dc.o \
- coredll_motif_dcclient.o \
- coredll_motif_dcmemory.o \
- coredll_motif_dcscreen.o \
- coredll_motif_dialog.o \
- coredll_motif_evtloop.o \
- coredll_motif_filedlg.o \
- coredll_motif_font.o \
- coredll_motif_frame.o \
- coredll_motif_gauge.o \
- coredll_sockmot.o \
- coredll_motif_icon.o \
- coredll_motif_listbox.o \
- coredll_motif_main.o \
- coredll_motif_menu.o \
- coredll_motif_menuitem.o \
- coredll_motif_minifram.o \
- coredll_motif_msgdlg.o \
- coredll_motif_popupwin.o \
- coredll_motif_radiobox.o \
- coredll_motif_radiobut.o \
- coredll_motif_scrolbar.o \
- coredll_motif_settings.o \
- coredll_motif_slider.o \
- coredll_motif_spinbutt.o \
- coredll_motif_statbmp.o \
- coredll_motif_statbox.o \
- coredll_motif_stattext.o \
- coredll_motif_textctrl.o \
- coredll_motif_textentry.o \
- coredll_motif_timer.o \
- coredll_motif_toolbar.o \
- coredll_motif_toplevel.o \
- coredll_motif_utils.o \
- coredll_motif_window.o \
- coredll_xmcombo.o \
- coredll_clrpickerg.o \
- coredll_collpaneg.o \
- coredll_colrdlgg.o \
- coredll_dirdlgg.o \
- coredll_generic_fdrepdlg.o \
- coredll_filepickerg.o \
- coredll_fontdlgg.o \
- coredll_fontpickerg.o \
- coredll_generic_listctrl.o \
- coredll_mdig.o \
- coredll_generic_notebook.o \
- coredll_prntdlgg.o \
- coredll_generic_statline.o \
- coredll_generic_statusbr.o \
- coredll_tabg.o \
- coredll_generic_activityindicator.o
-@COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2)
COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 = \
coredll_clrpickerg.o \
coredll_collpaneg.o \
@@ -10272,27 +9813,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_5 = \
coredll_gtk_window.o \
coredll_mimetype.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_5)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_5 = \
- coredll_generic_caret.o \
- coredll_generic_imaglist.o \
- coredll_unix_dialup.o \
- coredll_unix_fontenum.o \
- coredll_unix_fontutil.o \
- coredll_uiactionx11.o \
- coredll_utilsx11.o \
- coredll_unix_sound.o \
- coredll_taskbarcmn.o \
- coredll_unix_joystick.o \
- coredll_taskbarx11.o \
- coredll_generic_textmeasure.o \
- coredll_x11_bitmap.o \
- coredll_x11_brush.o \
- coredll_x11_palette.o \
- coredll_x11_pen.o \
- coredll_x11_region.o \
- coredll_utilsx.o \
- coredll_displayx11.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_5)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \
coredll_activex.o \
coredll_msw_app.o \
@@ -11097,27 +10617,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_6 = \
corelib_gtk_window.o \
corelib_mimetype.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_6)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_6 = \
- corelib_generic_caret.o \
- corelib_generic_imaglist.o \
- corelib_unix_dialup.o \
- corelib_unix_fontenum.o \
- corelib_unix_fontutil.o \
- corelib_uiactionx11.o \
- corelib_utilsx11.o \
- corelib_unix_sound.o \
- corelib_taskbarcmn.o \
- corelib_unix_joystick.o \
- corelib_taskbarx11.o \
- corelib_generic_textmeasure.o \
- corelib_x11_bitmap.o \
- corelib_x11_brush.o \
- corelib_x11_palette.o \
- corelib_x11_pen.o \
- corelib_x11_region.o \
- corelib_utilsx.o \
- corelib_displayx11.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_6)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \
corelib_activex.o \
corelib_msw_app.o \
@@ -11479,76 +10978,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_3 = \
corelib_animate.o \
corelib_gtk_srchctrl.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___GUI_SRC_OBJECTS_3)
-COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \
- corelib_motif_accel.o \
- corelib_motif_app.o \
- corelib_motif_bmpbuttn.o \
- corelib_bmpmotif.o \
- corelib_motif_button.o \
- corelib_motif_checkbox.o \
- corelib_motif_checklst.o \
- corelib_motif_choice.o \
- corelib_motif_clipbrd.o \
- corelib_motif_colour.o \
- corelib_motif_combobox.o \
- corelib_combobox_native.o \
- corelib_motif_control.o \
- corelib_motif_cursor.o \
- corelib_motif_data.o \
- corelib_motif_dataobj.o \
- corelib_motif_dc.o \
- corelib_motif_dcclient.o \
- corelib_motif_dcmemory.o \
- corelib_motif_dcscreen.o \
- corelib_motif_dialog.o \
- corelib_motif_evtloop.o \
- corelib_motif_filedlg.o \
- corelib_motif_font.o \
- corelib_motif_frame.o \
- corelib_motif_gauge.o \
- corelib_sockmot.o \
- corelib_motif_icon.o \
- corelib_motif_listbox.o \
- corelib_motif_main.o \
- corelib_motif_menu.o \
- corelib_motif_menuitem.o \
- corelib_motif_minifram.o \
- corelib_motif_msgdlg.o \
- corelib_motif_popupwin.o \
- corelib_motif_radiobox.o \
- corelib_motif_radiobut.o \
- corelib_motif_scrolbar.o \
- corelib_motif_settings.o \
- corelib_motif_slider.o \
- corelib_motif_spinbutt.o \
- corelib_motif_statbmp.o \
- corelib_motif_statbox.o \
- corelib_motif_stattext.o \
- corelib_motif_textctrl.o \
- corelib_motif_textentry.o \
- corelib_motif_timer.o \
- corelib_motif_toolbar.o \
- corelib_motif_toplevel.o \
- corelib_motif_utils.o \
- corelib_motif_window.o \
- corelib_xmcombo.o \
- corelib_clrpickerg.o \
- corelib_collpaneg.o \
- corelib_colrdlgg.o \
- corelib_dirdlgg.o \
- corelib_generic_fdrepdlg.o \
- corelib_filepickerg.o \
- corelib_fontdlgg.o \
- corelib_fontpickerg.o \
- corelib_generic_listctrl.o \
- corelib_mdig.o \
- corelib_generic_notebook.o \
- corelib_prntdlgg.o \
- corelib_generic_statline.o \
- corelib_generic_statusbr.o \
- corelib_tabg.o \
- corelib_generic_activityindicator.o
-@COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3)
COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 = \
corelib_clrpickerg.o \
corelib_collpaneg.o \
@@ -12008,27 +11437,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_7 = \
corelib_gtk_window.o \
corelib_mimetype.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_4@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_4___LOWLEVEL_SRC_OBJECTS_7)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_7 = \
- corelib_generic_caret.o \
- corelib_generic_imaglist.o \
- corelib_unix_dialup.o \
- corelib_unix_fontenum.o \
- corelib_unix_fontutil.o \
- corelib_uiactionx11.o \
- corelib_utilsx11.o \
- corelib_unix_sound.o \
- corelib_taskbarcmn.o \
- corelib_unix_joystick.o \
- corelib_taskbarx11.o \
- corelib_generic_textmeasure.o \
- corelib_x11_bitmap.o \
- corelib_x11_brush.o \
- corelib_x11_palette.o \
- corelib_x11_pen.o \
- corelib_x11_region.o \
- corelib_utilsx.o \
- corelib_displayx11.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_7)
COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \
corelib_activex.o \
corelib_msw_app.o \
@@ -12305,9 +11713,6 @@ COND_USE_SOVERSOLARIS_1___mediadll___so_symlinks_uninst_cmd = rm -f \
@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
@COND_TOOLKIT_GTK@ mediadll_unix_mediactrl.o \
@COND_TOOLKIT_GTK@ mediadll_mediactrl_gstplayer.o
-@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_MOTIF@ mediadll_unix_mediactrl.o \
-@COND_TOOLKIT_MOTIF@ mediadll_mediactrl_gstplayer.o
COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2 = \
mediadll_mediactrl_am.o \
mediadll_mediactrl_wmp10.o \
@@ -12338,9 +11743,6 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1___medialib___depname = \
@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
@COND_TOOLKIT_GTK@ medialib_unix_mediactrl.o \
@COND_TOOLKIT_GTK@ medialib_mediactrl_gstplayer.o
-@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_MOTIF@ medialib_unix_mediactrl.o \
-@COND_TOOLKIT_MOTIF@ medialib_mediactrl_gstplayer.o
COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3 = \
medialib_mediactrl_am.o \
medialib_mediactrl_wmp10.o \
@@ -13297,8 +12699,6 @@ COND_USE_SOVERSOLARIS_1___gldll___so_symlinks_uninst_cmd = rm -f \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ = gldll_gtk1_glcanvas.o gldll_glx11.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__OPENGL_SRC_PLATFORM_OBJECTS \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = gldll_gtk_glcanvas.o gldll_glx11.o
-@COND_TOOLKIT_MOTIF@__OPENGL_SRC_PLATFORM_OBJECTS = \
-@COND_TOOLKIT_MOTIF@ gldll_x11_glcanvas.o gldll_glx11.o
@COND_TOOLKIT_MSW@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_msw_glcanvas.o
@COND_TOOLKIT_OSX_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS \
@COND_TOOLKIT_OSX_COCOA@ = gldll_osx_cocoa_glcanvas.o gldll_glcanvas_osx.o
@@ -13342,8 +12742,6 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ = gllib_gtk1_glcanvas.o gllib_glx11.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = gllib_gtk_glcanvas.o gllib_glx11.o
-@COND_TOOLKIT_MOTIF@__OPENGL_SRC_PLATFORM_OBJECTS_1 = \
-@COND_TOOLKIT_MOTIF@ gllib_x11_glcanvas.o gllib_glx11.o
@COND_TOOLKIT_MSW@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_msw_glcanvas.o
@COND_TOOLKIT_OSX_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
@COND_TOOLKIT_OSX_COCOA@ = gllib_osx_cocoa_glcanvas.o gllib_glcanvas_osx.o
@@ -16397,171 +15795,6 @@ monodll_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(MONODLL_ODEP)
monodll_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(MONODLL_ODEP)
$(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
-monodll_motif_accel.o: $(srcdir)/src/motif/accel.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
-
-monodll_motif_app.o: $(srcdir)/src/motif/app.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/app.cpp
-
-monodll_motif_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
-
-monodll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
-
-monodll_motif_button.o: $(srcdir)/src/motif/button.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/button.cpp
-
-monodll_motif_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
-
-monodll_motif_checklst.o: $(srcdir)/src/motif/checklst.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
-
-monodll_motif_choice.o: $(srcdir)/src/motif/choice.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
-
-monodll_motif_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
-
-monodll_motif_colour.o: $(srcdir)/src/motif/colour.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
-
-monodll_motif_combobox.o: $(srcdir)/src/motif/combobox.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
-
-monodll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
-
-monodll_motif_control.o: $(srcdir)/src/motif/control.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/control.cpp
-
-monodll_motif_cursor.o: $(srcdir)/src/motif/cursor.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
-
-monodll_motif_data.o: $(srcdir)/src/motif/data.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/data.cpp
-
-monodll_motif_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
-
-monodll_motif_dc.o: $(srcdir)/src/motif/dc.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
-
-monodll_motif_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
-
-monodll_motif_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
-
-monodll_motif_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
-
-monodll_motif_dialog.o: $(srcdir)/src/motif/dialog.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
-
-monodll_motif_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
-
-monodll_motif_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
-
-monodll_motif_font.o: $(srcdir)/src/motif/font.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/font.cpp
-
-monodll_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
-
-monodll_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
-
-monodll_sockmot.o: $(srcdir)/src/motif/sockmot.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/sockmot.cpp
-
-monodll_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
-
-monodll_motif_listbox.o: $(srcdir)/src/motif/listbox.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
-
-monodll_motif_main.o: $(srcdir)/src/motif/main.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/main.cpp
-
-monodll_motif_menu.o: $(srcdir)/src/motif/menu.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
-
-monodll_motif_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
-
-monodll_motif_minifram.o: $(srcdir)/src/motif/minifram.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
-
-monodll_motif_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
-
-monodll_motif_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
-
-monodll_motif_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
-
-monodll_motif_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
-
-monodll_motif_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
-
-monodll_motif_settings.o: $(srcdir)/src/motif/settings.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
-
-monodll_motif_slider.o: $(srcdir)/src/motif/slider.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
-
-monodll_motif_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
-
-monodll_motif_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
-
-monodll_motif_statbox.o: $(srcdir)/src/motif/statbox.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
-
-monodll_motif_stattext.o: $(srcdir)/src/motif/stattext.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
-
-monodll_motif_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
-
-monodll_motif_textentry.o: $(srcdir)/src/motif/textentry.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
-
-monodll_motif_timer.o: $(srcdir)/src/motif/timer.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
-
-monodll_motif_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
-
-monodll_motif_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
-
-monodll_motif_utils.o: $(srcdir)/src/motif/utils.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
-
-monodll_motif_window.o: $(srcdir)/src/motif/window.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/window.cpp
-
-monodll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(MONODLL_ODEP)
- $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
-
-monodll_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
-
-monodll_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
-
-monodll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
monodll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
@@ -17213,6 +16446,9 @@ monodll_qt_graphics.o: $(srcdir)/src/qt/graphics.cpp $(MONODLL_ODEP)
monodll_qt_treectrl.o: $(srcdir)/src/qt/treectrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/qt/treectrl.cpp
+monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
+
monodll_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp
@@ -17960,9 +17196,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
@@ -18008,9 +17241,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
@@ -18038,9 +17268,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@@ -18074,9 +17301,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
@@ -18110,9 +17334,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
@@ -18137,9 +17358,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monodll_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
@@ -18164,9 +17382,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
@@ -18191,9 +17406,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
@@ -18233,9 +17445,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
@@ -18263,9 +17472,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
@@ -18290,9 +17496,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
@@ -18821,9 +18024,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
@@ -18920,48 +18120,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_region.o: $(srcdir)/src/x11/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_region.o: $(srcdir)/src/x11/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@@ -19262,6 +18423,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_app.o: $(srcdir)/src/x11/app.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/app.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
@@ -19301,9 +18468,18 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monodll_nanox.o: $(srcdir)/src/x11/nanox.c $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/x11/nanox.c
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_region.o: $(srcdir)/src/x11/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@monodll_reparent.o: $(srcdir)/src/x11/reparent.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
@@ -19316,6 +18492,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_utils.o: $(srcdir)/src/x11/utils.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_window.o: $(srcdir)/src/x11/window.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/window.cpp
@@ -19424,9 +18603,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
@@ -19451,9 +18627,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
@@ -19481,9 +18654,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
@@ -19505,9 +18675,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
@@ -19535,9 +18702,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
@@ -20057,9 +19221,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
@@ -20075,9 +19236,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
@@ -20090,9 +19248,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
@@ -20111,9 +19266,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
@@ -20132,9 +19284,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
@@ -20147,9 +19296,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
@@ -20174,9 +19320,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
@@ -20192,12 +19335,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(MONODLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
@@ -21134,18 +20271,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MONODLL_ODEP)
@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-
@COND_TOOLKIT_GTK_USE_GUI_1@monodll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp
-
@COND_TOOLKIT_GTK_USE_GUI_1@monodll_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp
@@ -21716,171 +20847,6 @@ monolib_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(MONOLIB_ODEP)
monolib_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(MONOLIB_ODEP)
$(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
-monolib_motif_accel.o: $(srcdir)/src/motif/accel.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
-
-monolib_motif_app.o: $(srcdir)/src/motif/app.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/app.cpp
-
-monolib_motif_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
-
-monolib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
-
-monolib_motif_button.o: $(srcdir)/src/motif/button.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/button.cpp
-
-monolib_motif_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
-
-monolib_motif_checklst.o: $(srcdir)/src/motif/checklst.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
-
-monolib_motif_choice.o: $(srcdir)/src/motif/choice.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
-
-monolib_motif_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
-
-monolib_motif_colour.o: $(srcdir)/src/motif/colour.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
-
-monolib_motif_combobox.o: $(srcdir)/src/motif/combobox.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
-
-monolib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
-
-monolib_motif_control.o: $(srcdir)/src/motif/control.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/control.cpp
-
-monolib_motif_cursor.o: $(srcdir)/src/motif/cursor.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
-
-monolib_motif_data.o: $(srcdir)/src/motif/data.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/data.cpp
-
-monolib_motif_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
-
-monolib_motif_dc.o: $(srcdir)/src/motif/dc.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
-
-monolib_motif_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
-
-monolib_motif_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
-
-monolib_motif_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
-
-monolib_motif_dialog.o: $(srcdir)/src/motif/dialog.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
-
-monolib_motif_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
-
-monolib_motif_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
-
-monolib_motif_font.o: $(srcdir)/src/motif/font.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/font.cpp
-
-monolib_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
-
-monolib_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
-
-monolib_sockmot.o: $(srcdir)/src/motif/sockmot.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/sockmot.cpp
-
-monolib_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
-
-monolib_motif_listbox.o: $(srcdir)/src/motif/listbox.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
-
-monolib_motif_main.o: $(srcdir)/src/motif/main.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/main.cpp
-
-monolib_motif_menu.o: $(srcdir)/src/motif/menu.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
-
-monolib_motif_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
-
-monolib_motif_minifram.o: $(srcdir)/src/motif/minifram.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
-
-monolib_motif_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
-
-monolib_motif_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
-
-monolib_motif_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
-
-monolib_motif_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
-
-monolib_motif_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
-
-monolib_motif_settings.o: $(srcdir)/src/motif/settings.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
-
-monolib_motif_slider.o: $(srcdir)/src/motif/slider.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
-
-monolib_motif_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
-
-monolib_motif_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
-
-monolib_motif_statbox.o: $(srcdir)/src/motif/statbox.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
-
-monolib_motif_stattext.o: $(srcdir)/src/motif/stattext.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
-
-monolib_motif_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
-
-monolib_motif_textentry.o: $(srcdir)/src/motif/textentry.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
-
-monolib_motif_timer.o: $(srcdir)/src/motif/timer.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
-
-monolib_motif_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
-
-monolib_motif_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
-
-monolib_motif_utils.o: $(srcdir)/src/motif/utils.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
-
-monolib_motif_window.o: $(srcdir)/src/motif/window.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/window.cpp
-
-monolib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(MONOLIB_ODEP)
- $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
-
-monolib_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
-
-monolib_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
-
-monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
monolib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
@@ -22532,6 +21498,9 @@ monolib_qt_graphics.o: $(srcdir)/src/qt/graphics.cpp $(MONOLIB_ODEP)
monolib_qt_treectrl.o: $(srcdir)/src/qt/treectrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/qt/treectrl.cpp
+monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
+
monolib_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp
@@ -23279,9 +22248,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
@@ -23327,9 +22293,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
@@ -23357,9 +22320,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@@ -23393,9 +22353,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
@@ -23429,9 +22386,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
@@ -23456,9 +22410,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monolib_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
@@ -23483,9 +22434,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monolib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
@@ -23510,9 +22458,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
@@ -23552,9 +22497,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
@@ -23582,9 +22524,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
@@ -23609,9 +22548,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
@@ -24140,9 +23076,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
@@ -24239,48 +23172,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_region.o: $(srcdir)/src/x11/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_region.o: $(srcdir)/src/x11/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@@ -24581,6 +23475,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_app.o: $(srcdir)/src/x11/app.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/app.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
@@ -24620,9 +23520,18 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monolib_nanox.o: $(srcdir)/src/x11/nanox.c $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/x11/nanox.c
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_region.o: $(srcdir)/src/x11/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@monolib_reparent.o: $(srcdir)/src/x11/reparent.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
@@ -24635,6 +23544,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_utils.o: $(srcdir)/src/x11/utils.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_window.o: $(srcdir)/src/x11/window.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/window.cpp
@@ -24743,9 +23655,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
@@ -24770,9 +23679,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
@@ -24800,9 +23706,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
@@ -24824,9 +23727,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
@@ -24854,9 +23754,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
@@ -25376,9 +24273,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
@@ -25394,9 +24288,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
@@ -25409,9 +24300,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
@@ -25430,9 +24318,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
@@ -25451,9 +24336,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
@@ -25466,9 +24348,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
@@ -25493,9 +24372,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
@@ -25511,12 +24387,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(MONOLIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
@@ -26453,18 +25323,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MONOLIB_ODEP)
@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-
@COND_TOOLKIT_GTK_USE_GUI_1@monolib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp
-
@COND_TOOLKIT_GTK_USE_GUI_1@monolib_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp
@@ -27722,171 +26586,6 @@ coredll_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(COREDLL_ODEP)
coredll_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(COREDLL_ODEP)
$(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
-coredll_motif_accel.o: $(srcdir)/src/motif/accel.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
-
-coredll_motif_app.o: $(srcdir)/src/motif/app.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/app.cpp
-
-coredll_motif_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
-
-coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
-
-coredll_motif_button.o: $(srcdir)/src/motif/button.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/button.cpp
-
-coredll_motif_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
-
-coredll_motif_checklst.o: $(srcdir)/src/motif/checklst.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
-
-coredll_motif_choice.o: $(srcdir)/src/motif/choice.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
-
-coredll_motif_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
-
-coredll_motif_colour.o: $(srcdir)/src/motif/colour.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
-
-coredll_motif_combobox.o: $(srcdir)/src/motif/combobox.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
-
-coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
-
-coredll_motif_control.o: $(srcdir)/src/motif/control.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/control.cpp
-
-coredll_motif_cursor.o: $(srcdir)/src/motif/cursor.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
-
-coredll_motif_data.o: $(srcdir)/src/motif/data.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/data.cpp
-
-coredll_motif_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
-
-coredll_motif_dc.o: $(srcdir)/src/motif/dc.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
-
-coredll_motif_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
-
-coredll_motif_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
-
-coredll_motif_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
-
-coredll_motif_dialog.o: $(srcdir)/src/motif/dialog.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
-
-coredll_motif_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
-
-coredll_motif_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
-
-coredll_motif_font.o: $(srcdir)/src/motif/font.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/font.cpp
-
-coredll_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
-
-coredll_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
-
-coredll_sockmot.o: $(srcdir)/src/motif/sockmot.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/sockmot.cpp
-
-coredll_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
-
-coredll_motif_listbox.o: $(srcdir)/src/motif/listbox.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
-
-coredll_motif_main.o: $(srcdir)/src/motif/main.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/main.cpp
-
-coredll_motif_menu.o: $(srcdir)/src/motif/menu.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
-
-coredll_motif_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
-
-coredll_motif_minifram.o: $(srcdir)/src/motif/minifram.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
-
-coredll_motif_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
-
-coredll_motif_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
-
-coredll_motif_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
-
-coredll_motif_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
-
-coredll_motif_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
-
-coredll_motif_settings.o: $(srcdir)/src/motif/settings.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
-
-coredll_motif_slider.o: $(srcdir)/src/motif/slider.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
-
-coredll_motif_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
-
-coredll_motif_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
-
-coredll_motif_statbox.o: $(srcdir)/src/motif/statbox.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
-
-coredll_motif_stattext.o: $(srcdir)/src/motif/stattext.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
-
-coredll_motif_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
-
-coredll_motif_textentry.o: $(srcdir)/src/motif/textentry.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
-
-coredll_motif_timer.o: $(srcdir)/src/motif/timer.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
-
-coredll_motif_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
-
-coredll_motif_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
-
-coredll_motif_utils.o: $(srcdir)/src/motif/utils.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
-
-coredll_motif_window.o: $(srcdir)/src/motif/window.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/window.cpp
-
-coredll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(COREDLL_ODEP)
- $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
-
-coredll_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
-
-coredll_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
-
-coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
- $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
coredll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
@@ -28538,6 +27237,9 @@ coredll_qt_graphics.o: $(srcdir)/src/qt/graphics.cpp $(COREDLL_ODEP)
coredll_qt_treectrl.o: $(srcdir)/src/qt/treectrl.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/qt/treectrl.cpp
+coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
+
coredll_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp
@@ -28703,9 +27405,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
@@ -28751,9 +27450,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
@@ -28781,9 +27477,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@@ -28817,9 +27510,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@coredll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
@@ -28853,9 +27543,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@coredll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
@@ -28880,9 +27567,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@coredll_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
@@ -28907,9 +27591,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
@@ -28934,9 +27615,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@coredll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
@@ -28976,9 +27654,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@coredll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
@@ -29006,9 +27681,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@coredll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
@@ -29033,9 +27705,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@coredll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
@@ -29564,9 +28233,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
@@ -29663,48 +28329,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_region.o: $(srcdir)/src/x11/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_region.o: $(srcdir)/src/x11/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@coredll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@@ -30005,6 +28632,12 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_app.o: $(srcdir)/src/x11/app.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/app.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
@@ -30044,9 +28677,18 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@coredll_nanox.o: $(srcdir)/src/x11/nanox.c $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/x11/nanox.c
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_region.o: $(srcdir)/src/x11/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@coredll_reparent.o: $(srcdir)/src/x11/reparent.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
@@ -30059,6 +28701,9 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_utils.o: $(srcdir)/src/x11/utils.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_window.o: $(srcdir)/src/x11/window.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/window.cpp
@@ -30167,9 +28812,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
@@ -30194,9 +28836,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
@@ -30224,9 +28863,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
@@ -30248,9 +28884,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
@@ -30278,9 +28911,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
@@ -30800,9 +29430,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
@@ -30818,9 +29445,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
@@ -30833,9 +29457,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
@@ -30854,9 +29475,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
@@ -30875,9 +29493,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
@@ -30890,9 +29505,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
@@ -30917,9 +29529,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
@@ -30935,12 +29544,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(COREDLL_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
@@ -32000,171 +30603,6 @@ corelib_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(CORELIB_ODEP)
corelib_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(CORELIB_ODEP)
$(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
-corelib_motif_accel.o: $(srcdir)/src/motif/accel.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
-
-corelib_motif_app.o: $(srcdir)/src/motif/app.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/app.cpp
-
-corelib_motif_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
-
-corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
-
-corelib_motif_button.o: $(srcdir)/src/motif/button.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/button.cpp
-
-corelib_motif_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
-
-corelib_motif_checklst.o: $(srcdir)/src/motif/checklst.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
-
-corelib_motif_choice.o: $(srcdir)/src/motif/choice.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
-
-corelib_motif_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
-
-corelib_motif_colour.o: $(srcdir)/src/motif/colour.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
-
-corelib_motif_combobox.o: $(srcdir)/src/motif/combobox.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
-
-corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
-
-corelib_motif_control.o: $(srcdir)/src/motif/control.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/control.cpp
-
-corelib_motif_cursor.o: $(srcdir)/src/motif/cursor.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
-
-corelib_motif_data.o: $(srcdir)/src/motif/data.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/data.cpp
-
-corelib_motif_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
-
-corelib_motif_dc.o: $(srcdir)/src/motif/dc.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
-
-corelib_motif_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
-
-corelib_motif_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
-
-corelib_motif_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
-
-corelib_motif_dialog.o: $(srcdir)/src/motif/dialog.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
-
-corelib_motif_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
-
-corelib_motif_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
-
-corelib_motif_font.o: $(srcdir)/src/motif/font.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/font.cpp
-
-corelib_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
-
-corelib_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
-
-corelib_sockmot.o: $(srcdir)/src/motif/sockmot.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/sockmot.cpp
-
-corelib_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
-
-corelib_motif_listbox.o: $(srcdir)/src/motif/listbox.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
-
-corelib_motif_main.o: $(srcdir)/src/motif/main.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/main.cpp
-
-corelib_motif_menu.o: $(srcdir)/src/motif/menu.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
-
-corelib_motif_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
-
-corelib_motif_minifram.o: $(srcdir)/src/motif/minifram.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
-
-corelib_motif_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
-
-corelib_motif_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
-
-corelib_motif_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
-
-corelib_motif_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
-
-corelib_motif_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
-
-corelib_motif_settings.o: $(srcdir)/src/motif/settings.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
-
-corelib_motif_slider.o: $(srcdir)/src/motif/slider.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
-
-corelib_motif_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
-
-corelib_motif_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
-
-corelib_motif_statbox.o: $(srcdir)/src/motif/statbox.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
-
-corelib_motif_stattext.o: $(srcdir)/src/motif/stattext.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
-
-corelib_motif_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
-
-corelib_motif_textentry.o: $(srcdir)/src/motif/textentry.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
-
-corelib_motif_timer.o: $(srcdir)/src/motif/timer.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
-
-corelib_motif_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
-
-corelib_motif_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
-
-corelib_motif_utils.o: $(srcdir)/src/motif/utils.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
-
-corelib_motif_window.o: $(srcdir)/src/motif/window.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/window.cpp
-
-corelib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(CORELIB_ODEP)
- $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
-
-corelib_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
-
-corelib_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
-
-corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
- $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
corelib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
@@ -32816,6 +31254,9 @@ corelib_qt_graphics.o: $(srcdir)/src/qt/graphics.cpp $(CORELIB_ODEP)
corelib_qt_treectrl.o: $(srcdir)/src/qt/treectrl.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/qt/treectrl.cpp
+corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
+
corelib_univ_anybutton.o: $(srcdir)/src/univ/anybutton.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/anybutton.cpp
@@ -32981,9 +31422,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
@@ -33029,9 +31467,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
@@ -33059,9 +31494,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
@@ -33095,9 +31527,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@corelib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
@@ -33131,9 +31560,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@corelib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
@@ -33158,9 +31584,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@corelib_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
@@ -33185,9 +31608,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
@@ -33212,9 +31632,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@corelib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
@@ -33254,9 +31671,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@corelib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
@@ -33284,9 +31698,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@corelib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
@@ -33311,9 +31722,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@corelib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
@@ -33842,9 +32250,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_textmeasure.o: $(srcdir)/src/generic/textmeasure.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textmeasure.cpp
@@ -33941,48 +32346,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-
@COND_TOOLKIT_X11_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_region.o: $(srcdir)/src/x11/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_region.o: $(srcdir)/src/x11/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@corelib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
@@ -34283,6 +32649,12 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_app.o: $(srcdir)/src/x11/app.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/app.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
@@ -34322,9 +32694,18 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@corelib_nanox.o: $(srcdir)/src/x11/nanox.c $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/x11/nanox.c
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_region.o: $(srcdir)/src/x11/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@corelib_reparent.o: $(srcdir)/src/x11/reparent.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
@@ -34337,6 +32718,9 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_utils.o: $(srcdir)/src/x11/utils.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+
@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_window.o: $(srcdir)/src/x11/window.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/window.cpp
@@ -34445,9 +32829,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
@@ -34472,9 +32853,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
@@ -34502,9 +32880,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
@@ -34526,9 +32901,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
@@ -34556,9 +32928,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
@@ -35078,9 +33447,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
@@ -35096,9 +33462,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_generic_activityindicator.o: $(srcdir)/src/generic/activityindicator.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/activityindicator.cpp
@@ -35111,9 +33474,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
@@ -35132,9 +33492,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
@@ -35153,9 +33510,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
@@ -35168,9 +33522,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
@@ -35195,9 +33546,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
@@ -35213,12 +33561,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(CORELIB_ODEP)
@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
@@ -36185,18 +34527,12 @@ mediadll_qt_mediactrl.o: $(srcdir)/src/qt/mediactrl.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_OSX_IPHONE@mediadll_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MEDIADLL_ODEP)
@COND_TOOLKIT_OSX_IPHONE@ $(CXXC) -c -o $@ $(MEDIADLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
-@COND_TOOLKIT_MOTIF@mediadll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
-@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-
@COND_TOOLKIT_GTK@mediadll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
@COND_TOOLKIT_X11@mediadll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-@COND_TOOLKIT_MOTIF@mediadll_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MEDIADLL_ODEP)
-@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp
-
@COND_TOOLKIT_GTK@mediadll_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MEDIADLL_ODEP)
@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp
@@ -36227,18 +34563,12 @@ medialib_qt_mediactrl.o: $(srcdir)/src/qt/mediactrl.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_OSX_IPHONE@medialib_osx_cocoa_mediactrl.o: $(srcdir)/src/osx/cocoa/mediactrl.mm $(MEDIALIB_ODEP)
@COND_TOOLKIT_OSX_IPHONE@ $(CXXC) -c -o $@ $(MEDIALIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/mediactrl.mm
-@COND_TOOLKIT_MOTIF@medialib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
-@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-
@COND_TOOLKIT_GTK@medialib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
@COND_TOOLKIT_X11@medialib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
-@COND_TOOLKIT_MOTIF@medialib_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MEDIALIB_ODEP)
-@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp
-
@COND_TOOLKIT_GTK@medialib_mediactrl_gstplayer.o: $(srcdir)/src/unix/mediactrl_gstplayer.cpp $(MEDIALIB_ODEP)
@COND_TOOLKIT_GTK@ $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl_gstplayer.cpp
@@ -37241,6 +35571,9 @@ gldll_qt_glcanvas.o: $(srcdir)/src/qt/glcanvas.cpp $(GLDLL_ODEP)
gldll_msw_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLDLL_ODEP)
$(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+gldll_x11_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLDLL_ODEP)
+ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+
@COND_TOOLKIT_OSX_COCOA@gldll_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLDLL_ODEP)
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp
@@ -37265,9 +35598,6 @@ gldll_msw_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@gldll_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
-@COND_TOOLKIT_MOTIF@gldll_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
-
@COND_TOOLKIT_X11@gldll_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLDLL_ODEP)
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
@@ -37280,12 +35610,6 @@ gldll_msw_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@gldll_gtk_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp $(GLDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/gtk/glcanvas.cpp
-@COND_TOOLKIT_MOTIF@gldll_x11_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
-
-@COND_TOOLKIT_X11@gldll_x11_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
-
gllib_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLLIB_ODEP)
$(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp
@@ -37307,6 +35631,9 @@ gllib_qt_glcanvas.o: $(srcdir)/src/qt/glcanvas.cpp $(GLLIB_ODEP)
gllib_msw_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLLIB_ODEP)
$(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+gllib_x11_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLLIB_ODEP)
+ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+
@COND_TOOLKIT_OSX_COCOA@gllib_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLLIB_ODEP)
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp
@@ -37331,9 +35658,6 @@ gllib_msw_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@gllib_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
-@COND_TOOLKIT_MOTIF@gllib_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
-
@COND_TOOLKIT_X11@gllib_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLLIB_ODEP)
@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
@@ -37346,12 +35670,6 @@ gllib_msw_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@gllib_gtk_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp $(GLLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/gtk/glcanvas.cpp
-@COND_TOOLKIT_MOTIF@gllib_x11_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
-
-@COND_TOOLKIT_X11@gllib_x11_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
-
sound_sdl_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp
$(CXXC) -c -o $@ $(SOUND_SDL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
@@ -37399,7 +35717,6 @@ GTKDIR = $(WXDIR)/src/gtk
GTK1DIR = $(WXDIR)/src/gtk1
X11DIR = $(WXDIR)/src/x11
X11INC = $(WXDIR)/include/wx/x11
-MOTIFDIR = $(WXDIR)/src/motif
MSWDIR = $(WXDIR)/src/msw
MACDIR = $(WXDIR)/src/osx
COCOADIR = $(WXDIR)/src/cocoa
@@ -37559,10 +35876,8 @@ ALL_GUI_DIST: ALL_DIST
mkdir $(DISTDIR)/art
mkdir $(DISTDIR)/art/gtk
- mkdir $(DISTDIR)/art/motif
$(CP_P) $(WXDIR)/art/*.xpm $(DISTDIR)/art
$(CP_P) $(WXDIR)/art/gtk/*.xpm $(DISTDIR)/art/gtk
- $(CP_P) $(WXDIR)/art/motif/*.xpm $(DISTDIR)/art/motif
mkdir $(DISTDIR)/src/$(TOOLKITDIR)
$(CP_P) $(COMMDIR)/*.cpp $(DISTDIR)/src/common
@@ -37738,25 +36053,6 @@ X11_DIST: UNIV_DIST
mkdir $(DISTDIR)/include/wx/osx/core
$(CP_P) $(WXDIR)/include/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core
-MOTIF_DIST: ALL_GUI_DIST
- $(CP_P) $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
- $(CP_P) $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
- $(CP_P) $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif
- mkdir $(DISTDIR)/src/motif/xmcombo
- $(CP_P) $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo
- $(CP_P) $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
- $(CP_P) $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
- mkdir $(DISTDIR)/src/x11
- mkdir $(DISTDIR)/include/wx/x11
- $(CP_P) $(X11DIR)/pen.cpp $(X11DIR)/brush.cpp $(X11DIR)/utilsx.cpp \
- $(X11DIR)/bitmap.cpp $(X11DIR)/glcanvas.cpp $(X11DIR)/region.cpp \
- $(DISTDIR)/src/x11
- $(CP_P) $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
- $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
- $(DISTDIR)/include/wx/x11
- mkdir $(DISTDIR)/include/wx/x11/private
- $(CP_P) $(INCDIR)/wx/x11/private/*.h $(DISTDIR)/include/wx/x11/private
-
OSX_CARBON_DIST: ALL_GUI_DIST
$(CP_P) $(INCDIR)/*.* $(DISTDIR)/include
mkdir $(DISTDIR)/include/wx/osx/carbon
diff --git a/appveyor.yml b/appveyor.yml
index b8f430877d..993e1e56a2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,8 +17,6 @@ skip_commits:
- src/gtk/
- include/wx/gtk1/
- src/gtk1/
- - include/wx/motif/
- - src/motif/
- include/wx/osx/
- src/osx/
- include/wx/unix/
diff --git a/art/motif/error.xpm b/art/motif/error.xpm
deleted file mode 100644
index 559715c64c..0000000000
--- a/art/motif/error.xpm
+++ /dev/null
@@ -1,58 +0,0 @@
-/* XPM */
-static const char *const error_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 4 1",
-" c None",
-"X c #242424",
-"o c #DCDF00",
-". c #C00000",
-/* pixels */
-" ",
-" ",
-" ",
-" ",
-" ",
-" ..... ",
-" ............. ",
-" ................. ",
-" ................... ",
-" ....................... ",
-" ......................... ",
-" ........................... ",
-" ...........................X ",
-" .............................X ",
-" ............................... ",
-" ...............................X ",
-" .................................X ",
-" .................................X ",
-" .................................XX ",
-" ...ooooooooooooooooooooooooooo...XX ",
-" ....ooooooooooooooooooooooooooo....X ",
-" ....ooooooooooooooooooooooooooo....X ",
-" ....ooooooooooooooooooooooooooo....XX ",
-" ....ooooooooooooooooooooooooooo....XX ",
-" ....ooooooooooooooooooooooooooo....XX ",
-" ...ooooooooooooooooooooooooooo...XXX ",
-" ...ooooooooooooooooooooooooooo...XXX ",
-" .................................XX ",
-" .................................XX ",
-" ...............................XXX ",
-" ...............................XXX ",
-" .............................XXX ",
-" ...........................XXXX ",
-" ...........................XXX ",
-" .........................XXX ",
-" .......................XXXX ",
-" X...................XXXXX ",
-" X.................XXXXX ",
-" X.............XXXXX ",
-" XXXX.....XXXXXXXX ",
-" XXXXXXXXXXXXX ",
-" XXXXX ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "
-};
diff --git a/art/motif/info.xpm b/art/motif/info.xpm
deleted file mode 100644
index fe32e61982..0000000000
--- a/art/motif/info.xpm
+++ /dev/null
@@ -1,63 +0,0 @@
-/* XPM */
-static const char *const info_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 9 1",
-"$ c Black",
-"O c #FFFFFF",
-"@ c #808080",
-"+ c #000080",
-"o c #E8EB01",
-" c None",
-"X c #FFFF40",
-"# c #C0C0C0",
-". c #ABAD01",
-/* pixels */
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ..... ",
-" ..XXXXX.. ",
-" ..XXXXXXXXo.. ",
-" .XXXOXXXXXXXoo. ",
-" .XOOXXX+XXXXXo. ",
-" .XOOOXX+++XXXXoo. ",
-" .XOOXXX+++XXXXXo. ",
-" .XOOOXXX+++XXXXXXo. ",
-" .XOOXXXX+++XXXXXXo. ",
-" .XXXXXXX+++XXXXXXX. ",
-" .XXXXXXX+++XXXXXXo. ",
-" .XXXXXXX+++XXXXXoo. ",
-" .XXXXXX+++XXXXXo. ",
-" .XXXXXXX+XXXXXXo. ",
-" .XXXXXXXXXXXXo. ",
-" .XXXXX+++XXXoo. ",
-" .XXXX+++XXoo. ",
-" .XXXXXXXXo. ",
-" ..XXXXXXo.. ",
-" .XXXXXo.. ",
-" @#######@ ",
-" @@@@@@@@@ ",
-" @#######@ ",
-" @@@@@@@@@ ",
-" @#######@ ",
-" @@@@@@@ ",
-" ### ",
-" $$$ ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "
-};
diff --git a/art/motif/question.xpm b/art/motif/question.xpm
deleted file mode 100644
index cb0001ec80..0000000000
--- a/art/motif/question.xpm
+++ /dev/null
@@ -1,75 +0,0 @@
-/* XPM */
-static const char *const question_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 21 1",
-". c Black",
-"> c #696969",
-"O c #1F1F00",
-"+ c #181818",
-"o c #F6F900",
-"; c #3F3F00",
-"$ c #111111",
-" c None",
-"& c #202020",
-"X c #AAAA00",
-"@ c #949400",
-": c #303030",
-"1 c #383838",
-"% c #2A2A00",
-", c #404040",
-"= c #B4B400",
-"- c #484848",
-"# c #151500",
-"< c #9F9F00",
-"2 c #6A6A00",
-"* c #353500",
-/* pixels */
-" ",
-" ",
-" ",
-" ",
-" ......... ",
-" ...XXXXXXX.. ",
-" ..XXXXoooooXXXO+ ",
-" ..XXooooooooooooX@.. ",
-" ..XoooooooooooooooXX#. ",
-" $%XoooooooooooooooooXX#. ",
-" &.XoooooooXXXXXXooooooXX.. ",
-" .XooooooXX.$...$XXoooooX*. ",
-" $.XoooooX%.$ .*oooooo=.. ",
-" .XooooooX.. -.XoooooX.. ",
-" .XoooooX..+ .XoooooX;. ",
-" ...XXXX..: .XoooooX;. ",
-" ........ >.XoooooX;. ",
-" +.XoooooX.. ",
-" ,.Xoooooo<.. ",
-" 1#XooooooXO.. ",
-" &#XooooooX2.. ",
-" $%XooooooXX.. ",
-" $%XooooooXX.. ",
-" $%XooooooXX.. ",
-" &.XooooooXX.. ",
-" .XooooooXX.. ",
-" &.XoooooXX.. ",
-" ..XooooXX.. ",
-" ..XooooX... ",
-" ..XXooXX..& ",
-" ...XXXXX.. ",
-" ........ ",
-" ",
-" ",
-" ....... ",
-" ..XXXXX.. ",
-" ..XXoooXX.. ",
-" ..XoooooX.. ",
-" ..XoooooX.. ",
-" ..XXoooXX.. ",
-" ..XXXXX.. ",
-" ....... ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "
-};
diff --git a/art/motif/warning.xpm b/art/motif/warning.xpm
deleted file mode 100644
index 58aee153fe..0000000000
--- a/art/motif/warning.xpm
+++ /dev/null
@@ -1,63 +0,0 @@
-/* XPM */
-static const char *const warning_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 9 1",
-"@ c Black",
-"o c #A6A800",
-"+ c #8A8C00",
-"$ c #B8BA00",
-" c None",
-"O c #6E7000",
-"X c #DCDF00",
-". c #C00000",
-"# c #373800",
-/* pixels */
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" . ",
-" ... ",
-" ... ",
-" ..... ",
-" ...X.. ",
-" ..XXX.. ",
-" ...XXX... ",
-" ..XXXXX.. ",
-" ..XXXXXX... ",
-" ...XXoO+XX.. ",
-" ..XXXO@#XXX.. ",
-" ..XXXXO@#XXX... ",
-" ...XXXXO@#XXXX.. ",
-" ..XXXXXO@#XXXX... ",
-" ...XXXXXo@OXXXXX.. ",
-" ...XXXXXXo@OXXXXXX.. ",
-" ..XXXXXXX$@OXXXXXX... ",
-" ...XXXXXXXX@XXXXXXXX.. ",
-" ...XXXXXXXXXXXXXXXXXX... ",
-" ..XXXXXXXXXXOXXXXXXXXX.. ",
-" ...XXXXXXXXXO@#XXXXXXXXX.. ",
-" ..XXXXXXXXXXX#XXXXXXXXXX... ",
-" ...XXXXXXXXXXXXXXXXXXXXXXX.. ",
-" ...XXXXXXXXXXXXXXXXXXXXXXXX... ",
-" .............................. ",
-" .............................. ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "
-};
diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index ee64e81448..8dfb17fa46 100644
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -734,24 +734,6 @@ dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.bkl,../../demos/
COND_TOOLKIT_MAC=""
fi
AC_SUBST(COND_TOOLKIT_MAC)
-dnl ### begin block 20_COND_TOOLKIT_MOTIF[wx.bkl] ###
- COND_TOOLKIT_MOTIF="#"
- if test "x$TOOLKIT" = "xMOTIF" ; then
- COND_TOOLKIT_MOTIF=""
- fi
- AC_SUBST(COND_TOOLKIT_MOTIF)
-dnl ### begin block 20_COND_TOOLKIT_MOTIF_USE_GUI_1[wx.bkl] ###
- COND_TOOLKIT_MOTIF_USE_GUI_1="#"
- if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then
- COND_TOOLKIT_MOTIF_USE_GUI_1=""
- fi
- AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0[wx.bkl] ###
- COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#"
- if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
- COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
- fi
- AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_MSW[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_TOOLKIT_MSW="#"
if test "x$TOOLKIT" = "xMSW" ; then
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index af7235d582..62421cfa71 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -27,7 +27,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(port)LOWLEVEL low-level GUI classes
$(port) high-level files for a port
XWIN_LOWLEVEL low-level classes for X Window System
- ports (wxGTK, wxMotif, wxX11)
+ ports (wxGTK, wxX11)
MSW_DESKTOP files used only on desktop Windows
versions
@@ -1779,172 +1779,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-
-
-
-
-
- $(XWIN_LOWLEVEL_SRC)
- src/generic/textmeasure.cpp
- src/x11/bitmap.cpp
- src/x11/brush.cpp
- src/x11/palette.cpp
- src/x11/pen.cpp
- src/x11/region.cpp
- src/x11/utilsx.cpp
- src/unix/displayx11.cpp
-
-
- $(XWIN_LOWLEVEL_HDR)
- wx/x11/bitmap.h
- wx/x11/brush.h
- wx/x11/palette.h
- wx/x11/pen.h
- wx/x11/region.h
-
-
- src/motif/accel.cpp
- src/motif/app.cpp
- src/motif/bmpbuttn.cpp
- src/motif/bmpmotif.cpp
- src/motif/button.cpp
- src/motif/checkbox.cpp
- src/motif/checklst.cpp
- src/motif/choice.cpp
- src/motif/clipbrd.cpp
- src/motif/colour.cpp
- src/motif/combobox.cpp
- src/motif/combobox_native.cpp
- src/motif/control.cpp
- src/motif/cursor.cpp
- src/motif/data.cpp
- src/motif/dataobj.cpp
- src/motif/dc.cpp
- src/motif/dcclient.cpp
- src/motif/dcmemory.cpp
- src/motif/dcscreen.cpp
- src/motif/dialog.cpp
- src/motif/evtloop.cpp
- src/motif/filedlg.cpp
- src/motif/font.cpp
- src/motif/frame.cpp
- src/motif/gauge.cpp
- src/motif/sockmot.cpp
- src/motif/icon.cpp
- src/motif/listbox.cpp
- src/motif/main.cpp
- src/motif/menu.cpp
- src/motif/menuitem.cpp
- src/motif/minifram.cpp
- src/motif/msgdlg.cpp
- src/motif/popupwin.cpp
- src/motif/radiobox.cpp
- src/motif/radiobut.cpp
- src/motif/scrolbar.cpp
- src/motif/settings.cpp
- src/motif/slider.cpp
- src/motif/spinbutt.cpp
- src/motif/statbmp.cpp
- src/motif/statbox.cpp
- src/motif/stattext.cpp
- src/motif/textctrl.cpp
- src/motif/textentry.cpp
- src/motif/timer.cpp
- src/motif/toolbar.cpp
- src/motif/toplevel.cpp
- src/motif/utils.cpp
- src/motif/window.cpp
- src/motif/xmcombo/xmcombo.c
-
- src/generic/clrpickerg.cpp
- src/generic/collpaneg.cpp
- src/generic/colrdlgg.cpp
- src/generic/dirdlgg.cpp
- src/generic/fdrepdlg.cpp
- src/generic/filepickerg.cpp
- src/generic/fontdlgg.cpp
- src/generic/fontpickerg.cpp
- src/generic/listctrl.cpp
- src/generic/mdig.cpp
- src/generic/notebook.cpp
- src/generic/prntdlgg.cpp
- src/generic/statline.cpp
- src/generic/statusbr.cpp
- src/generic/tabg.cpp
- src/generic/activityindicator.cpp
-
-
- wx/generic/clrpickerg.h
- wx/generic/collpaneg.h
- wx/generic/colrdlgg.h
- wx/generic/ctrlsub.h
- wx/generic/dirdlgg.h
- wx/generic/fdrepdlg.h
- wx/generic/filepickerg.h
- wx/generic/fontdlgg.h
- wx/generic/fontpickerg.h
- wx/generic/listctrl.h
- wx/generic/mdig.h
- wx/generic/notebook.h
- wx/generic/prntdlgg.h
- wx/generic/statline.h
- wx/generic/statusbr.h
- wx/generic/tabg.h
- wx/motif/accel.h
- wx/motif/app.h
- wx/motif/bmpbuttn.h
- wx/motif/bmpmotif.h
- wx/motif/button.h
- wx/motif/checkbox.h
- wx/motif/checklst.h
- wx/motif/chkconf.h
- wx/motif/choice.h
- wx/motif/clipbrd.h
- wx/motif/colour.h
- wx/motif/combobox.h
- wx/motif/control.h
- wx/motif/ctrlsub.h
- wx/motif/cursor.h
- wx/motif/dataform.h
- wx/motif/dataobj.h
- wx/motif/dataobj2.h
- wx/motif/dc.h
- wx/motif/dcclient.h
- wx/motif/dcmemory.h
- wx/motif/dcprint.h
- wx/motif/dcscreen.h
- wx/motif/dialog.h
- wx/motif/dnd.h
- wx/motif/filedlg.h
- wx/motif/font.h
- wx/motif/frame.h
- wx/motif/gauge.h
- wx/motif/icon.h
- wx/motif/listbox.h
- wx/motif/menu.h
- wx/motif/menuitem.h
- wx/motif/minifram.h
- wx/motif/msgdlg.h
- wx/motif/popupwin.h
- wx/motif/print.h
- wx/motif/private.h
- wx/motif/radiobox.h
- wx/motif/radiobut.h
- wx/motif/scrolbar.h
- wx/motif/slider.h
- wx/motif/spinbutt.h
- wx/motif/statbmp.h
- wx/motif/statbox.h
- wx/motif/stattext.h
- wx/motif/textctrl.h
- wx/motif/textentry.h
- wx/motif/tglbtn.h
- wx/motif/toolbar.h
- wx/motif/toplevel.h
- wx/motif/window.h
-
-
-
@@ -3229,7 +3063,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/qt/glcanvas.cpp
src/msw/glcanvas.cpp
- src/x11/glcanvas.cpp src/unix/glx11.cpp
src/x11/glcanvas.cpp src/unix/glx11.cpp
@@ -3261,7 +3094,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/qt/glcanvas.h
wx/msw/glcanvas.h
- wx/x11/glcanvas.h wx/unix/glx11.h
wx/x11/glcanvas.h wx/unix/glx11.h
@@ -3478,7 +3310,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(BASE_OSX_NOTWXMAC_SRC)
$(BASE_OSX_NOTWXMAC_SRC)
$(BASE_OSX_NOTWXMAC_SRC)
- $(BASE_OSX_NOTWXMAC_SRC)
F7
- Ctrl+N --> CtrlN
- Alt+k --> Metak
- Ctrl+Shift+A --> Ctrl ShiftA
-
- and handle Ctrl-N & similia
- */
-
- static char buf[256];
-
- buf[0] = '\0';
- wxString tmp = s + 1; // skip TAB
- size_t index = 0;
-
- while( index < tmp.length() )
- {
- size_t plus = tmp.find( '+', index );
- size_t minus = tmp.find( '-', index );
-
- // neither '+' nor '-', add
- if( plus == wxString::npos && minus == wxString::npos )
- {
- strcat( buf, "" );
- strcat( buf, tmp.c_str() + index );
-
- return buf;
- }
-
- // OK: npos is big and positive
- size_t sep = wxMin( plus, minus );
- wxString mod = tmp.substr( index, sep - index );
-
- // Ctrl -> Ctrl
- // Shift -> Shift
- // Alt -> Meta
- if( mod == "Alt" )
- mod = "Meta";
-
- if( buf[0] )
- strcat( buf, " " );
-
- strcat( buf, mod.c_str() );
-
- index = sep + 1;
- }
-
- return NULL;
-#endif
-}
-
-XmString wxFindAcceleratorText (const char *s)
-{
-#if 1
- wxUnusedVar(s);
- // VZ: this function returns incorrect keysym which completely breaks kbd
- // handling
- return NULL;
-#else
- // The accelerator text is after the \t char.
- s = strchr( s, '\t' );
-
- if( !s ) return NULL;
-
- return wxStringToXmString( s + 1 ); // skip TAB!
-#endif
-}
-
-// Change a widget's foreground and background colours.
-void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
-{
- if (!foregroundColour.IsOk())
- return;
-
- // When should we specify the foreground, if it's calculated
- // by wxComputeColours?
- // Solution: say we start with the default (computed) foreground colour.
- // If we call SetForegroundColour explicitly for a control or window,
- // then the foreground is changed.
- // Therefore SetBackgroundColour computes the foreground colour, and
- // SetForegroundColour changes the foreground colour. The ordering is
- // important.
-
- XtVaSetValues ((Widget) widget,
- XmNforeground, foregroundColour.AllocColour(XtDisplay((Widget) widget)),
- NULL);
-}
-
-void wxDoChangeBackgroundColour(WXWidget widget, const wxColour& backgroundColour, bool changeArmColour)
-{
- if (!backgroundColour.IsOk())
- return;
-
- wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,
- NULL);
-
- XtVaSetValues ((Widget) widget,
- XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
- XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel,
- XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel,
- XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
- NULL);
-
- if (changeArmColour)
- XtVaSetValues ((Widget) widget,
- XmNarmColor, g_itemColors[wxSELE_INDEX].pixel,
- NULL);
-}
-
-extern void wxDoChangeFont(WXWidget widget, const wxFont& font)
-{
- // Lesstif 0.87 hangs here, but 0.93 does not; MBN: sometimes it does
-#if !wxCHECK_LESSTIF() // || wxCHECK_LESSTIF_VERSION( 0, 93 )
- Widget w = (Widget)widget;
- XtVaSetValues( w,
- wxFont::GetFontTag(), font.GetFontTypeC( XtDisplay(w) ),
- NULL );
-#else
- wxUnusedVar(widget);
- wxUnusedVar(font);
-#endif
-
-}
-
-wxString wxXmStringToString( const XmString& xmString )
-{
- char *txt;
- if( XmStringGetLtoR( xmString, XmSTRING_DEFAULT_CHARSET, &txt ) )
- {
- wxString str(txt);
- XtFree (txt);
- return str;
- }
-
- return wxEmptyString;
-}
-
-XmString wxStringToXmString( const char* str )
-{
- return XmStringCreateLtoR((char *)str, XmSTRING_DEFAULT_CHARSET);
-}
-
-// ----------------------------------------------------------------------------
-// wxBitmap utility functions
-// ----------------------------------------------------------------------------
-
-// Creates a bitmap with transparent areas drawn in
-// the given colour.
-wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, const wxColour& colour)
-{
- wxBitmap newBitmap(bitmap.GetWidth(),
- bitmap.GetHeight(),
- bitmap.GetDepth());
- wxMemoryDC destDC;
- wxMemoryDC srcDC;
-
- srcDC.SelectObjectAsSource(bitmap);
- destDC.SelectObject(newBitmap);
-
- wxBrush brush(colour, wxBRUSHSTYLE_SOLID);
- destDC.SetBackground(brush);
- destDC.Clear();
- destDC.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(),
- &srcDC, 0, 0, wxCOPY, true);
-
- return newBitmap;
-}
-
-// ----------------------------------------------------------------------------
-// Miscellaneous functions
-// ----------------------------------------------------------------------------
-
-WXWidget wxCreateBorderWidget( WXWidget parent, long style )
-{
- Widget borderWidget = (Widget)NULL, parentWidget = (Widget)parent;
-
- if (style & wxSIMPLE_BORDER)
- {
- borderWidget = XtVaCreateManagedWidget
- (
- "simpleBorder",
- xmFrameWidgetClass, parentWidget,
- XmNshadowType, XmSHADOW_ETCHED_IN,
- XmNshadowThickness, 1,
- NULL
- );
- }
- else if ((style & wxSUNKEN_BORDER) || (style & wxBORDER_THEME))
- {
- borderWidget = XtVaCreateManagedWidget
- (
- "sunkenBorder",
- xmFrameWidgetClass, parentWidget,
- XmNshadowType, XmSHADOW_IN,
- NULL
- );
- }
- else if (style & wxRAISED_BORDER)
- {
- borderWidget = XtVaCreateManagedWidget
- (
- "raisedBorder",
- xmFrameWidgetClass, parentWidget,
- XmNshadowType, XmSHADOW_OUT,
- NULL
- );
- }
-
- return borderWidget;
-}
diff --git a/src/motif/verti.xbm b/src/motif/verti.xbm
deleted file mode 100644
index b71941e82e..0000000000
--- a/src/motif/verti.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define verti_width 15
-#define verti_height 15
-static unsigned char verti_bits[] = {
- 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
- 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
- 0x84, 0x10, 0x84, 0x10, 0x84, 0x10};
diff --git a/src/motif/window.cpp b/src/motif/window.cpp
deleted file mode 100644
index 523ac5afe3..0000000000
--- a/src/motif/window.cpp
+++ /dev/null
@@ -1,2696 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: src/motif/window.cpp
-// Purpose: wxWindow
-// Author: Julian Smart
-// Modified by:
-// Created: 17/09/98
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
- #include "wx/hash.h"
- #include "wx/log.h"
- #include "wx/app.h"
- #include "wx/utils.h"
- #include "wx/frame.h"
- #include "wx/dc.h"
- #include "wx/dcclient.h"
- #include "wx/button.h"
- #include "wx/menu.h"
- #include "wx/settings.h"
- #include "wx/scrolwin.h"
- #include "wx/layout.h"
- #include "wx/menuitem.h"
- #include "wx/module.h"
-#endif
-
-#include "wx/evtloop.h"
-#include "wx/unix/utilsx11.h"
-
-#if wxUSE_DRAG_AND_DROP
- #include "wx/dnd.h"
-#endif
-
-// DoSetSizeIntr and DoMoveWindowIntr
-// PROBLEM:
-// under Motif composite controls (such as wxCalendarCtrl or generic wxSpinCtrl
-// did not work and/or segfaulted because
-// 1) wxWindow::Create calls SetSize,
-// which results in a call to DoSetSize much earlier than in the other ports
-// 2) if wxWindow::Create is called (wxControl::Create calls it)
-// then DoSetSize is never called, causing layout problems in composite
-// controls
-//
-// SOLUTION:
-// 1) don't call SetSize, DoSetSize, DoMoveWindow, DoGetPosition,
-// DoSetPosition directly or indirectly from wxWindow::Create
-// 2) call DoMoveWindow from DoSetSize, allowing controls to override it
-
-#ifdef __VMS__
- #pragma message disable nosimpint
-#endif
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include // for XmMenuPosition
-#ifdef __VMS__
- #pragma message enable nosimpint
-#endif
-
-#include "wx/motif/private.h"
-#include "wx/motif/dcclient.h"
-
-#include
-
-// ----------------------------------------------------------------------------
-// global variables for this module
-// ----------------------------------------------------------------------------
-
-extern wxHashTable *wxWidgetHashTable;
-static wxWindow* g_captureWindow = NULL;
-
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-static void wxCanvasRepaintProc(Widget, XtPointer, XmDrawingAreaCallbackStruct * cbs);
-static void wxCanvasInputEvent(Widget drawingArea, XtPointer data, XmDrawingAreaCallbackStruct * cbs);
-static void wxCanvasMotionEvent(Widget, XButtonEvent * event);
-static void wxCanvasEnterLeave(Widget drawingArea, XtPointer clientData, XCrossingEvent * event);
-static void wxScrollBarCallback(Widget widget, XtPointer clientData,
- XmScrollBarCallbackStruct *cbs);
-static void wxPanelItemEventHandler(Widget wid,
- XtPointer client_data,
- XEvent* event,
- Boolean *continueToDispatch);
-
-// unused for now
-#if 0
-
-// Helper function for 16-bit fonts
-static int str16len(const char *s)
-{
- int count = 0;
-
- while (s[0] && s[1]) {
- count++;
- s += 2;
- }
-
- return count;
-}
-
-#endif // 0
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-#define event_left_is_down(x) ((x)->xbutton.state & Button1Mask)
-#define event_middle_is_down(x) ((x)->xbutton.state & Button2Mask)
-#define event_right_is_down(x) ((x)->xbutton.state & Button3Mask)
-
-// ----------------------------------------------------------------------------
-// event tables
-// ----------------------------------------------------------------------------
-
-wxBEGIN_EVENT_TABLE(wxWindow, wxWindowBase)
- EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-wxEND_EVENT_TABLE()
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// helper functions
-// ----------------------------------------------------------------------------
-
-void wxWindow::UnmanageAndDestroy(WXWidget widget)
-{
- Widget w = (Widget)widget;
- if ( w )
- {
- XtUnmanageChild(w);
- XtDestroyWidget(w);
- }
-}
-
-bool wxWindow::MapOrUnmap(WXWidget widget, bool domap)
-{
- Widget w = (Widget)widget;
- if ( !w )
- return false;
-
- // Rationale: a lot of common operations (including but not
- // limited to moving, resizing and appending items to a listbox)
- // unmamange the widget, do their work, then manage it again.
- // This means that, for example adding an item to a listbox will show it,
- // or that most controls are shown every time they are moved or resized!
- XtSetMappedWhenManaged( w, domap );
-
- // if the widget is not unmanaged, it still intercepts
- // mouse events, even if it is not mapped (and hence invisible)
- if ( domap )
- {
- XtManageChild(w);
- // XtMapWidget(w);
- }
- else
- {
- XtUnmanageChild(w);
- // XtUnmapWidget(w);
- }
-
- return true;
-}
-
-// ----------------------------------------------------------------------------
-// constructors
-// ----------------------------------------------------------------------------
-
-void wxWindow::Init()
-{
- // Motif-specific
- m_needsRefresh = true;
- m_mainWidget = (WXWidget) 0;
-
- m_winCaptured = false;
-
- m_isShown = true;
-
- m_hScrollBar =
- m_vScrollBar =
- m_borderWidget =
- m_scrolledWindow =
- m_drawingArea = (WXWidget) 0;
-
- m_scrollPosX =
- m_scrollPosY = 0;
-
- m_backingPixmap = (WXPixmap) 0;
- m_pixmapWidth =
- m_pixmapHeight = 0;
-
- m_pixmapOffsetX =
- m_pixmapOffsetY = 0;
-
- m_lastTS = 0;
- m_lastButton = 0;
-}
-
-// real construction (Init() must have been called before!)
-bool wxWindow::Create(wxWindow *parent, wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
-{
- // Get default border
- wxBorder border = GetBorder(style);
- style &= ~wxBORDER_MASK;
- style |= border;
-
- wxCHECK_MSG( parent, false, "can't create wxWindow without parent" );
-
- CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);
-
- parent->AddChild(this);
- PreCreation();
-
- //// TODO: we should probably optimize by only creating a
- //// a drawing area if we have one or more scrollbars (wxVSCROLL/wxHSCROLL).
- //// But for now, let's simplify things by always creating the
- //// drawing area, since otherwise the translations are different.
-
- // New translations for getting mouse motion feedback
- static const String translations = wxMOTIF_STR(
-": wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
-: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
-: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
-: wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\
-: DrawingAreaInput() ManagerGadgetArm()\n\
-: DrawingAreaInput() ManagerGadgetArm()\n\
-: DrawingAreaInput() ManagerGadgetArm()\n\
-: DrawingAreaInput() ManagerGadgetActivate()\n\
-: DrawingAreaInput() ManagerGadgetActivate()\n\
-: DrawingAreaInput() ManagerGadgetActivate()\n\
-: wxCanvasMotionEvent() DrawingAreaInput()\n\
-: wxCanvasMotionEvent() DrawingAreaInput()\n\
-: wxCanvasMotionEvent() DrawingAreaInput()\n\
-: DrawingAreaInput()");
-
- XtActionsRec actions[1];
- actions[0].string = wxMOTIF_STR("wxCanvasMotionEvent");
- actions[0].proc = (XtActionProc) wxCanvasMotionEvent;
- XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1);
-
- Widget parentWidget = (Widget) parent->GetClientWidget();
- m_borderWidget = wxCreateBorderWidget( (WXWidget)parentWidget, style );
-
- m_scrolledWindow = (WXWidget)XtVaCreateManagedWidget
- (
- "scrolledWindow",
- xmScrolledWindowWidgetClass,
- m_borderWidget ? (Widget) m_borderWidget
- : parentWidget,
- XmNresizePolicy, XmRESIZE_NONE,
- XmNspacing, 0,
- XmNscrollingPolicy, XmAPPLICATION_DEFINED,
- //XmNscrollBarDisplayPolicy, XmAS_NEEDED,
- NULL
- );
-
- XtTranslations ptr = XtParseTranslationTable(translations);
- m_drawingArea = (WXWidget)XtVaCreateWidget
- (
- name,
- xmDrawingAreaWidgetClass, (Widget) m_scrolledWindow,
- XmNunitType, XmPIXELS,
- // XmNresizePolicy, XmRESIZE_ANY,
- XmNresizePolicy, XmRESIZE_NONE,
- XmNmarginHeight, 0,
- XmNmarginWidth, 0,
- XmNtranslations, ptr,
- NULL
- );
- XtFree((char *) ptr);
-
-#if 0
- if (GetWindowStyleFlag() & wxOVERRIDE_KEY_TRANSLATIONS)
- {
- ptr = XtParseTranslationTable (": DrawingAreaInput()");
- XtOverrideTranslations ((Widget) m_drawingArea, ptr);
- XtFree ((char *) ptr);
- }
-#endif // 0
-
- wxAddWindowToTable((Widget) m_drawingArea, this);
- wxAddWindowToTable((Widget) m_scrolledWindow, this);
-
- // This order is very important in Motif 1.2.1
- XtRealizeWidget ((Widget) m_scrolledWindow);
- XtRealizeWidget ((Widget) m_drawingArea);
- XtManageChild ((Widget) m_drawingArea);
-
- ptr = XtParseTranslationTable(": resize()");
- XtOverrideTranslations((Widget) m_drawingArea, ptr);
- XtFree ((char *) ptr);
-
- XtAddCallback ((Widget) m_drawingArea, XmNexposeCallback, (XtCallbackProc) wxCanvasRepaintProc, (XtPointer) this);
- XtAddCallback ((Widget) m_drawingArea, XmNinputCallback, (XtCallbackProc) wxCanvasInputEvent, (XtPointer) this);
-
- XtAddEventHandler(
- (Widget)m_drawingArea,
- PointerMotionHintMask | EnterWindowMask |
- LeaveWindowMask | FocusChangeMask,
- False,
- (XtEventHandler) wxCanvasEnterLeave,
- (XtPointer) this
- );
-
- XmScrolledWindowSetAreas(
- (Widget)m_scrolledWindow,
- (Widget) 0, (Widget) 0,
- (Widget) m_drawingArea);
-
- PostCreation();
-
- // Without this, the cursor may not be restored properly (e.g. in splitter
- // sample).
- SetCursor(*wxSTANDARD_CURSOR);
- DoSetSizeIntr(pos.x, pos.y, size.x,size.y, wxSIZE_AUTO, true);
- return true;
-}
-
-// Destructor
-wxWindow::~wxWindow()
-{
- SendDestroyEvent();
-
- if (g_captureWindow == this)
- g_captureWindow = NULL;
-
- // Motif-specific actions first
- WXWidget wMain = GetMainWidget();
- if ( wMain )
- {
- // Removes event handlers
- DetachWidget(wMain);
- }
-
- // If m_drawingArea, we're a fully-fledged window with drawing area,
- // scrollbars etc. (what wxCanvas used to be)
- if ( m_drawingArea )
- {
- // Destroy children before destroying self
- DestroyChildren();
-
- if (m_backingPixmap)
- XFreePixmap (XtDisplay ((Widget) GetMainWidget()), (Pixmap) m_backingPixmap);
-
- Widget w = (Widget) m_drawingArea;
- wxDeleteWindowFromTable(w);
-
- if (w)
- {
- XtDestroyWidget(w);
- m_drawingArea = (WXWidget) 0;
- }
-
- // Only if we're _really_ a canvas (not a dialog box/panel)
- if (m_scrolledWindow)
- {
- wxDeleteWindowFromTable((Widget) m_scrolledWindow);
- }
-
- if (m_hScrollBar)
- {
- wxDeleteWindowFromTable((Widget) m_hScrollBar);
- XtUnmanageChild((Widget) m_hScrollBar);
- }
- if (m_vScrollBar)
- {
- wxDeleteWindowFromTable((Widget) m_vScrollBar);
- XtUnmanageChild((Widget) m_vScrollBar);
- }
-
- if (m_hScrollBar)
- XtDestroyWidget((Widget) m_hScrollBar);
- if (m_vScrollBar)
- XtDestroyWidget((Widget) m_vScrollBar);
-
- UnmanageAndDestroy(m_scrolledWindow);
-
- if (m_borderWidget)
- {
- XtDestroyWidget ((Widget) m_borderWidget);
- m_borderWidget = (WXWidget) 0;
- }
- }
- else // Why wasn't this here before? JACS 8/3/2000
- DestroyChildren();
-
-
- // Destroy the window
- if (GetMainWidget())
- {
- // If this line (XtDestroyWidget) causes a crash, you may comment it out.
- // Child widgets will get destroyed automatically when a frame
- // or dialog is destroyed, but before that you may get some memory
- // leaks and potential layout problems if you delete and then add
- // child windows.
-
- // GRG, Feb/2000: commented this out when adding support for
- // wxSCROLL[WIN]_THUMBRELEASE events. Also it was reported
- // that this call crashed wxMotif under OS/2, so it seems
- // that leaving it out is the right thing to do.
- // SN, Feb/2000: newgrid/griddemo shows why it is needed :-(
- XtDestroyWidget((Widget) GetMainWidget());
- SetMainWidget((WXWidget) NULL);
- }
-}
-
-// ----------------------------------------------------------------------------
-// scrollbar management
-// ----------------------------------------------------------------------------
-
-WXWidget wxWindow::DoCreateScrollBar(WXWidget parent,
- wxOrientation orientation,
- void (*callback)())
-{
- int orient = ( orientation & wxHORIZONTAL ) ? XmHORIZONTAL : XmVERTICAL;
- Widget sb =
- XtVaCreateManagedWidget( "scrollBarWidget",
- xmScrollBarWidgetClass, (Widget)parent,
- XmNorientation, orient,
- XmNincrement, 1,
- XmNvalue, 0,
- NULL );
-
- XtPointer o = (XtPointer)orientation;
- XtCallbackProc cb = (XtCallbackProc)callback;
-
- XtAddCallback( sb, XmNvalueChangedCallback, cb, o );
- XtAddCallback( sb, XmNdragCallback, cb, o );
- XtAddCallback( sb, XmNincrementCallback, cb, o );
- XtAddCallback( sb, XmNdecrementCallback, cb, o );
- XtAddCallback( sb, XmNpageIncrementCallback, cb, o );
- XtAddCallback( sb, XmNpageDecrementCallback, cb, o );
- XtAddCallback( sb, XmNtoTopCallback, cb, o );
- XtAddCallback( sb, XmNtoBottomCallback, cb, o );
-
- return (WXWidget)sb;
-}
-
-// Helper function
-void wxWindow::CreateScrollbar(wxOrientation orientation)
-{
- wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
-
- XtVaSetValues( (Widget) m_scrolledWindow,
- XmNresizePolicy, XmRESIZE_NONE,
- NULL );
-
- wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
- // Add scrollbars if required
- if (orientation == wxHORIZONTAL)
- {
- m_hScrollBar = DoCreateScrollBar( m_scrolledWindow, wxHORIZONTAL,
- (void (*)())wxScrollBarCallback );
-
- wxDoChangeBackgroundColour(m_hScrollBar, backgroundColour, true);
-
- XtRealizeWidget( (Widget)m_hScrollBar );
-
- XtVaSetValues((Widget) m_scrolledWindow,
- XmNhorizontalScrollBar, (Widget) m_hScrollBar,
- NULL);
-
- wxAddWindowToTable( (Widget)m_hScrollBar, this );
- }
- else if (orientation == wxVERTICAL)
- {
- m_vScrollBar = DoCreateScrollBar( m_scrolledWindow, wxVERTICAL,
- (void (*)())wxScrollBarCallback );
-
- wxDoChangeBackgroundColour(m_vScrollBar, backgroundColour, true);
-
- XtRealizeWidget((Widget)m_vScrollBar);
-
- XtVaSetValues((Widget) m_scrolledWindow,
- XmNverticalScrollBar, (Widget) m_vScrollBar,
- NULL);
-
- wxAddWindowToTable( (Widget)m_vScrollBar, this );
- }
-
- XtVaSetValues( (Widget) m_scrolledWindow,
- XmNresizePolicy, XmRESIZE_ANY,
- NULL );
-}
-
-void wxWindow::DestroyScrollbar(wxOrientation orientation)
-{
- wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
-
- XtVaSetValues((Widget) m_scrolledWindow,
- XmNresizePolicy, XmRESIZE_NONE,
- NULL);
- String stringSB = orientation == wxHORIZONTAL ?
- XmNhorizontalScrollBar : XmNverticalScrollBar;
- WXWidget* widgetSB = orientation == wxHORIZONTAL ?
- &m_hScrollBar : &m_vScrollBar;
-
- if( *widgetSB )
- {
- wxDeleteWindowFromTable( (Widget)*widgetSB );
- XtDestroyWidget( (Widget)*widgetSB );
- *widgetSB = (WXWidget)NULL;
- }
-
- XtVaSetValues( (Widget)m_scrolledWindow,
- stringSB, (Widget) 0,
- NULL );
-
- XtVaSetValues((Widget) m_scrolledWindow,
- XmNresizePolicy, XmRESIZE_ANY,
- NULL);
-}
-
-// ---------------------------------------------------------------------------
-// basic operations
-// ---------------------------------------------------------------------------
-
-void wxWindow::SetFocus()
-{
- Widget wMain = (Widget) GetMainWidget();
- XmProcessTraversal(wMain, XmTRAVERSE_CURRENT);
- XmProcessTraversal((Widget) GetMainWidget(), XmTRAVERSE_CURRENT);
-}
-
-// Get the window with the focus
-wxWindow *wxWindowBase::DoFindFocus()
-{
- // TODO Problems:
- // (1) Can there be multiple focussed widgets in an application?
- // In which case we need to find the top-level window that's
- // currently active.
- // (2) The widget with the focus may not be in the widget table
- // depending on which widgets I put in the table
- wxWindow *winFocus = NULL;
- for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
- node;
- node = node->GetNext() )
- {
- wxWindow *win = node->GetData();
-
- Widget w = XmGetFocusWidget ((Widget) win->GetTopWidget());
-
- if (w != (Widget) NULL)
- {
- winFocus = wxGetWindowFromTable(w);
- if ( winFocus )
- break;
- }
- }
-
- return winFocus;
-}
-
-bool wxWindow::Enable(bool enable)
-{
- if ( !wxWindowBase::Enable(enable) )
- return false;
-
- Widget wMain = (Widget)GetMainWidget();
- if ( wMain )
- {
- XtSetSensitive(wMain, enable);
- XmUpdateDisplay(wMain);
- }
-
- return true;
-}
-
-bool wxWindow::Show(bool show)
-{
- if ( !wxWindowBase::Show(show) )
- return false;
-
- if (m_borderWidget || m_scrolledWindow)
- {
- MapOrUnmap(m_borderWidget ? m_borderWidget : m_scrolledWindow, show);
- // MapOrUnmap(m_drawingArea, show);
- }
- else
- {
- if ( !MapOrUnmap(GetTopWidget(), show) )
- MapOrUnmap(GetMainWidget(), show);
- }
-
- return true;
-}
-
-// Raise the window to the top of the Z order
-void wxWindow::Raise()
-{
- Widget wTop = (Widget) GetTopWidget();
- Window window = XtWindow(wTop);
- XRaiseWindow(XtDisplay(wTop), window);
-}
-
-// Lower the window to the bottom of the Z order
-void wxWindow::Lower()
-{
- Widget wTop = (Widget) GetTopWidget();
- Window window = XtWindow(wTop);
- XLowerWindow(XtDisplay(wTop), window);
-}
-
-void wxWindow::SetLabel(const wxString& label)
-{
- XtVaSetValues((Widget)GetMainWidget(), XmNtitle,
- (const char*)label.mb_str(), NULL);
-}
-
-wxString wxWindow::GetLabel() const
-{
- char *label = NULL;
- XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &label, NULL);
-
- return wxString(label);
-}
-
-void wxWindow::DoCaptureMouse()
-{
- g_captureWindow = this;
- if ( m_winCaptured )
- return;
-
- Widget wMain = (Widget)GetMainWidget();
- if ( wMain )
- XtAddGrab(wMain, True, False);
-
- m_winCaptured = true;
-}
-
-void wxWindow::DoReleaseMouse()
-{
- g_captureWindow = NULL;
- if ( !m_winCaptured )
- return;
-
- Widget wMain = (Widget)GetMainWidget();
- if ( wMain )
- XtRemoveGrab(wMain);
-
- m_winCaptured = false;
-}
-
-bool wxWindow::SetFont(const wxFont& font)
-{
- if ( !wxWindowBase::SetFont(font) )
- {
- // nothing to do
- return false;
- }
-
- ChangeFont();
-
- return true;
-}
-
-bool wxWindow::SetCursor(const wxCursor& cursor)
-{
- if ( !wxWindowBase::SetCursor(cursor) )
- {
- // no change
- return false;
- }
-
- // wxASSERT_MSG( m_cursor.IsOk(),
- // wxT("cursor must be valid after call to the base version"));
- const wxCursor* cursor2 = NULL;
- if (m_cursor.IsOk())
- cursor2 = & m_cursor;
- else
- cursor2 = wxSTANDARD_CURSOR;
-
- WXDisplay *dpy = GetXDisplay();
- WXCursor x_cursor = cursor2->GetXCursor(dpy);
-
- Widget w = (Widget) GetMainWidget();
- Window win = XtWindow(w);
- XDefineCursor((Display*) dpy, win, (Cursor) x_cursor);
-
- return true;
-}
-
-// Coordinates relative to the window
-void wxWindow::WarpPointer (int x, int y)
-{
- Widget wClient = (Widget)GetClientWidget();
-
- XWarpPointer(XtDisplay(wClient), None, XtWindow(wClient), 0, 0, 0, 0, x, y);
-}
-
-// ---------------------------------------------------------------------------
-// scrolling stuff
-// ---------------------------------------------------------------------------
-
-int wxWindow::GetScrollPos(int orient) const
-{
- if (orient == wxHORIZONTAL)
- return m_scrollPosX;
- else
- return m_scrollPosY;
-
-#if 0
- Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar);
- if (scrollBar)
- {
- int pos;
- XtVaGetValues(scrollBar, XmNvalue, &pos, NULL);
- return pos;
- }
- else
- return 0;
-#endif // 0
-}
-
-// This now returns the whole range, not just the number of positions that we
-// can scroll.
-int wxWindow::GetScrollRange(int orient) const
-{
- Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
- // CE scintilla windows don't always have these scrollbars
- // and it tends to pile up a whole bunch of asserts
- //wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
-
- int range = 0;
- if (scrollBar)
- XtVaGetValues(scrollBar, XmNmaximum, &range, NULL);
- return range;
-}
-
-int wxWindow::GetScrollThumb(int orient) const
-{
- Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
- //wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
-
- int thumb = 0;
- if (scrollBar)
- XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL);
- return thumb;
-}
-
-void wxWindow::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
-{
- Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
-
- if ( scrollBar )
- {
- XtVaSetValues (scrollBar, XmNvalue, pos, NULL);
- }
-
- SetInternalScrollPos((wxOrientation)orient, pos);
-}
-
-// New function that will replace some of the above.
-void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
- int range, bool WXUNUSED(refresh))
-{
- int oldW, oldH;
- GetSize(& oldW, & oldH);
-
- if (range == 0)
- range = 1;
- if (thumbVisible == 0)
- thumbVisible = 1;
-
- if (thumbVisible > range)
- thumbVisible = range;
-
- // Save the old state to see if it changed
- WXWidget oldScrollBar = GetScrollbar((wxOrientation)orient);
-
- if (orient == wxHORIZONTAL)
- {
- if (thumbVisible == range)
- {
- if (m_hScrollBar)
- DestroyScrollbar(wxHORIZONTAL);
- }
- else
- {
- if (!m_hScrollBar)
- CreateScrollbar(wxHORIZONTAL);
- }
- }
- if (orient == wxVERTICAL)
- {
- if (thumbVisible == range)
- {
- if (m_vScrollBar)
- DestroyScrollbar(wxVERTICAL);
- }
- else
- {
- if (!m_vScrollBar)
- CreateScrollbar(wxVERTICAL);
- }
- }
- WXWidget newScrollBar = GetScrollbar((wxOrientation)orient);
-
- if (oldScrollBar != newScrollBar)
- {
- // This is important! Without it, scrollbars misbehave badly.
- XtUnrealizeWidget((Widget) m_scrolledWindow);
- XmScrolledWindowSetAreas ((Widget) m_scrolledWindow, (Widget) m_hScrollBar, (Widget) m_vScrollBar, (Widget) m_drawingArea);
- XtRealizeWidget((Widget) m_scrolledWindow);
- XtManageChild((Widget) m_scrolledWindow);
- }
-
- if (newScrollBar)
- {
- XtVaSetValues((Widget) newScrollBar,
- XmNvalue, pos,
- XmNminimum, 0,
- XmNmaximum, range,
- XmNsliderSize, thumbVisible,
- NULL);
- }
-
- SetInternalScrollPos((wxOrientation)orient, pos);
-
- int newW, newH;
- GetSize(& newW, & newH);
-
- // Adjusting scrollbars can resize the canvas accidentally
- if (newW != oldW || newH != oldH)
- SetSize(wxDefaultCoord, wxDefaultCoord, oldW, oldH);
-}
-
-// Does a physical scroll
-void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
-{
- int x, y, w, h;
- if (rect)
- {
- // Use specified rectangle
- x = rect->x; y = rect->y; w = rect->width; h = rect->height;
- }
- else
- {
- // Use whole client area
- x = 0; y = 0;
- GetClientSize(& w, & h);
- }
-
- int x1 = (dx >= 0) ? x : x - dx;
- int y1 = (dy >= 0) ? y : y - dy;
- int w1 = w - abs(dx);
- int h1 = h - abs(dy);
- int x2 = (dx >= 0) ? x + dx : x;
- int y2 = (dy >= 0) ? y + dy : y;
-
- wxClientDC dc(this);
- wxClientDCImpl * const
- dcimpl = static_cast(dc.GetImpl());
- GC const gc = (GC) dcimpl->GetGC();
-
- dc.SetLogicalFunction (wxCOPY);
-
- Widget widget = (Widget) GetMainWidget();
- Window window = XtWindow(widget);
- Display* display = XtDisplay(widget);
-
- XCopyArea(display, window, window, gc, x1, y1, w1, h1, x2, y2);
-
- dcimpl->SetAutoSetting(true);
- wxBrush brush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID);
- dc.SetBrush(brush); // FIXME: needed?
-
- wxWindowList::compatibility_iterator cnode = m_children.GetFirst();
- while (cnode)
- {
- wxWindow *child = cnode->GetData();
- int sx = 0;
- int sy = 0;
- child->GetSize( &sx, &sy );
- wxPoint pos( child->GetPosition() );
- child->SetSize( pos.x + dx, pos.y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE );
- cnode = cnode->GetNext();
- }
-
- // We'll add rectangles to the list of update rectangles according to which
- // bits we've exposed.
- wxList updateRects;
-
- if (dx > 0)
- {
- wxRect *rect = new wxRect;
- rect->x = x;
- rect->y = y;
- rect->width = dx;
- rect->height = h;
-
- XFillRectangle(display, window, gc, rect->x, rect->y, rect->width, rect->height);
-
- rect->x = rect->x;
- rect->y = rect->y;
- rect->width = rect->width;
- rect->height = rect->height;
-
- updateRects.Append((wxObject*) rect);
- }
- else if (dx < 0)
- {
- wxRect *rect = new wxRect;
-
- rect->x = x + w + dx;
- rect->y = y;
- rect->width = -dx;
- rect->height = h;
-
- XFillRectangle(display, window, gc, rect->x, rect->y, rect->width, rect->height);
-
- rect->x = rect->x;
- rect->y = rect->y;
- rect->width = rect->width;
- rect->height = rect->height;
-
- updateRects.Append((wxObject*) rect);
- }
- if (dy > 0)
- {
- wxRect *rect = new wxRect;
-
- rect->x = x;
- rect->y = y;
- rect->width = w;
- rect->height = dy;
-
- XFillRectangle(display, window, gc, rect->x, rect->y, rect->width, rect->height);
-
- rect->x = rect->x;
- rect->y = rect->y;
- rect->width = rect->width;
- rect->height = rect->height;
-
- updateRects.Append((wxObject*) rect);
- }
- else if (dy < 0)
- {
- wxRect *rect = new wxRect;
-
- rect->x = x;
- rect->y = y + h + dy;
- rect->width = w;
- rect->height = -dy;
-
- XFillRectangle(display, window, gc, rect->x, rect->y, rect->width, rect->height);
-
- rect->x = rect->x;
- rect->y = rect->y;
- rect->width = rect->width;
- rect->height = rect->height;
-
- updateRects.Append((wxObject*) rect);
- }
- dc.SetBrush(wxNullBrush);
-
- // Now send expose events
-
- wxList::compatibility_iterator node = updateRects.GetFirst();
- while (node)
- {
- wxRect* rect = (wxRect*) node->GetData();
- XExposeEvent event;
-
- event.type = Expose;
- event.display = display;
- event.send_event = True;
- event.window = window;
-
- event.x = rect->x;
- event.y = rect->y;
- event.width = rect->width;
- event.height = rect->height;
-
- event.count = 0;
-
- XSendEvent(display, window, False, ExposureMask, (XEvent *)&event);
-
- node = node->GetNext();
-
- }
-
- // Delete the update rects
- node = updateRects.GetFirst();
- while (node)
- {
- wxRect* rect = (wxRect*) node->GetData();
- delete rect;
- node = node->GetNext();
- }
-
- XmUpdateDisplay((Widget) GetMainWidget());
-}
-
-// ---------------------------------------------------------------------------
-// drag and drop
-// ---------------------------------------------------------------------------
-
-#if wxUSE_DRAG_AND_DROP
-
-void wxWindow::SetDropTarget(wxDropTarget * WXUNUSED(pDropTarget))
-{
- // TODO
-}
-
-#endif
-
-// Old style file-manager drag&drop
-void wxWindow::DragAcceptFiles(bool WXUNUSED(accept))
-{
- // TODO
-}
-
-// ----------------------------------------------------------------------------
-// tooltips
-// ----------------------------------------------------------------------------
-
-#if wxUSE_TOOLTIPS
-
-void wxWindow::DoSetToolTip(wxToolTip * WXUNUSED(tooltip))
-{
- // TODO
-}
-
-#endif // wxUSE_TOOLTIPS
-
-// ----------------------------------------------------------------------------
-// popup menus
-// ----------------------------------------------------------------------------
-
-#if wxUSE_MENUS
-
-bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
-{
- if ( x == wxDefaultCoord && y == wxDefaultCoord )
- {
- wxPoint mouse = ScreenToClient(wxGetMousePosition());
- x = mouse.x; y = mouse.y;
- }
-
- Widget widget = (Widget) GetMainWidget();
-
- /* The menuId field seems to be usused, so we'll use it to
- indicate whether a menu is popped up or not:
- 0: Not currently created as a popup
- -1: Created as a popup, but not active
- 1: Active popup.
- */
-
- if (menu->GetParent() && (menu->GetId() != -1))
- return false;
-
- if (menu->GetMainWidget())
- {
- menu->DestroyMenu(true);
- }
-
- menu->SetId(1); /* Mark as popped-up */
- menu->CreateMenu(NULL, widget, menu, 0);
-
- menu->UpdateUI();
-
- // menu->SetParent(parent);
- // parent->children->Append(menu); // Store menu for later deletion
-
- Widget menuWidget = (Widget) menu->GetMainWidget();
-
- int rootX = 0;
- int rootY = 0;
-
- int deviceX = x;
- int deviceY = y;
- /*
- if (this->IsKindOf(CLASSINFO(wxCanvas)))
- {
- wxCanvas *canvas = (wxCanvas *) this;
- deviceX = canvas->GetDC ()->LogicalToDeviceX (x);
- deviceY = canvas->GetDC ()->LogicalToDeviceY (y);
- }
- */
-
- Display *display = XtDisplay (widget);
- Window rootWindow = RootWindowOfScreen (XtScreen((Widget)widget));
- Window thisWindow = XtWindow (widget);
- Window childWindow;
- XTranslateCoordinates (display, thisWindow, rootWindow, (int) deviceX, (int) deviceY,
- &rootX, &rootY, &childWindow);
-
- XButtonPressedEvent event;
- event.type = ButtonPress;
- event.button = 1;
-
- event.x = deviceX;
- event.y = deviceY;
-
- event.x_root = rootX;
- event.y_root = rootY;
-
- XmMenuPosition (menuWidget, &event);
- XtManageChild (menuWidget);
-
- // The ID of a pop-up menu is 1 when active, and is set to 0 by the
- // idle-time destroy routine.
- // Waiting until this ID changes causes this function to block until
- // the menu has been dismissed and the widgets cleaned up.
- // In other words, once this routine returns, it is safe to delete
- // the menu object.
- // Ian Brown
-
- wxEventLoop evtLoop;
-
- while (menu->GetId() == 1)
- {
- wxDoEventLoopIteration( evtLoop );
- }
-
- return true;
-}
-
-#endif
-
-// ---------------------------------------------------------------------------
-// moving and resizing
-// ---------------------------------------------------------------------------
-
-bool wxWindow::PreResize()
-{
- return true;
-}
-
-// Get total size
-void wxWindow::DoGetSize(int *x, int *y) const
-{
- Widget widget = (Widget)( !m_drawingArea ? GetTopWidget() :
- ( m_borderWidget ? m_borderWidget :
- m_scrolledWindow ? m_scrolledWindow :
- m_drawingArea ) );
- Dimension xx, yy;
-
- if (widget)
- XtVaGetValues( widget,
- XmNwidth, &xx,
- XmNheight, &yy,
- NULL );
- if(x) *x = widget ? xx : -1;
- if(y) *y = widget ? yy : -1;
-}
-
-void wxWindow::DoGetPosition(int *x, int *y) const
-{
- Widget widget = (Widget)
- ( m_drawingArea ?
- ( m_borderWidget ? m_borderWidget : m_scrolledWindow ) :
- GetTopWidget() );
-
- Position xx, yy;
- XtVaGetValues(widget, XmNx, &xx, XmNy, &yy, NULL);
-
- // We may be faking the client origin. So a window that's really at (0, 30)
- // may appear (to wxWin apps) to be at (0, 0).
- if (GetParent())
- {
- wxPoint pt(GetParent()->GetClientAreaOrigin());
- xx = (Position)(xx - pt.x);
- yy = (Position)(yy - pt.y);
- }
-
- if(x) *x = xx;
- if(y) *y = yy;
-}
-
-void wxWindow::DoScreenToClient(int *x, int *y) const
-{
- Widget widget = (Widget) GetClientWidget();
- Display *display = XtDisplay((Widget) GetMainWidget());
- Window rootWindow = RootWindowOfScreen(XtScreen(widget));
- Window thisWindow = XtWindow(widget);
-
- Window childWindow;
- int xx = x ? *x : 0;
- int yy = y ? *y : 0;
- XTranslateCoordinates(display, rootWindow, thisWindow,
- xx, yy, x ? x : &xx, y ? y : &yy,
- &childWindow);
-}
-
-void wxWindow::DoClientToScreen(int *x, int *y) const
-{
- Widget widget = (Widget) GetClientWidget();
- Display *display = XtDisplay(widget);
- Window rootWindow = RootWindowOfScreen(XtScreen(widget));
- Window thisWindow = XtWindow(widget);
-
- Window childWindow;
- int xx = x ? *x : 0;
- int yy = y ? *y : 0;
- XTranslateCoordinates(display, thisWindow, rootWindow,
- xx, yy, x ? x : &xx, y ? y : &yy,
- &childWindow);
-}
-
-
-// Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindow::DoGetClientSize(int *x, int *y) const
-{
- Widget widget = (Widget) GetClientWidget();
- Dimension xx, yy;
- XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
- if(x) *x = xx;
- if(y) *y = yy;
-}
-
-void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
- DoSetSizeIntr(x, y, width, height, sizeFlags, false);
-}
-
-void wxWindow::DoSetSizeIntr(int x, int y, int width, int height,
- int sizeFlags, bool fromCtor)
-{
- // A bit of optimization to help sort out the flickers.
- int oldX = -1, oldY = -1, oldW = -1, oldH = -1;
-
- if( !fromCtor )
- {
- GetSize(& oldW, & oldH);
- GetPosition(& oldX, & oldY);
- }
-
- if (x == -1)
- x = oldX;
- if (y == -1)
- y = oldY;
-
- if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
- {
- if ( width == -1 )
- width = oldW;
- if ( height == -1 )
- height = oldH;
- }
-
- wxSize size(wxDefaultSize);
- if ( width <= 0 )
- {
- if ( ( sizeFlags & wxSIZE_AUTO_WIDTH ) && !fromCtor )
- {
- size = DoGetBestSize();
- width = size.x;
- }
- else
- {
- width = oldW;
- }
- }
-
- if ( height == -1 )
- {
- if( ( sizeFlags & wxSIZE_AUTO_HEIGHT ) && !fromCtor )
- {
- if( size.x == -1 ) size = DoGetBestSize();
- height = size.y;
- }
- else
- {
- height = oldH;
- }
- }
-
- if ( x != oldX || y != oldY || width != oldW || height != oldH
- || !wxNoOptimize::CanOptimize() )
- {
- if (m_drawingArea)
- {
- int flags = 0;
-
- if (x != oldX)
- flags |= wxMOVE_X;
-
- if (y != oldY)
- flags |= wxMOVE_Y;
-
- if (width > 0)
- flags |= wxMOVE_WIDTH;
-
- if (height > 0)
- flags |= wxMOVE_HEIGHT;
-
- int xx = x; int yy = y;
- AdjustForParentClientOrigin(xx, yy, sizeFlags);
- if( !fromCtor )
- DoMoveWindow( xx, yy, width, height );
- else
- DoMoveWindowIntr( xx, yy, width, height, flags );
-
- return;
- }
-
- Widget widget = (Widget) GetTopWidget();
- if (!widget)
- return;
-
- bool managed = XtIsManaged( widget );
- if (managed)
- XtUnmanageChild(widget);
-
- int xx = x;
- int yy = y;
- AdjustForParentClientOrigin(xx, yy, sizeFlags);
-
- DoMoveWindow(xx, yy, width, height);
-
- if (managed)
- XtManageChild(widget);
- }
-}
-
-void wxWindow::DoSetClientSize(int width, int height)
-{
- if (m_drawingArea)
- {
- Widget drawingArea = (Widget) m_drawingArea;
-
- XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
-
- if (width > -1)
- XtVaSetValues(drawingArea, XmNwidth, width, NULL);
- if (height > -1)
- XtVaSetValues(drawingArea, XmNheight, height, NULL);
-
- XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
- return;
- }
-
- Widget widget = (Widget) GetTopWidget();
-
- if (width > -1)
- XtVaSetValues(widget, XmNwidth, width, NULL);
- if (height > -1)
- XtVaSetValues(widget, XmNheight, height, NULL);
-}
-
-void wxWindow::DoMoveWindowIntr(int xx, int yy, int w, int h,
- int flags)
-{
- if (m_drawingArea)
- {
- Widget drawingArea = (Widget) m_drawingArea;
- Widget borderOrScrolled = m_borderWidget ?
- (Widget) m_borderWidget :
- (Widget) m_scrolledWindow;
-
- bool managed = XtIsManaged(borderOrScrolled);
- if (managed)
- XtUnmanageChild (borderOrScrolled);
- XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
-
- if (flags & wxMOVE_X)
- XtVaSetValues (borderOrScrolled,
- XmNx, xx,
- NULL);
- if (flags & wxMOVE_Y)
- XtVaSetValues (borderOrScrolled,
- XmNy, yy,
- NULL);
-
- if (flags & wxMOVE_WIDTH)
- {
- if (m_borderWidget)
- {
- XtVaSetValues ((Widget) m_borderWidget, XmNwidth, w, NULL);
- short thick, margin;
- XtVaGetValues ((Widget) m_borderWidget,
- XmNshadowThickness, &thick,
- XmNmarginWidth, &margin,
- NULL);
- w -= 2 * (thick + margin);
- }
-
- if( w < 1 ) w = 1;
- XtVaSetValues ((Widget) m_scrolledWindow, XmNwidth, w, NULL);
- }
-
- if (flags & wxMOVE_HEIGHT)
- {
- if (m_borderWidget)
- {
- XtVaSetValues ((Widget) m_borderWidget, XmNheight, h, NULL);
- short thick, margin;
- XtVaGetValues ((Widget) m_borderWidget,
- XmNshadowThickness, &thick,
- XmNmarginHeight, &margin,
- NULL);
- h -= 2 * (thick + margin);
- }
-
- if( h < 1 ) h = 1;
- XtVaSetValues ((Widget) m_scrolledWindow, XmNheight, h, NULL);
- }
-
- if (managed)
- XtManageChild (borderOrScrolled);
- XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
- }
- else
- {
- if( w < 1 ) w = 1;
- if( h < 1 ) h = 1;
-
- XtVaSetValues((Widget)GetTopWidget(),
- XmNx, xx,
- XmNy, yy,
- XmNwidth, w,
- XmNheight, h,
- NULL);
- }
-}
-
-void wxWindow::DoMoveWindow(int x, int y, int width, int height)
-{
- DoMoveWindowIntr (x, y, width, height,
- wxMOVE_X|wxMOVE_Y|wxMOVE_WIDTH|wxMOVE_HEIGHT);
-}
-
-// ---------------------------------------------------------------------------
-// text metrics
-// ---------------------------------------------------------------------------
-
-int wxWindow::GetCharHeight() const
-{
- int height;
-
- if (m_font.IsOk())
- wxGetTextExtent (GetXDisplay(), m_font, 1.0,
- "x", NULL, &height, NULL, NULL);
- else
- wxGetTextExtent (this, "x", NULL, &height, NULL, NULL);
-
- return height;
-}
-
-int wxWindow::GetCharWidth() const
-{
- int width;
-
- if (m_font.IsOk())
- wxGetTextExtent (GetXDisplay(), m_font, 1.0,
- "x", &width, NULL, NULL, NULL);
- else
- wxGetTextExtent (this, "x", &width, NULL, NULL, NULL);
-
- return width;
-}
-
-void wxWindow::DoGetTextExtent(const wxString& string,
- int *x, int *y,
- int *descent,
- int *externalLeading,
- const wxFont *theFont) const
-{
- const wxFont *fontToUse = theFont ? theFont : &m_font;
-
- if (externalLeading)
- *externalLeading = 0;
- if (fontToUse->IsOk())
- wxGetTextExtent (GetXDisplay(), *fontToUse, 1.0,
- string, x, y, NULL, descent);
- else
- wxGetTextExtent (this, string, x, y, NULL, descent);
-}
-
-// ----------------------------------------------------------------------------
-// painting
-// ----------------------------------------------------------------------------
-
-void wxWindow::AddUpdateRect(int x, int y, int w, int h)
-{
- m_updateRegion.Union( x, y, w, h );
-}
-
-void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
-{
- Widget widget = (Widget) GetMainWidget();
- if (!widget)
- return;
- m_needsRefresh = true;
- Display *display = XtDisplay(widget);
- Window thisWindow = XtWindow(widget);
-
- XExposeEvent dummyEvent;
- int width, height;
- GetSize(&width, &height);
-
- dummyEvent.type = Expose;
- dummyEvent.display = display;
- dummyEvent.send_event = True;
- dummyEvent.window = thisWindow;
- if (rect)
- {
- dummyEvent.x = rect->x;
- dummyEvent.y = rect->y;
- dummyEvent.width = rect->width;
- dummyEvent.height = rect->height;
- }
- else
- {
- dummyEvent.x = 0;
- dummyEvent.y = 0;
- dummyEvent.width = width;
- dummyEvent.height = height;
- }
- dummyEvent.count = 0;
-
- if (eraseBack)
- {
- wxClientDC dc(this);
- wxBrush backgroundBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID);
- dc.SetBackground(backgroundBrush);
-
- wxClientDCImpl * const
- dcimpl = static_cast(dc.GetImpl());
- if (rect)
- dcimpl->Clear(*rect);
- else
- dcimpl->Clear();
- }
-
- XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent);
-}
-
-void wxWindow::DoPaint()
-{
- //TODO : make a temporary gc so we can do the XCopyArea below
- if (m_backingPixmap && !m_needsRefresh)
- {
- wxPaintDC dc(this);
-
- wxPaintDCImpl * const
- dcimpl = static_cast(dc.GetImpl());
-
- GC tempGC = (GC) dcimpl->GetBackingGC();
-
- Widget widget = (Widget) GetMainWidget();
-
- int scrollPosX = 0;
- int scrollPosY = 0;
-
- // We have to test whether it's a wxScrolledWindow (hack!) because
- // otherwise we don't know how many pixels have been scrolled. We might
- // solve this in the future by defining virtual wxWindow functions to get
- // the scroll position in pixels. Or, each kind of scrolled window has to
- // implement backing stores itself, using generic wxWidgets code.
- wxScrolledWindow* scrolledWindow = wxDynamicCast(this, wxScrolledWindow);
- if ( scrolledWindow )
- {
- int x, y;
- scrolledWindow->CalcScrolledPosition(0, 0, &x, &y);
-
- scrollPosX = - x;
- scrollPosY = - y;
- }
-
- // TODO: This could be optimized further by only copying the areas in the
- // current update region.
-
- // Only blit the part visible in the client area. The backing pixmap
- // always starts at 0, 0 but we may be looking at only a portion of it.
- wxSize clientArea = GetClientSize();
- int toBlitX = m_pixmapWidth - scrollPosX;
- int toBlitY = m_pixmapHeight - scrollPosY;
-
- // Copy whichever is samller, the amount of pixmap we have to copy,
- // or the size of the client area.
- toBlitX = wxMin(toBlitX, clientArea.x);
- toBlitY = wxMin(toBlitY, clientArea.y);
-
- // Make sure we're not negative
- toBlitX = wxMax(0, toBlitX);
- toBlitY = wxMax(0, toBlitY);
-
- XCopyArea
- (
- XtDisplay(widget),
- (Pixmap) m_backingPixmap,
- XtWindow (widget),
- tempGC,
- scrollPosX, scrollPosY, // Start at the scroll position
- toBlitX, toBlitY, // How much of the pixmap to copy
- 0, 0 // Destination
- );
- }
- else
- {
- wxWindowDC dc(this);
- // Set an erase event first
- wxEraseEvent eraseEvent(GetId(), &dc);
- eraseEvent.SetEventObject(this);
- HandleWindowEvent(eraseEvent);
-
- wxPaintEvent event(this);
- HandleWindowEvent(event);
-
- m_needsRefresh = false;
- }
-}
-
-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
-
-// Responds to colour changes: passes event on to children.
-void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
- wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
- while ( node )
- {
- // Only propagate to non-top-level windows
- wxWindow *win = node->GetData();
- if ( win->GetParent() )
- {
- wxSysColourChangedEvent event2;
- event.SetEventObject(win);
- win->HandleWindowEvent(event2);
- }
-
- node = node->GetNext();
- }
-}
-
-// ----------------------------------------------------------------------------
-// accelerators
-// ----------------------------------------------------------------------------
-
-bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
-{
-#if wxUSE_ACCEL
- if (!m_acceleratorTable.IsOk())
- return false;
-
- int count = m_acceleratorTable.GetCount();
- wxAcceleratorEntry* entries = m_acceleratorTable.GetEntries();
- int i;
- for (i = 0; i < count; i++)
- {
- wxAcceleratorEntry* entry = & (entries[i]);
- if (entry->MatchesEvent(event))
- {
- // Bingo, we have a match. Now find a control that matches the
- // entry command id.
-
- // Need to go up to the top of the window hierarchy, since it might
- // be e.g. a menu item
- wxWindow* parent = this;
- while ( parent && !parent->IsTopLevel() )
- parent = parent->GetParent();
-
- if (!parent)
- return false;
-
- wxFrame* frame = wxDynamicCast(parent, wxFrame);
- if ( frame )
- {
-#if wxUSE_MENUS
- // Try for a menu command
- if (frame->GetMenuBar())
- {
- wxMenuItem* item = frame->GetMenuBar()->FindItem(entry->GetCommand());
- if (item)
- {
- wxCommandEvent commandEvent(wxEVT_MENU, entry->GetCommand());
- commandEvent.SetEventObject(frame);
-
- // If ProcessEvent returns true (it was handled), then
- // the calling code will skip the event handling.
- return frame->HandleWindowEvent(commandEvent);
- }
- }
-#endif
- }
-
- // Find a child matching the command id
- wxWindow* child = parent->FindWindow(entry->GetCommand());
-
- // No such child
- if (!child)
- return false;
-
- // Now we process those kinds of windows that we can.
- // For now, only buttons.
- if ( wxDynamicCast(child, wxButton) )
- {
- wxCommandEvent commandEvent (wxEVT_BUTTON, child->GetId());
- commandEvent.SetEventObject(child);
- return child->HandleWindowEvent(commandEvent);
- }
-
- return false;
- } // matches event
- }// for
-#endif
-
- // We didn't match the key event against an accelerator.
- return false;
-}
-
-// ============================================================================
-// Motif-specific stuff from here on
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// function which maintain the global hash table mapping Widgets to wxWidgets
-// ----------------------------------------------------------------------------
-
-bool wxAddWindowToTable(Widget w, wxWindow *win)
-{
- const long key = (long)w;
- if ( wxWidgetHashTable->Get(key))
- {
- wxLogDebug("Widget table clash: new widget is %ld, %s",
- key, win->GetClassInfo()->GetClassName());
- return false;
- }
-
- wxWidgetHashTable->Put(key, win);
-
- wxLogTrace("widget", "Widget 0x%p <-> window %p (%s)",
- w, win, win->GetClassInfo()->GetClassName());
-
- return true;
-}
-
-wxWindow *wxGetWindowFromTable(Widget w)
-{
- return (wxWindow *)wxWidgetHashTable->Get((long) w);
-}
-
-void wxDeleteWindowFromTable(Widget w)
-{
- wxLogTrace("widget", "Widget 0x%p", (WXWidget)w);
-
- wxWidgetHashTable->Delete((long)w);
-}
-
-// ----------------------------------------------------------------------------
-// add/remove window from the table
-// ----------------------------------------------------------------------------
-
-// Add to hash table, add event handler
-bool wxWindow::AttachWidget (wxWindow* WXUNUSED(parent), WXWidget mainWidget,
- WXWidget formWidget, int x, int y, int width, int height)
-{
- wxAddWindowToTable((Widget) mainWidget, this);
- XtAddEventHandler( (Widget) mainWidget,
- ButtonPressMask | ButtonReleaseMask
- | PointerMotionMask,
- False,
- wxPanelItemEventHandler,
- (XtPointer) this);
-
- if (!formWidget)
- {
- XtTranslations ptr;
- XtOverrideTranslations ((Widget) mainWidget,
- ptr = XtParseTranslationTable (": resize()"));
- XtFree ((char *) ptr);
- }
-
- // Some widgets have a parent form widget, e.g. wxRadioBox
- if (formWidget)
- {
- if (!wxAddWindowToTable((Widget) formWidget, this))
- return false;
-
- XtTranslations ptr;
- XtOverrideTranslations ((Widget) formWidget,
- ptr = XtParseTranslationTable (": resize()"));
- XtFree ((char *) ptr);
- }
-
- if (x == -1)
- x = 0;
- if (y == -1)
- y = 0;
- DoSetSize (x, y, width, height, wxSIZE_USE_EXISTING);
-
- return true;
-}
-
-// Remove event handler, remove from hash table
-bool wxWindow::DetachWidget(WXWidget widget)
-{
- XtRemoveEventHandler( (Widget) widget,
- ButtonPressMask | ButtonReleaseMask
- | PointerMotionMask,
- False,
- wxPanelItemEventHandler,
- (XtPointer)this);
-
- wxDeleteWindowFromTable((Widget) widget);
- return true;
-}
-
-// ----------------------------------------------------------------------------
-// Motif-specific accessors
-// ----------------------------------------------------------------------------
-
-WXWindow wxWindow::GetClientXWindow() const
-{
- Widget wMain = (Widget)GetClientWidget();
- if ( wMain )
- return (WXWindow) XtWindow(wMain);
- else
- return (WXWindow) 0;
-}
-
-// Get the underlying X window
-WXWindow wxWindow::GetXWindow() const
-{
- Widget wMain = (Widget)GetMainWidget();
- if ( wMain )
- return (WXWindow) XtWindow(wMain);
- else
- return (WXWindow) 0;
-}
-
-// Get the underlying X display
-WXDisplay *wxWindow::GetXDisplay() const
-{
- Widget wMain = (Widget)GetMainWidget();
- if ( wMain )
- return (WXDisplay*) XtDisplay(wMain);
- else
- return NULL;
-}
-
-WXWidget wxWindow::GetMainWidget() const
-{
- if (m_drawingArea)
- return m_drawingArea;
- else
- return m_mainWidget;
-}
-
-WXWidget wxWindow::GetClientWidget() const
-{
- if (m_drawingArea != (WXWidget) 0)
- return m_drawingArea;
- else
- return GetMainWidget();
-}
-
-WXWidget wxWindow::GetTopWidget() const
-{
- return GetMainWidget();
-}
-
-WXWidget wxWindow::GetLabelWidget() const
-{
- return GetMainWidget();
-}
-
-// ----------------------------------------------------------------------------
-// Motif callbacks
-// ----------------------------------------------------------------------------
-
-// All widgets should have this as their resize proc.
-// OnSize sent to wxWindow via client data.
-void wxWidgetResizeProc(Widget w, XConfigureEvent *WXUNUSED(event),
- String WXUNUSED(args)[], int *WXUNUSED(num_args))
-{
- wxWindow *win = wxGetWindowFromTable(w);
- if (!win)
- return;
-
- if (win->PreResize())
- {
- wxSize newSize(win->GetSize());
- wxSizeEvent sizeEvent(newSize, win->GetId());
- sizeEvent.SetEventObject(win);
- win->HandleWindowEvent(sizeEvent);
- }
-}
-
-static void wxCanvasRepaintProc(Widget drawingArea,
- XtPointer clientData,
- XmDrawingAreaCallbackStruct * cbs)
-{
- if (!wxGetWindowFromTable(drawingArea))
- return;
-
- XEvent * event = cbs->event;
- wxWindow * win = (wxWindow *) clientData;
-
- switch (event->type)
- {
- case Expose:
- {
- win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
- event->xexpose.width, event->xexpose.height);
-
- if (event -> xexpose.count == 0)
- {
- win->DoPaint();
- }
- break;
- }
- }
-}
-
-// Unable to deal with Enter/Leave without a separate EventHandler (Motif 1.1.4)
-static void wxCanvasEnterLeave(Widget drawingArea,
- XtPointer WXUNUSED(clientData),
- XCrossingEvent * event)
-{
- XmDrawingAreaCallbackStruct cbs;
- XEvent ev;
-
- ((XCrossingEvent &) ev) = *event;
-
- cbs.reason = XmCR_INPUT;
- cbs.event = &ev;
-
- wxCanvasInputEvent(drawingArea, (XtPointer) NULL, &cbs);
-}
-
-// Fix to make it work under Motif 1.0 (!)
-static void wxCanvasMotionEvent (Widget WXUNUSED(drawingArea),
- XButtonEvent *WXUNUSED(event))
-{
-#if XmVersion <= 1000
- XmDrawingAreaCallbackStruct cbs;
- XEvent ev;
-
- ev = *((XEvent *) event);
- cbs.reason = XmCR_INPUT;
- cbs.event = &ev;
-
- wxCanvasInputEvent (drawingArea, (XtPointer) NULL, &cbs);
-#endif // XmVersion <= 1000
-}
-
-static void wxCanvasInputEvent(Widget drawingArea,
- XtPointer WXUNUSED(data),
- XmDrawingAreaCallbackStruct * cbs)
-{
- wxWindow *canvas = wxGetWindowFromTable(drawingArea);
- XEvent* xevent = cbs->event;
-
- if (canvas==NULL)
- return;
-
- if (cbs->reason != XmCR_INPUT)
- return;
-
- switch (xevent->xany.type)
- {
- case EnterNotify:
- case LeaveNotify:
- case ButtonPress:
- case ButtonRelease:
- case MotionNotify:
- {
- wxMouseEvent wxevent(0);
- if (wxTranslateMouseEvent(wxevent, canvas, drawingArea, xevent))
- {
- canvas->HandleWindowEvent(wxevent);
- }
- break;
- }
- case KeyPress:
- {
- wxKeyEvent event (wxEVT_CHAR);
- if (wxTranslateKeyEvent (event, canvas, (Widget) 0, xevent))
- {
- // Implement wxFrame::OnCharHook by checking ancestor.
- wxWindow *parent = canvas;
- while (parent && !parent->IsTopLevel())
- parent = parent->GetParent();
-
- if (parent)
- {
- event.SetEventType(wxEVT_CHAR_HOOK);
- if (parent->HandleWindowEvent(event))
- return;
- }
-
- // For simplicity, OnKeyDown is the same as OnChar
- // TODO: filter modifier key presses from OnChar
- event.SetEventType(wxEVT_KEY_DOWN);
-
- // Only process OnChar if OnKeyDown didn't swallow it
- if (!canvas->HandleWindowEvent (event))
- {
- event.SetEventType(wxEVT_CHAR);
- canvas->HandleWindowEvent (event);
- }
- }
- break;
- }
- case KeyRelease:
- {
- wxKeyEvent event (wxEVT_KEY_UP);
- if (wxTranslateKeyEvent (event, canvas, (Widget) 0, xevent))
- {
- canvas->HandleWindowEvent (event);
- }
- break;
- }
- case FocusIn:
- {
- if (xevent->xfocus.detail != NotifyPointer)
- {
- wxFocusEvent event(wxEVT_SET_FOCUS, canvas->GetId());
- event.SetEventObject(canvas);
- canvas->HandleWindowEvent(event);
- }
- break;
- }
- case FocusOut:
- {
- if (xevent->xfocus.detail != NotifyPointer)
- {
- wxFocusEvent event(wxEVT_KILL_FOCUS, canvas->GetId());
- event.SetEventObject(canvas);
- canvas->HandleWindowEvent(event);
- }
- break;
- }
- default:
- break;
- }
-}
-
-static void wxPanelItemEventHandler(Widget wid,
- XtPointer WXUNUSED(client_data),
- XEvent* event,
- Boolean *continueToDispatch)
-{
- // Widget can be a label or the actual widget.
-
- wxWindow *window = wxGetWindowFromTable(wid);
- if (window)
- {
- wxMouseEvent wxevent(0);
- if (wxTranslateMouseEvent(wxevent, window, wid, event))
- {
- window->HandleWindowEvent(wxevent);
- }
- }
-
- // TODO: probably the key to allowing default behaviour to happen. Say we
- // set a m_doDefault flag to false at the start of this function. Then in
- // e.g. wxWindow::OnMouseEvent we can call Default() which sets this flag to
- // true, indicating that default processing can happen. Thus, behaviour can
- // appear to be overridden just by adding an event handler and not calling
- // wxWindow::OnWhatever. ALSO, maybe we can use this instead of the current
- // way of handling drawing area events, to simplify things.
- *continueToDispatch = True;
-}
-
-static void wxScrollBarCallback(Widget scrollbar,
- XtPointer clientData,
- XmScrollBarCallbackStruct *cbs)
-{
- wxWindow *win = wxGetWindowFromTable(scrollbar);
- wxCHECK_RET( win, wxT("invalid widget in scrollbar callback") );
-
- wxOrientation orientation = (wxOrientation)wxPtrToUInt(clientData);
-
- wxEventType eventType = wxEVT_NULL;
- switch (cbs->reason)
- {
- case XmCR_INCREMENT:
- {
- eventType = wxEVT_SCROLLWIN_LINEDOWN;
- break;
- }
- case XmCR_DECREMENT:
- {
- eventType = wxEVT_SCROLLWIN_LINEUP;
- break;
- }
- case XmCR_DRAG:
- {
- eventType = wxEVT_SCROLLWIN_THUMBTRACK;
- break;
- }
- case XmCR_VALUE_CHANGED:
- {
- eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
- break;
- }
- case XmCR_PAGE_INCREMENT:
- {
- eventType = wxEVT_SCROLLWIN_PAGEDOWN;
- break;
- }
- case XmCR_PAGE_DECREMENT:
- {
- eventType = wxEVT_SCROLLWIN_PAGEUP;
- break;
- }
- case XmCR_TO_TOP:
- {
- eventType = wxEVT_SCROLLWIN_TOP;
- break;
- }
- case XmCR_TO_BOTTOM:
- {
- eventType = wxEVT_SCROLLWIN_BOTTOM;
- break;
- }
- default:
- {
- // Should never get here
- wxFAIL_MSG("Unknown scroll event.");
- break;
- }
- }
-
- wxScrollWinEvent event(eventType,
- cbs->value,
- orientation);
- event.SetEventObject( win );
- win->HandleWindowEvent(event);
-}
-
-// For repainting arbitrary windows
-void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *)
-{
- wxWindow* win = wxGetWindowFromTable(w);
- if (!win)
- return;
-
- switch ( event->type )
- {
- case Expose:
- {
- win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
- event->xexpose.width, event->xexpose.height);
-
- if ( event->xexpose.count == 0 )
- {
- win->DoPaint();
- }
-
- break;
- }
- }
-}
-
-// ----------------------------------------------------------------------------
-// TranslateXXXEvent() functions
-// ----------------------------------------------------------------------------
-
-bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
- Widget widget, const XEvent *xevent)
-{
- switch (xevent->xany.type)
- {
- case EnterNotify:
- case LeaveNotify:
-#if 0
- fprintf(stderr, "Widget 0x%p <-> window %p (%s), %s\n",
- (WXWidget)widget, win, win->GetClassInfo()->GetClassName(),
- (xevent->xany.type == EnterNotify ? "ENTER" : "LEAVE"));
-#endif
- case ButtonPress:
- case ButtonRelease:
- case MotionNotify:
- {
- int eventx = xevent->xbutton.x, eventy = xevent->xbutton.y;
-
- wxEventType eventType = wxEVT_NULL;
-
- if (xevent->xany.type == LeaveNotify)
- {
- eventType = wxEVT_LEAVE_WINDOW;
- }
- if (xevent->xany.type == EnterNotify)
- {
- eventType = wxEVT_ENTER_WINDOW;
- }
- else if (xevent->xany.type == MotionNotify)
- {
- eventType = wxEVT_MOTION;
-
- if (xevent->xmotion.is_hint == NotifyHint)
- {
- Window root, child;
- int x_root, y_root;
- unsigned int state;
- Display *dpy = XtDisplay (widget);
-
- XQueryPointer (dpy, XtWindow (widget),
- &root, &child,
- &x_root, &y_root, &eventx, &eventy, &state);
- }
- }
- else if (xevent->xany.type == ButtonPress)
- {
- wxevent.SetTimestamp(xevent->xbutton.time);
- int button = 0;
- if (xevent->xbutton.button == Button1)
- {
- eventType = wxEVT_LEFT_DOWN;
- button = 1;
- }
- else if (xevent->xbutton.button == Button2)
- {
- eventType = wxEVT_MIDDLE_DOWN;
- button = 2;
- }
- else if (xevent->xbutton.button == Button3)
- {
- eventType = wxEVT_RIGHT_DOWN;
- button = 3;
- }
-
- // check for a double click
- //
- long dclickTime = XtGetMultiClickTime(xevent->xany.display);
- long ts = wxevent.GetTimestamp();
-
- int buttonLast = win->GetLastClickedButton();
- long lastTS = win->GetLastClickTime();
- if ( buttonLast && buttonLast == button &&
- (ts - lastTS) < dclickTime )
- {
- // I have a dclick
- win->SetLastClick(0, ts);
- if ( eventType == wxEVT_LEFT_DOWN )
- eventType = wxEVT_LEFT_DCLICK;
- else if ( eventType == wxEVT_MIDDLE_DOWN )
- eventType = wxEVT_MIDDLE_DCLICK;
- else if ( eventType == wxEVT_RIGHT_DOWN )
- eventType = wxEVT_RIGHT_DCLICK;
- }
- else
- {
- // not fast enough or different button
- win->SetLastClick(button, ts);
- }
- }
- else if (xevent->xany.type == ButtonRelease)
- {
- if (xevent->xbutton.button == Button1)
- {
- eventType = wxEVT_LEFT_UP;
- }
- else if (xevent->xbutton.button == Button2)
- {
- eventType = wxEVT_MIDDLE_UP;
- }
- else if (xevent->xbutton.button == Button3)
- {
- eventType = wxEVT_RIGHT_UP;
- }
- else
- return false;
- }
- else
- {
- return false;
- }
-
- wxevent.SetEventType(eventType);
-
- Position x1, y1;
- XtVaGetValues(widget, XmNx, &x1, XmNy, &y1, NULL);
-
- int x2, y2;
- win->GetPosition(&x2, &y2);
-
- // The button x/y must be translated to wxWidgets
- // window space - the widget might be a label or button,
- // within a form.
- int dx = 0;
- int dy = 0;
- if (widget != (Widget)win->GetMainWidget())
- {
- dx = x1;
- dy = y1;
- }
-
- wxevent.m_x = eventx + dx;
- wxevent.m_y = eventy + dy;
-
- wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
- || (event_left_is_down (xevent)
- && (eventType != wxEVT_LEFT_UP)));
- wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN)
- || (event_middle_is_down (xevent)
- && (eventType != wxEVT_MIDDLE_UP)));
- wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN)
- || (event_right_is_down (xevent)
- && (eventType != wxEVT_RIGHT_UP)));
-
- wxevent.m_shiftDown = (xevent->xbutton.state & ShiftMask) == ShiftMask;
- wxevent.m_controlDown = (xevent->xbutton.state & ControlMask) == ControlMask;
- wxevent.m_altDown = (xevent->xbutton.state & Mod3Mask) == Mod3Mask;
- wxevent.m_metaDown = (xevent->xbutton.state & Mod1Mask) == Mod1Mask;
-
- wxevent.SetId(win->GetId());
- wxevent.SetEventObject(win);
-
- return true;
- }
- }
- return false;
-}
-
-bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,
- Widget WXUNUSED(widget), const XEvent *xevent)
-{
- switch (xevent->xany.type)
- {
- case KeyPress:
- case KeyRelease:
- {
- char buf[20];
-
- KeySym keySym;
- (void) XLookupString((XKeyEvent *)xevent, buf, 20, &keySym, NULL);
- int id = wxCharCodeXToWX (keySym);
- // id may be WXK_xxx code - these are outside ASCII range, so we
- // can't just use toupper() on id
- if (id >= 'a' && id <= 'z')
- id = toupper(id);
-
- if (xevent->xkey.state & ShiftMask)
- wxevent.m_shiftDown = true;
- if (xevent->xkey.state & ControlMask)
- wxevent.m_controlDown = true;
- if (xevent->xkey.state & Mod3Mask)
- wxevent.m_altDown = true;
- if (xevent->xkey.state & Mod1Mask)
- wxevent.m_metaDown = true;
- wxevent.SetEventObject(win);
- wxevent.m_keyCode = id;
- wxevent.SetTimestamp(xevent->xkey.time);
-
- wxevent.m_x = xevent->xbutton.x;
- wxevent.m_y = xevent->xbutton.y;
-
- if (id > -1)
- return true;
-
- return false;
- }
- default:
- break;
- }
- return false;
-}
-
-// ----------------------------------------------------------------------------
-// Colour stuff
-// ----------------------------------------------------------------------------
-
-#define YAllocColor XAllocColor
-XColor g_itemColors[5];
-int wxComputeColours (Display *display, const wxColour * back, const wxColour * fore)
-{
- int result;
- static XmColorProc colorProc;
-
- result = wxNO_COLORS;
-
- if (back)
- {
- g_itemColors[0].red = (unsigned short)(((long) back->Red ()) << 8);
- g_itemColors[0].green = (unsigned short)(((long) back->Green ()) << 8);
- g_itemColors[0].blue = (unsigned short)(((long) back->Blue ()) << 8);
- g_itemColors[0].flags = DoRed | DoGreen | DoBlue;
- if (colorProc == (XmColorProc) NULL)
- {
- // Get a ptr to the actual function
- colorProc = XmSetColorCalculation ((XmColorProc) NULL);
- // And set it back to motif.
- XmSetColorCalculation (colorProc);
- }
- (*colorProc) (&g_itemColors[wxBACK_INDEX],
- &g_itemColors[wxFORE_INDEX],
- &g_itemColors[wxSELE_INDEX],
- &g_itemColors[wxTOPS_INDEX],
- &g_itemColors[wxBOTS_INDEX]);
- result = wxBACK_COLORS;
- }
- if (fore)
- {
- g_itemColors[wxFORE_INDEX].red = (unsigned short)(((long) fore->Red ()) << 8);
- g_itemColors[wxFORE_INDEX].green = (unsigned short)(((long) fore->Green ()) << 8);
- g_itemColors[wxFORE_INDEX].blue = (unsigned short)(((long) fore->Blue ()) << 8);
- g_itemColors[wxFORE_INDEX].flags = DoRed | DoGreen | DoBlue;
- if (result == wxNO_COLORS)
- result = wxFORE_COLORS;
- }
-
- Display *dpy = display;
- Colormap cmap = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dpy);
-
- if (back)
- {
- /* 5 Colours to allocate */
- for (int i = 0; i < 5; i++)
- if (!YAllocColor (dpy, cmap, &g_itemColors[i]))
- result = wxNO_COLORS;
- }
- else if (fore)
- {
- /* Only 1 colour to allocate */
- if (!YAllocColor (dpy, cmap, &g_itemColors[wxFORE_INDEX]))
- result = wxNO_COLORS;
- }
-
- return result;
-}
-
-// Changes the foreground and background colours to be derived from the current
-// background colour. To change the foreground colour, you must call
-// SetForegroundColour explicitly.
-void wxWindow::ChangeBackgroundColour()
-{
- WXWidget mainWidget = GetMainWidget();
- if ( mainWidget )
- wxDoChangeBackgroundColour(mainWidget, m_backgroundColour);
- if ( m_scrolledWindow && mainWidget != m_scrolledWindow )
- wxDoChangeForegroundColour(m_scrolledWindow, m_backgroundColour);
-}
-
-void wxWindow::ChangeForegroundColour()
-{
- WXWidget mainWidget = GetMainWidget();
- if ( mainWidget )
- wxDoChangeForegroundColour(mainWidget, m_foregroundColour);
- if ( m_scrolledWindow && mainWidget != m_scrolledWindow )
- wxDoChangeForegroundColour(m_scrolledWindow, m_foregroundColour);
-}
-
-bool wxWindow::SetBackgroundColour(const wxColour& col)
-{
- if ( !wxWindowBase::SetBackgroundColour(col) )
- return false;
-
- ChangeBackgroundColour();
-
- return true;
-}
-
-bool wxWindow::SetForegroundColour(const wxColour& col)
-{
- if ( !wxWindowBase::SetForegroundColour(col) )
- return false;
-
- ChangeForegroundColour();
-
- return true;
-}
-
-void wxWindow::ChangeFont(bool keepOriginalSize)
-{
- // Note that this causes the widget to be resized back
- // to its original size! We therefore have to set the size
- // back again. TODO: a better way in Motif?
- Widget w = (Widget) GetLabelWidget(); // Usually the main widget
- if (w && m_font.IsOk())
- {
- int width, height, width1, height1;
- GetSize(& width, & height);
-
- wxDoChangeFont( w, m_font );
-
- GetSize(& width1, & height1);
- if (keepOriginalSize && (width != width1 || height != height1))
- {
- SetSize(wxDefaultCoord, wxDefaultCoord, width, height);
- }
- }
-}
-
-// Post-creation
-void wxWindow::PostCreation()
-{
- ChangeFont();
- ChangeForegroundColour();
- ChangeBackgroundColour();
-}
-
-// Pre-creation
-void wxWindow::PreCreation()
-{
- InheritAttributes();
-}
-
-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
-
-wxWindow *wxGetActiveWindow()
-{
- // TODO
- wxFAIL_MSG("Not implemented");
- return NULL;
-}
-
-/* static */
-wxWindow *wxWindowBase::GetCapture()
-{
- return (wxWindow *)g_captureWindow;
-}
-
-
-// Find the wxWindow at the current mouse position, returning the mouse
-// position.
-wxWindow* wxFindWindowAtPointer(wxPoint& pt)
-{
- pt = wxGetMousePosition();
- return wxFindWindowAtPoint(pt);
-}
-
-void wxGetMouseState(int& rootX, int& rootY, unsigned& maskReturn)
-{
- Display *display = wxGlobalDisplay();
- Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display));
- Window rootReturn, childReturn;
- int winX, winY;
-
- XQueryPointer (display,
- rootWindow,
- &rootReturn,
- &childReturn,
- &rootX, &rootY, &winX, &winY, &maskReturn);
-}
-
-// Get the current mouse position.
-wxPoint wxGetMousePosition()
-{
- int x, y;
- unsigned mask;
-
- wxGetMouseState(x, y, mask);
- return wxPoint(x, y);
-}
-
-wxMouseState wxGetMouseState()
-{
- wxMouseState ms;
- int x, y;
- unsigned mask;
-
- wxGetMouseState(x, y, mask);
-
- ms.SetX(x);
- ms.SetY(y);
-
- ms.SetLeftDown(mask & Button1Mask);
- ms.SetMiddleDown(mask & Button2Mask);
- ms.SetRightDown(mask & Button3Mask);
-
- ms.SetControlDown(mask & ControlMask);
- ms.SetShiftDown(mask & ShiftMask);
- ms.SetAltDown(mask & Mod3Mask);
- ms.SetMetaDown(mask & Mod1Mask);
-
- return ms;
-}
-
-
-#if wxMOTIF_NEW_FONT_HANDLING
-
-#include
-
-void wxGetTextExtent(const wxWindow* window, const wxString& str,
- int* width, int* height, int* ascent, int* descent)
-{
- Arg args[2];
- int count = 0;
- XmRendition rendition = NULL;
- XmRenderTable table = NULL;
- Widget w = (Widget) window->GetLabelWidget();
-
- XtVaGetValues( w, XmNrenderTable, &table, NULL );
- if (table == NULL)
- table = XmeGetDefaultRenderTable(w, XmTEXT_RENDER_TABLE);
-
- rendition = XmRenderTableGetRendition( table, (char*)"" );
- XtSetArg( args[count], XmNfont, 0 ); ++count;
- XtSetArg( args[count], XmNfontType, 0 ); ++count;
- XmRenditionRetrieve( rendition, args, count );
-
- if (args[1].value == XmFONT_IS_FONTSET)
- {
- XRectangle ink, logical;
- WXFontSet fset = (WXFontSet) args[0].value;
-
- XmbTextExtents( (XFontSet)fset, str.c_str(), str.length(),
- &ink, &logical);
-
- if( width ) *width = logical.width;
- if( height ) *height = logical.height;
- if( ascent ) *ascent = -logical.y;
- if( descent ) *descent = logical.height + logical.y;
- }
- else
- {
- int direction, ascent2, descent2;
- XCharStruct overall;
- XFontStruct* fontStruct;
-
- XmeRenderTableGetDefaultFont( table, &fontStruct );
- XTextExtents(fontStruct, (const char*)str.c_str(), str.length(),
- &direction, &ascent2, &descent2, &overall);
-
- if ( width ) *width = overall.width;
- if ( height ) *height = ascent2 + descent2;
- if ( descent ) *descent = descent2;
- if ( ascent ) *ascent = ascent2;
- }
-}
-
-#else // if !wxMOTIF_NEW_FONT_HANDLING
-
-void wxGetTextExtent(const wxWindow* window, const wxString& str,
- int* width, int* height, int* ascent, int* descent)
-{
- XmFontList list = NULL;
- XmFontContext cxt;
- XmFontType type;
- Widget w = (Widget) window->GetLabelWidget();
-
- XtVaGetValues( w, XmNfontList, &list, NULL );
- XmFontListInitFontContext( &cxt, list );
-
- XmFontListEntry entry = XmFontListNextEntry( cxt );
- XmFontListFreeFontContext( cxt );
- XtPointer thing = XmFontListEntryGetFont( entry, &type );
-
- if (type == XmFONT_IS_FONTSET)
- {
- XRectangle ink, logical;
-
- XmbTextExtents( (XFontSet)thing, str.c_str(), str.length(),
- &ink, &logical);
-
- if( width ) *width = logical.width;
- if( height ) *height = logical.height;
- if( ascent ) *ascent = -logical.y;
- if( descent ) *descent = logical.height + logical.y;
- }
- else
- {
- int direction, ascent2, descent2;
- XCharStruct overall;
-
- XTextExtents( (XFontStruct*)thing, (char*)(const char*)str.c_str(), str.length(),
- &direction, &ascent2, &descent2, &overall);
-
- if ( width ) *width = overall.width;
- if ( height ) *height = ascent2 + descent2;
- if ( descent ) *descent = descent2;
- if ( ascent ) *ascent = ascent2;
- }
-}
-
-#endif // !wxMOTIF_NEW_FONT_HANDLING
-
-// ----------------------------------------------------------------------------
-// wxNoOptimize: switch off size optimization
-// ----------------------------------------------------------------------------
-
-int wxNoOptimize::ms_count = 0;
diff --git a/src/motif/wxwin.xbm b/src/motif/wxwin.xbm
deleted file mode 100644
index 9c70498190..0000000000
--- a/src/motif/wxwin.xbm
+++ /dev/null
@@ -1,46 +0,0 @@
-#define wxwin.xbm_width 64
-#define wxwin.xbm_height 64
-static char wxwin.xbm_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0x1f, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
- 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x40, 0x80, 0xc7, 0x19,
- 0x8e, 0x01, 0x50, 0x00, 0x40, 0x00, 0xc7, 0x39, 0xcf, 0x01, 0x70, 0x00,
- 0x40, 0x00, 0xc7, 0x31, 0x3c, 0x00, 0x50, 0x00, 0x40, 0x00, 0xc7, 0x21,
- 0x1c, 0x00, 0x70, 0x00, 0x40, 0x80, 0xe3, 0x20, 0x38, 0x00, 0x50, 0x00,
- 0x40, 0x80, 0xe3, 0x30, 0x3c, 0x00, 0x70, 0x00, 0x40, 0x80, 0xe3, 0x78,
- 0x76, 0x01, 0x50, 0x00, 0x40, 0x00, 0xdf, 0xff, 0xf3, 0x20, 0x70, 0x00,
- 0x40, 0x00, 0x8e, 0xff, 0x61, 0x70, 0x50, 0x00, 0x40, 0x00, 0x00, 0xfc,
- 0x01, 0xf8, 0x70, 0x00, 0x40, 0x00, 0x00, 0xfc, 0x01, 0xfc, 0x51, 0x00,
- 0x40, 0x00, 0x00, 0xfe, 0x03, 0xfc, 0x73, 0x00, 0x40, 0x00, 0x00, 0xff,
- 0x03, 0xf8, 0x51, 0x00, 0x40, 0x00, 0x00, 0xff, 0x07, 0xf0, 0x70, 0x00,
- 0x40, 0x00, 0x80, 0xff, 0x07, 0x60, 0x50, 0x00, 0x40, 0x00, 0x80, 0xff,
- 0x0f, 0xfc, 0x70, 0x00, 0x40, 0x00, 0xc0, 0xff, 0x1f, 0xfc, 0x50, 0x00,
- 0x40, 0x00, 0xe0, 0xff, 0x1f, 0xfc, 0x70, 0x00, 0x40, 0x00, 0xf0, 0x0f,
- 0x00, 0xfc, 0x50, 0x00, 0x40, 0x00, 0xf0, 0x07, 0x00, 0xfc, 0x70, 0x00,
- 0x40, 0x00, 0xf8, 0x07, 0x00, 0xfc, 0x50, 0x00, 0x40, 0x00, 0xfc, 0x03,
- 0x00, 0xfc, 0x70, 0x00, 0x40, 0x00, 0xfc, 0x01, 0x00, 0xfc, 0x50, 0x00,
- 0x40, 0x00, 0xfe, 0x00, 0x00, 0xfc, 0x70, 0x00, 0x40, 0x00, 0xfe, 0x00,
- 0x00, 0xfc, 0x50, 0x00, 0x40, 0x00, 0x7f, 0x00, 0x00, 0xfc, 0x70, 0x00,
- 0x40, 0x80, 0x7f, 0x00, 0x00, 0xfc, 0x50, 0x00, 0x40, 0x80, 0x3f, 0x00,
- 0x00, 0xfc, 0x70, 0x00, 0x40, 0xc0, 0xff, 0xff, 0xff, 0xff, 0x50, 0x00,
- 0x40, 0xe0, 0xff, 0xff, 0xff, 0xff, 0x70, 0x00, 0x40, 0xe0, 0xff, 0xff,
- 0xff, 0xff, 0x50, 0x00, 0x40, 0xf0, 0xff, 0xff, 0xff, 0xff, 0x70, 0x00,
- 0x40, 0xf0, 0xff, 0xff, 0xff, 0xff, 0x50, 0x00, 0x40, 0xf0, 0xff, 0xff,
- 0xff, 0xff, 0x70, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x00,
- 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x40, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x50, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00,
- 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x00, 0x80, 0xaa, 0xaa, 0xaa,
- 0xaa, 0xaa, 0x6a, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/src/motif/xmcombo/combobox.doc b/src/motif/xmcombo/combobox.doc
deleted file mode 100644
index 466ea5f8a6..0000000000
--- a/src/motif/xmcombo/combobox.doc
+++ /dev/null
@@ -1,220 +0,0 @@
-Welcome to the ComboBox widget for Motif 1.1 or 1.2 (maybe even 2.0...)!
-This is now version 1.32.
-THERE ARE A LOT OF NEW RESOURCES AVAILABLE SO PLEASE READ THE
-DOCUMENTATION (in ComboBox_eng.dvi)!!!
-
-If you're in doubt, the primary source of this widget is
- ftp.informatik.rwth-aachen.de (137.226.112.172)
- The source is in: /pub/packages/ComboBox/ComboBox.tar.gz
-This is our campus server in Aachen, Germany. From outside Europe
-please also contact:
- ftp.x.org (198.112.44.100)
- There you'll find the source in:
- /contrib/widgets/motif/ComboBox/ComboBox.tar.gz
-There are many local ftp servers that mirror the /contrib directory. Thus
-with a delay of one or two days you'll also find the source on many other
-ftp sites.
-
-PLEASE READ THIS INFORMATION CAREFULLY. IT ALWAYS CONTAINS THE MOST
-RECENT INFORMATION.
-
-Whats new? (changes since the last version are marked with an asterisk)
- * Some minor changes concerning the drop down list layout have been made in
- order to correct some minor quirks.
- * Updated files for VMS users (hellooooo -- where are you?!!)
- - A real man page for use with troff/groff. It's in ComboBox.groff.
- - Some applications like GUI development tools or TclMotif were unable to
- get notice of these special resources because they were implemented
- through the core's setValues method. Thus they don't appeared in the
- resource list because there aren't any instance variables connected to
- them. These mirror resources instead belong to child widgets. With 1.23
- the resource list (which can be queried by XtGetResourceList()) contains
- entries for all mirror resources although the initial value setting is
- always zero. But this shouldn't matter. You can switch off these entries
- by setting -DDONT_LOOK_IN_THE_MIRROR when compiling ComboBox.c.
- - The selection policies XmSINGLE_SELECT and XmBROWSE_SELECT are now
- supported.
- - A new resource called XmNstaticList has been added, which switches the combo
- box into a new mode with the drop down list statically displayed.
- - Support of XmNautomaticSelection (like the resource known from XmList).
- - New callbacks XmNunselectionCallback, XmNdefaultActionCallback,
- XmNmodifyVerifyCallback, XmNmotionVerifyCallback and XmNvalueChangedCallback
- added (don't know whether I forgot to mention one...).
- - New convenience function XmComboBoxClearItemSelection() for deselecting
- any selection in the combo box (if XmNselectionPolicy is XmSINGLE_SELECT).
- - New demo app called FontSel. It shows how to realize a full blown
- font selection dialog (even for scalable fonts) using combo boxes.
- - Some additional casting has been added to the source, so it seems
- now really to be ANSI compliant.
- - can be compiled with Motif 1.2. (Tested on Sun & HP yet)
- - many new resources & a callback that is called whenever the drop down
- list gets dropped down or hidden.
- - corrected a few minor typos in the header files (mis-spelled function
- prototypes) and some minor quirks in the source.
- - A FULL-BLOWN ENGLISH DOCUMENTATION (dvi file)
- If you can't process dvi files you can download a post script variant
- from ftp.informatik.rwth-aachen.de (137.226.112.172) as
- /pub/packages/ComboBox/ComboBox_eng.ps.gz
- - The XmNitems and XmNitemCount resources can now be set at any time (not
- only when creating the ComboBox widget).
- - Corrected some minor memory leaks in the source as well as some typos and
- errors in the documentation.
- - Drag'n'Drop is now supported with Motif 1.2.
- - fvwm's handling of FocusOut events supported.
-
-
-Well - if you never heard of ComboBoxes you'll have to figure out
-yourself what these strange widgets really are. The following text
-will only explain how to include it into your own code. (Just as a little
-hint: combo boxes are well known from M$ Windoze. A combo box consists
-of a text input field with an arrow button besides it. When you click
-on the arrow button the combo box pops up a list just below its input
-area. You can now browse in it or pop it down by pressing the arrow button
-again.)
-
-The source code is now in (wide public) use for nearly a year.
-(before this time it was tested for half a year in the Institut fuer
-Geometrie und Praktische Mathematik, where I'm working). So you get a well
-tested piece of widget magic. Please feel free to report any trouble you
-have using the ComboBox widget. But be patient - I'm just a student. In the
-meantime I've received a couple of reports and hopefully the widget now can
-be used on many well known systems as well as with Motif 1.1 and 1.2. I've
-heard of people using the ComboBox widget with Motif 2.0, because they need
-the many features... But there seems to be problems with the subclassing
-mechanism, so the sanity check CheckComboBox() fails. This check is now
-disabled if the source detects a Motif 2.0 release.
-
-BTW - I'm collecting picture postcards...if you have one with a nice picture of
-the place you're living in, don't hesitate... 8-)
-
-1. To compile you will need at least Motif :-)
- (or :-( depending on your point of view...)
- and an *ANSI* c compiler (the code is completely ANSI -
- no more mess with the old K&R style)!
- To compile, try something like
- $ cc -DFUNCPROTO -c ComboBox.c
- this should do it's work. -DFUNCPROTO is needed because the function
- prototypes would be K&R style without it. In addition you often need
- to specify to the compiler that the source is ANSI. (-ansi with gcc)
-
-2. Place a
- #include "ComboBox.h"
- at the top of your source file and create the widget just like any
- other ordinary widget. The class is xmComboBoxWidgetClass. There is
- no convenience function since it's hardly ever needed with this
- widget.
-
- To compile the short demo:
- $ cc -DFUNCPROTO ComboBoxDemo.c -o ComboBoxDemo ComboBox.o \
- -lXm -lXt -lX11
- On some machines you'll need to link additional libs (like network
- and socket libs).
- Or use the makefile (first edit it accordingly to your needs):
- $ make demo
- Run the demo with:
- $ ./ComboBoxDemo
-
- I don't provide a makefile for every system/compiler combination
- because this widget is intended to be placed seamless into the
- existing Motif widget set. Thus, compile it and if all is ok, then
- copy the includes to the Xm directory and the object file to a
- suitable place in your file system -- but don't even think of
- /dev/null as a good destination ;-)
-
- To compile the FontSel demo:
- Edit the makefile (if you haven't already done so), then do a:
- $ make FontSel
- And run the Font Selector demo:
- $ ./FontSel
-
- If you also have the ButtonFace Library you may want to do a
- $ make FontSelX
- instead. This will use my pictural push buttons for okay, cancel and help.
-
-3. The ComboBox consists primarily of a XmManager descendant - the
- widget you'll get from XtCreateWidget(). This widget contains several
- more widgets as its childs: a XmTextField and some other widgets.
- You *must* not modify any resources of the TextField directly - this
- leads sooner or later to trouble. Instead all the necessary instance
- variables of the TextField are accessible through the main widget
- (the one XtCreateWidget() returned).
- There are many (convenience) functions like the ones for XmTextFields
- and XmLists to set the TextField's text, add items to the drop down
- list and and and... please see ComboBox.h for details (you know:
- the documentation is under work...)
-
-4. There is one special resource called "persistentDropDown". It
- defaults to "False". Its purpose it not easy to explain since that
- has to do with the way your window manager is set up. If you're
- using the explicit focus methode (that is: you move the keyboard
- focus from application to application by clicking on the top level
- window) you're lucky - don't ever think of this resource. For all
- those other people (like me): if the window manager is set up to
- give the keyboard focus to the top level window the mouse cursor
- is over you'll notice one annoying "feature". (It's really *not*
- a bug ;-) ) If you drop down the ComboBox's list (by clicking on
- the arrow right beside the text field) and move the mouse cursor
- out of the window the ComboBox resides in the list immediatly
- disappears. That happens because the ComboBox looses the keyboard
- focus. You can try to bypass that behavior by setting
- "persistentDropDown" to "True" if you like. In the application's
- resource file a line like
- *YourApp*ComboBox.persistentDropDown: True
- should do the job. But remember: whether this will work depends
- on the window manager you're using. I have testet this with
- Silicon Graphics' 4dwm (a mwm clone).
-
-5. On some window managers the drop down list gets hidden as soon as
- the user moves the mouse cursor into the list. If this happens try
- to set the resource "twmHandlingOn" to "True". You can do this
- on the command line:
- ComboBoxDemo -xrm "*.twmHandlingOn: True"
- This should do it's job with twm as well as fvwm. With olwm you shouldn't
- need to set one of the special resources.
-
-6. The combo box has been reported to run successfully on:
- Silicon Graphics, Sun, HP, IBM RS6000, PC, even VMS!
- Linux, of course...!
- Attention VMS folks! You'll find two files called "motif11.opt" or
- "motif12.opt" and "vmsmake.com" in this packages. They are provided by
- Vincent Li. You'll hopefully know what to do with these two
- files. They are provided "as is" with no warranty. Please read the file
- "readme.vms".
-
-42. Known bugs: you will need a german dictionary to understand all the
- jokes in the source and in the german documentation.
-
-That's it! Enjoy using this ComboBox widget.
-(More than 160 downloads yet within the first 3 weeks -- seems that I've
-filled in a real gap in Motif. Thanks to all who encouraged me to do
-further work on the ComboBox widget -- especially Chris Marotz!)
-
-You may also want to visit my "Motif Programming Cornor" at
- file://ftp.igpm.rwth-aachen.de/arc/pub/unix/html/motifcorner.html
-with tips & tricks about Motif.
-
-I really don't understand why the folks at OSF didn't implemented
-something like the M$ Windoze ComboBox in Motif. Maybe they have
-had their moti"f"es... (Rumor has spread it that the mysterious
-Motif 2.0 will have one - whow! after many years, the OSF folk got it!)
-
-P.S.: This software is Free Software. Please refer to the file
- COPYING, which you should have received together this
- file and the source code of the combo box widget.
- However if you find this widget to be useful, you are encouraged
- to donate a reasonable amount to a charitable institution --
- there are enough people out there who need help! Sometimes I got
- the strong impression that programmers tend to get lost in their
- own "virtual reality" - sitting in front of their screen, hacking
- new algorithms and forget about everything around them. So please
- don't forget about people who need help.
-
-(c) 1993, 1994 Harald Albrecht
-Institut fuer Geometrie und Praktische Mathematik
-Rheinisch-Westfaelische Technische Universitaet Aachen,
-D-52056 Aachen, Germany
-albrecht@igpm.rwth-aachen.de
-
-Bad Aachen -- Die Stadt der Printe. Warum Aachen ein Kurbad ist?
--- Wieso Kurbad? "Bad" heisst doch nur, dass es hier staendig regnet (wenn
-es eben 'mal nicht schneit...)
diff --git a/src/motif/xmcombo/combobox.man b/src/motif/xmcombo/combobox.man
deleted file mode 100644
index 026f0a31f1..0000000000
--- a/src/motif/xmcombo/combobox.man
+++ /dev/null
@@ -1,1386 +0,0 @@
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
-NNAAMMEE
- XmComboBox - The Combo Box widget class
-
-SSYYNNOOPPSSIISS
- ##iinncclluuddee <>
-
- Depending on your system's configuration the place of this
- include file may vary. In doubt, contact your local system
- administrator. Or run in circles and shout.
-
-
-DDEESSCCRRIIPPTTIIOONN
- The ComboBox widget allows the user to select elements
- from a list of choices, and enter their own values in a
- text widget. To conserve screen space, the list of choices
- is shown only when the user selects the down arrow button.
- The choices may then be selected from this list. The list
- will automatically by removed when the user selects an
- item in the list. When the list is removed, the item that
- was selected will be placed in the text widget. Typing the
- escape key when the list is up, cancels the list popup.
-
- CCllaasssseess
- ComboBox inherits behaviour and resources from CCoorree and
- CCoommppoossiittee, CCoonnssttrraaiinntt and XXmmMMaannaaggeerr classes.
-
- The class pointer is xxmmCCoommbbooBBooxxWWiiddggeettCCllaassss.
-
- The class name is XXmmCCoommbbooBBooxx.
-
- NNeeww RReessoouurrcceess
- The following table defines a set of widget resources used
- by the programmer to specify data. The programmer can also
- set the resource values for the inherited classes to set
- attributes for this widget. To reference a resource by
- name or by class in a .Xdefaults file, remove the XXmmNN or
- XXmmCC prefix and use the remaining letters. To specify one
- of the defined values for a resource in a .Xdefaults file,
- remove the XXmm prefix and use the remaining letters (in
- either lowercase or uppercase, but include any underscores
- between words). The codes in the access column indicate if
- the given resource can be set at creation time (C), set by
- using XXttSSeettVVaalluueess (S), retrieved by using XXttGGeettVVaalluueess (G),
- or is not applicable (N/A).
-
- XXmmCCoommbbooBBooxx RReessoouurrccee SSeett
- -----------------------------------------------------------------
- NNaammee DDeeffaauulltt AAcccceessss
- CCllaassss TTyyppee
- -----------------------------------------------------------------
- XmNactivateCallback NULL C
- XmCCallback XtCallbackList
- -----------------------------------------------------------------
-
-
-
-
-Version 1.31 20 March 1995 1
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- XmNalignment XmALIGNMENT_CENTER CSG
- XmCAlignment unsigned char
- -----------------------------------------------------------------
- XmNarrowSpacingOn False CSG
- XmNCArrowSpacingOn Boolean
- -----------------------------------------------------------------
- XmNautomaticSelection False CSG
- XmCAutomaticSelection Boolean
- -----------------------------------------------------------------
- XmNblinkRate 500 CSG
- XmCBlinkRate int
- -----------------------------------------------------------------
- XmNcolumns dynamic CSG
- XmCColumns short
- -----------------------------------------------------------------
- XmNcursorPosition 0 CSG
- XmCCursorPosition XmTextPosition
- -----------------------------------------------------------------
- XmNcursorPositionVisible True CSG
- XmCCursorPositionVisible Boolean
- -----------------------------------------------------------------
- XmNdefaultActionCallback NULL CSG
- XmCCallback XtCallbackList
- -----------------------------------------------------------------
- XmNdropDownCallback NULL CSG
- XmCDropDownCallback XtCallbackList
- -----------------------------------------------------------------
- XmNdropDownCursor center_ptr CSG
- XmCDropDownCursor Cursor
- -----------------------------------------------------------------
- XmNdropDownOffset dynamic CSG
- XmCDropDownOffset Position
- -----------------------------------------------------------------
- XmNeditable False CG
- XmCEditable Boolean
- -----------------------------------------------------------------
- XmNfontList dynamic CSG
- XmCFontList XmFontList
- -----------------------------------------------------------------
- XmNitemCount 0 CSG
- XmCItemCount int
- -----------------------------------------------------------------
- XmNitems NULL CSG
- XmCItems XmStringTable
- -----------------------------------------------------------------
- XmNlabelFontList dynamic CSG
- XmCLabelFontList XmFontList
- -----------------------------------------------------------------
- XmNlabelInsensitivePixmap XmUNSPECIFIED_PIXMAP CSG
- XmCLabelInsensitivePixmap Pixmap
- -----------------------------------------------------------------
- XmNlabelMarginBottom 0 CSG
-
-
-
-
-
-Version 1.31 20 March 1995 2
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- XmCLabelMarginBottom Dimension
- -----------------------------------------------------------------
- XmNlabelMarginHeight 2 CSG
- XmCLabelMarginHeight Dimension
- -----------------------------------------------------------------
- XmNlabelMarginLeft 0 CSG
- XmCLabelMarginLeft Dimension
- -----------------------------------------------------------------
- XmNlabelMarginRight 0 CSG
- XmCLabelMarginRight Dimension
- -----------------------------------------------------------------
- XmNlabelMarginTop 0 CSG
- XmCLabelMarginTop Dimension
- -----------------------------------------------------------------
- XmNlabelMarginWidth 0 CSG
- XmCLabelMarginWidth Dimension
- -----------------------------------------------------------------
- XmNlabelPixmap XmUNSPECIFIED_PIXMAP CSG
- XmCLabelPixmap Pixmap
- -----------------------------------------------------------------
- XmNlabelString dynamic CSG
- XmCXmString XmString
- -----------------------------------------------------------------
- XmNlabelType XmSTRING CSG
- XmCLabelType unsigned char
- -----------------------------------------------------------------
- XmNlistMarginHeight 0 CSG
- XmCListMarginHeight Dimension
- -----------------------------------------------------------------
- XmNlistMarginWidth 0 CSG
- XmCListMarginWidth Dimension
- -----------------------------------------------------------------
- XmNlistSizePolicy XmVARIABLE CG
- XmCListSizePolicy unsigned char
- -----------------------------------------------------------------
- XmNlistSpacing 0 CSG
- XmCListSpacing Dimension
- -----------------------------------------------------------------
- XmNmarginHeight 5 CSG
- XmCMarginHeight Dimension
- -----------------------------------------------------------------
- XmNmarginWidth 5 CSG
- XmCMarginWidth Dimension
- -----------------------------------------------------------------
- XmNmaxLength largest integer CSG
- XmCMaxLength int
- -----------------------------------------------------------------
- XmNmodifyVerifyCallback NULL CSG
- XmCCallback XtCallbackList
- -----------------------------------------------------------------
- XmNmotionVerifyCallback NULL CSG
- XmCCallback XtCallbackList
- -----------------------------------------------------------------
-
-
-
-
-Version 1.31 20 March 1995 3
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- XmNpersistentDropDown False CSG
- XmCPersistentDropDown Boolean
- -----------------------------------------------------------------
- XmNscrollBarDisplayPolicy XmAS_NEEDED CSG
- XmCScrollBarDisplayPolicy unsigned char
- -----------------------------------------------------------------
- XmNselectionCallback NULL CSG
- XmCCallback XtCallbackList
- -----------------------------------------------------------------
- XmNselectionPolicy XmBROWSE_SELECT CG
- XmCSelectionPolicy unsigned char
- -----------------------------------------------------------------
- XmNselectThreshold 5 CSG
- XmCSelectThreshold int
- -----------------------------------------------------------------
- XmNshowLabel False CG
- XmCShowLabel Boolean
- -----------------------------------------------------------------
- XmNsorted False CSG
- XmCSorted Boolean
- -----------------------------------------------------------------
- XmNsortingCallback NULL CSG
- XmCCallback XtCallbackList
- -----------------------------------------------------------------
- XmNsquareArrow False CSG
- XmCSquareArrow Boolean
- -----------------------------------------------------------------
- XmNstaticList False CSG
- XmCStaticList Boolean
- -----------------------------------------------------------------
- XmNstringDirection dynamic CSG
- XmCStringDirection XmStringDirection
- -----------------------------------------------------------------
- XmNtwmHandlingOn False CSG
- XmCTwmHandlingOn Boolean
- -----------------------------------------------------------------
- XmNtopItemPostion 1 G
- XmCTopItemPostion int
- -----------------------------------------------------------------
- XmNunselectionCallback NULL CSG
- XmCCallback XtCallbackList
- -----------------------------------------------------------------
- XmNvalue "" CSG
- XmCValue String
- -----------------------------------------------------------------
- XmNvalueChangedCallback NULL CSG
- XmCCallback XtCallbackList
- -----------------------------------------------------------------
- XmNvisibleItemCount 8 CSG
- XmCVisibleItemCount Int
- -----------------------------------------------------------------
-
- XXmmNNaaccttiivvaatteeCCaallllbbaacckk
- Specifies a list of callbacks to be called when the
-
-
-
-Version 1.31 20 March 1995 4
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- user presses either the key "Enter" or "Activate".
- The type of the structure passed to this callback
- is XXmmAAnnyyCCaallllbbaacckkSSttrruucctt and the reason is
- XXmmCCRR__AACCTTIIVVAATTEE.
-
- XXmmNNaalliiggnnmmeenntt
- The alignment (left to right) for the label's text
- or pixmap. Possible values are XXmmAALLIIGGNN--
- MMEENNTT__BBEEGGIINNNNIINNGG, XXmmAALLIIGGNNMMEENNTT__CCEENNTTEERR, and XXmmAALLIIGGNN--
- MMEENNTT__EENNDD.
-
- XXmmNNaauuttoommaattiiccSSeelleeccttiioonn
- Indicates whether the XXmmNNsseelleeccttiioonnCCaallllbbaacckk is
- invoked each time the user moves into a new item if
- XXmmNNaauuttoommaattiiccSSeelleeccttiioonn is TTrruuee and the selection
- mode is XXmmBBRROOWWSSEE__SSEELLEECCTT. If set to FFaallssee the XXmmNNss--
- eelleeccttiioonnCCaallllbbaacckk is not invoked until the user
- releases the mouse button.
-
- XXmmNNaarrrroowwSSppaacciinnggOOnn
- Indicates whether a gap is displayed between the
- arrow button and the text input field if this
- resource is set to TTrruuee and XXmmNNeeddiittaabbllee is also set
- to TTrruuee. If this resource is set to FFaallssee the
- combo box widget will never display a gab between
- the arrow button and the text area, irrespective of
- the setting of XXmmNNeeddiittaabbllee. Note that setting
- XXmmNNaarrrroowwSSppaacciinnggOOnn to FFaallssee doesn not conform to
- common GUI styles. And it prevents the user from
- easily recognizing whether the combo box is
- editable or not.
-
- XXmmNNbblliinnkkRRaattee
- The time in milliseconds that the cursor spends
- being visible or invisible. A value of 0 prevents
- the cursor from blinking.
-
- XXmmNNbboorrddeerrWWiiddtthh
- That's no new resource but is already introduced in
- the core class. This class overrides the default
- value and sets it to zero. You can however override
- it again if you're dissatisfied with the new
- default setting.
-
- XXmmNNccoolluummnnss
- Specifies the initial width of the input field mea-
- sured in character spaces. The default value
- depends on the value of the width of the combo box.
-
- XXmmNNccuurrssoorrPPoossiittiioonn
- Indicates the position in the text where the insert
- cursor is to be located. Its position is the offset
- of characters and it starts with offset 0 at the
- beginning of the text.
-
-
-
-Version 1.31 20 March 1995 5
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- XXmmNNccuurrssoorrPPoossiittiioonnVViissiibbllee
- Flags whether the insert cursor position is marked
- by a blinking cursor.
-
- XXmmNNddeeffaauullttAAccttiioonnCCaallllbbaacckk
- Specifies a list of callbacks that is called every
- time an item is double clicked. The reason is
- XXmmCCRR__DDEEFFAAUULLTT__AACCTTIIOONN. Please remember that you
- can't use this callback if XXmmNNssttaattiiccLLiisstt is FFaallssee
- because the list is immediatly hidden after the
- user selected an item from the list. Thus the user
- can't double click on any item within the list.
-
- XXmmNNddrrooppDDoowwnnCCaallllbbaacckk
- This is a list of callbacks to be called when the
- list is about to be shown or hidden. The reasons
- are XXmmCCRR__SSHHOOWW__LLIISSTT or XXmmCCRR__HHIIDDEE__LLIISSTT.
-
- XXmmNNddrrooppDDoowwnnCCuurrssoorr
- Specifies the cursor to be used whenever the mouse
- cursor is within the drop down list.
-
- XXmmNNddrrooppDDoowwnnOOffffsseett
- Specifies the distance between the left border of
- the list and the left border of the input field.
- The default value is set to the width of the arrow
- button. Only positive values are allowed for XXmmNN--
- ddrrooppDDoowwnnOOffffsseett, negative ones will be ignored.
-
- XXmmNNeeddiittaabbllee
- Specifies the type of combo box. If set to True,
- the combo box contains an editable input field.
- Therefore, the user is free to select entries out
- of the list and to enter new text or modify it. In
- the other case, with XmNeditable set to False the
- user can solely browse in and select entries out of
- the list.
-
- XXmmNNffoonnttLLiisstt
- Indicates the font list to be used for the input
- field and the list. If the value is NULL at ini-
- tialization, it is initialized by looking up the
- parent hierarchy of the widget for an ancestor that
- is a subclass of XXmmBBuulllleettiinnBBooaarrdd, XXmmVVeennddoorrSShheellll or
- XXmmMMeennuuSShheellll. If such an ancestor is found, it's
- font list will be taken by the combo box widget.
-
- XXmmNNiitteemmCCoouunntt
- Specifies the total number of items in the list.
-
- XXmmNNiitteemmss
- Points to an array of compound strings representing
- the items to be displayed in the list. By means of
- this a program can find out what items the list
-
-
-
-Version 1.31 20 March 1995 6
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- contains. It is also possible to set the contents
- of the list box in one step by setting this
- resource to a new array of compound strings. Please
- remember: always set XXmmNNiitteemmss and XXmmNNiitteemmCCoouunntt
- together in the same call to XXttSSeettVVaalluueess or
- XXttVVaaSSeettVVaalluueess. If you ignore this rule the combo
- box will ignore you and your attempt to set these
- resources.
-
- XXmmNNllaabbeellIInnsseennssiittiivveePPiixxmmaapp
- Specifies a pixmap used as the button face if XXmmNN--
- llaabbeellTTyyppee is set to XXmmPPIIXXMMAAPP and the combo box wid-
- get is insensitive.
-
- XXmmNNllaabbeellPPiixxmmaapp
- Specifies a pixmap to be displayed to the left of
- the input field if XXmmNNllaabbeellTTyyppee is XXmmPPIIXXMMAAPP and
- XXmmNNsshhoowwLLaabbeell is True (of course).
-
- XXmmNNllaabbeellSSttrriinngg
- Specifies the the compound string to be displayed
- if XXmmNNllaabbeellTTyyppee is set to XXmmSSTTRRIINNGG and XXmmNNsshhoowwLLaabbeell
- is True.
-
- XXmmNNllaabbeellTTyyppee
- The type of label (either string or pixmap). Possi-
- ble values are XXmmPPIIXXMMAAPP and XXmmSSTTRRIINNGG.
-
- XXmmNNllaabbeellMMaarrggiinnTToopp,, XXmmNNllaabbeellMMaarrggiinnBBoottttoomm
- XXmmNNllaabbeellMMaarrggiinnLLeefftt,, XXmmNNllaabbeellMMaarrggiinnRRiigghhtt
- The amount of space between one side of the label
- and the nearest margin.
-
- XXmmNNllaabbeellMMaarrggiinnHHeeiigghhtt,, XXmmNNllaabbeellMMaarrggiinnWWiiddtthh
- The spacing between one side of the label and the
- nearest edge of a shadow.
-
- XXmmNNlliissttMMaarrggiinnHHeeiigghhtt,, XXmmNNlliissttMMaarrggiinnWWiiddtthh
- The height or width of the margin between the bor-
- der of the list and the items in the list.
-
- XXmmNNlliissttSSiizzeePPoolliiccyy
- Controls the reaction of the list when an item
- grows horizontally beyond the current width of the
- list and XXmmNNssttaattiiccLLiisstt is set to TTrruuee. If set to
- XXmmCCOONNSSTTAANNTT, the list does not grow, and a horizon-
- tal scroll bar is shown. If this resource is set to
- XXmmVVAARRIIAABBLLEE, the list instead trys to grow such that
- it match the size of the longest item, thus no hor-
- izontal scroll bar will appear. When XXmmNNlliisstt--
- SSiizzeePPoolliiccyy is the list will again try to grow but
- in case the width of the longest item in the list
- is wider than the viewing area of the list a hori-
- zontal scroll bar appears.
-
-
-
-Version 1.31 20 March 1995 7
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- XXmmNNlliissttSSppaacciinngg
- The spacing between items in the list.
-
- XXmmNNmmaarrggiinnHHeeiigghhtt
- Specifies the distance between the top and the bot-
- tom of the widget window and the text displayed in
- the input field.
-
- XXmmNNmmaarrggiinnWWiiddtthh
- Like XmNmarginHeight this resource specifies the
- distance between the left and the right border of
- the widget window and the text.
-
- XXmmNNmmaaxxLLeennggtthh
- Specifies the maximum length of the text string
- that can be entered from the keyboard into the
- input field of the combo box. Strings that are put
- into the input field using XXmmCCoommbbooBBooxxSSeettSSttrriinngg
- ignore this resource.
-
- XXmmNNmmooddiiffyyVVeerriiffyyCCaallllbbaacckk
- Contains a list of callbacks called before text is
- deleted from or inserted into the text area of the
- combo box widget. The callbacks are called only if
- XXmmNNeeddiittaabbllee is set to TTrruuee. The reason is
- XXmmCCRR__MMOODDIIFFYYIINNGG__TTEEXXTT__VVAALLUUEE and the type of the
- structure passed to this callback is XXmmCCoommbbooBBooxx--
- TTeexxttVVeerriiffyyCCaallllbbaacckkSSttrruucctt.
-
- XXmmNNmmoottiioonnVVeerriiffyyCCaallllbbaacckk
- Specifies the list of callbacks that is called
- before the insert cursor gets moved to another
- position. The reason is XXmmCCRR__MMOOVVIINNGG__IINNSSEERRTT__CCUURRSSOORR
- and the type of the structure whose address is
- passed to the callback is XXmmCCoommbbooBBooxxTTeexxttVVeerriiffyyCCaallll--
- bbaacckk--SSttrruucctt.
-
- XXmmNNssccrroollllBBaarrDDiissppllaayyPPoolliiccyy
- Controls the display of the vertical scroll bar in
- the list when XXmmNNssttaattiiccLLiisstt is set to TTrruuee..When
- XXmmNNssccrroollllBBaarrDDiissppllaayyPPoolliiccyy is set to XXmmAASS__NNEEEEDDEEDD,
- the vertical scroll bar is displayed only when the
- list contains more items than can be currently dis-
- played. If set to XXmmSSTTAATTIICC the vertical scroll bar
- is always displayed.
-
- XXmmNNppeerrssiisstteennttDDrrooppDDoowwnn
- Welcome to the sad section in the life of X11
- applications. This resource and the inherent prob-
- lems are due to the focus policy of the window man-
- ager you're using. See the further details in the
- later sections.
-
-
-
-
-
-Version 1.31 20 March 1995 8
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- XXmmNNsseelleeccttiioonnCCaallllbbaacckk
- Specifies a list of callbacks that is called when
- an item is selected. The reason is
- XXmmCCRR__SSIINNGGLLEE__SSEELLEECCTT. The callbacks are NOT called
- when the user browses through the items in the
- list.
-
- XXmmNNsseelleeccttiioonnPPoolliiccyy
- This resource controls whether the user can dese-
- lect the currently selected item within a combo
- box. The default value is XXmmBBRROOWWSSEE__SSEELLEECCTT, so
- always one item gets selected if the combo box is
- editable. In the case of XXmmSSIINNGGLLEE__SSEELLEECCTT the user
- may deselect the current item either by clicking on
- it in the drop down list or pressing the key
- "Delete". Other values for XXmmNNsseelleeccttiioonnPPoolliiccyy are
- currently not allowed. (Multiple selections will be
- probably availabe with the next release.)
-
- XXmmNNsseelleeccttTThhrreesshhoolldd
- Specifies the amount of pixels the mouse must move
- until the selection of text is recognized in click
- and drag mode.
-
- XXmmNNsshhoowwLLaabbeell
- Specifies, whether a label containing text or a
- pixmap should be displayed on the left side of the
- combo box. This resource can only be specified dur-
- ing the creation of the combo box, afterwards it
- will have no effect.
-
- XXmmNNssoorrtteedd
- Specifies whether the items in the list are sorted
- or not In an unsorted list, the items are shown in
- the order in which they're put into the list. When
- adding an item to a sorted list, this item will be
- put at the right place (alphabetically sorted).
-
- XXmmNNssoorrttiinnggCCaallllbbaacckk
- Contains a list of callbacks that is called when-
- ever a new item is added to the combo box widget
- and XXmmNNssoorrtteedd is TTrruuee. The reason is XXmmCCRR__SSOORRTTIINNGG
- and the type of the structure whose address is
- passed to the callback is XXmmCCoommbbooBBooxxSSoorrttiinnggCCaallll--
- bbaacckk--SSttrruucctt. For detailed information see the fol-
- lowing sections.
-
- XXmmNNssqquuaarreeAArrrrooww
- Controls the width of the arrow button in respect
- to its height. If this resource is TTrruuee the arrow
- button is always layed out square. Otherwise the
- arrow button's width will be approximatly 4/5th of
- its height.
-
-
-
-
-Version 1.31 20 March 1995 9
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- XXmmNNssttaattiiccLLiisstt
- Controls whether the list is always statically dis-
- played right below the text input area of the combo
- box if set to TTrruuee. If you use a combo box with
- XXmmNNssttaattiiccLLiisstt set to TTrruuee and XXmmNNeeddiittaabbllee set to
- FFaallssee you should consider using a simple list wid-
- get instead.
-
- XXmmNNssttrriinnggDDiirreeccttiioonn
- Specifies the initial direction to draw the string
- (from the left to the right or in the opposite
- direction). The whole story seems to be incompre-
- hensible... therefore this resource is provided for
- completeness only.
-
- XXmmNNttwwmmHHaannddlliinnggOOnn
- If you have trouble with the list then this
- resource may help you. Set it to True, if the list
- gets hidden at the moment the mouse cursor enters
- the list.
-
- XXmmNNttooppIItteemmPPoossiittiioonn
- This resource is intended as an informal hint. It
- specifies the index of the item which is displayed
- at the visible top of the list.
-
- XXmmNNvvaalluuee
- Contains the text of the input field. This also
- concerns combo boxes which are not editable (
- XXmmNNeeddiittaabbllee set to False).
-
- XXmmNNuunnsseelleeccttiioonnCCaallllbbaacckk
- Specifies a list of callbacks that is called when-
- ever the currently selected item is deselected and
- no other item gets selected. This callback is acti-
- vated only when XXmmNNsseelleeccttiioonnPPoolliiccyy is XXmmSSIINN--
- GGLLEE__SSEELLEECCTT. The reason is XXmmCCRR__UUNNSSEELLEECCTT. The type
- of the structure whose address is passed to this
- callback is XXmmAAnnyyCCaallllbbaacckkSSttrruucctt.
-
- XXmmNNvvaalluuee
- Contains the text of the input field. This also
- concerns combo boxes which are not editable (
- XXmmNNeeddiittaabbllee set to FFaallssee).
-
- XXmmNNvvaalluueeCChhaannggeeddCCaallllbbaacckk
- Specifies a list of callbacks to be called after
- text is deleted from or inserted into the text area
- of the combo box widget. The reason is
- XXmmCCRR__VVAALLUUEE__CCHHAANNGGEEDD. The type of the structure
- whose address is passed to this callback is XXmmAAnnyy--
- CCaallllbbaacckkSSttrruucctt.
-
-
-
-
-
-Version 1.31 20 March 1995 10
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- XXmmNNvviissiibblleeIItteemmCCoouunntt
- Specifies the number of items that can fit in the
- visible space of the list. The combo box uses this
- value to determine the height of its list.
-
- IInnhheerriitteedd RReessoouurrcceess
- XmComboBox inherits behaviour and resources from the fol-
- lowing superclasses. For a complete description of each
- resource, refer to the man page for that superclass.
-
- CCaallllbbaacckk IInnffoorrmmaattiioonn
- A pointer to the following structure is passed to the
- XXmmNNddrrooppDDoowwnnCCaallllbbaacckk callback:
-
- ttyyppeeddeeff ssttrruucctt {{
- iinntt _r_e_a_s_o_n;;
- XXEEvveenntt **_e_v_e_n_t;;
- }} XXmmCCoommbbooBBooxxDDrrooppDDoowwnnCCaallllbbaacckkSSttrruucctt;;
-
- _r_e_a_s_o_n Within this structure, _r_e_a_s_o_n indicates the
- reason why the callback was activated. This
- can be XXmmCCRR__SSHHOOWW__LLIISSTT as well as
- XXmmCCRR__HHIIDDEE__LLIISSTT. A callback is called with
- the reason XXmmCCRR__SSHHOOWW__LLIISSTT just before the
- list is dropped down, whereas the callback
- is called with XXmmCCRR__HHIIDDEE__LLIISSTT after the
- list is hidden.
-
-
- _e_v_e_n_t Points to the XXEEvveenntt, which triggered the
- callback. May be NNUULLLL if the callback is
- triggered by a call to XXmmCCoommbbooBBooxxSShhoowwLLiisstt
- or XXmmCCoommbbooBBooxxHHiiddeeLLiisstt.
-
- A pointer to the following structure is passed to the
- XXmmNNaaccttiivvaatteeCCaallllbbaacckk callback:
-
- ttyyppeeddeeff ssttrruucctt {{
- iinntt _r_e_a_s_o_n;;
- XXEEvveenntt **_e_v_e_n_t;;
- }} XXmmAAnnyyCCaallllbbaacckkSSttrruucctt;;
-
- _r_e_a_s_o_n Indicates why the callback was invoked.
- This is XXmmCCRR__AACCTTIIVVAATTEE for XXmmNNaaccttiivvaatteeCCaallll--
- bbaacckk.
-
- _e_v_e_n_t Points to the XXEEvveenntt, which triggered the
- callback.
-
- A pointer to the following structure is passed to the
- XXmmNNsseelleeccttiioonnCCaallllbbaacckk and XXmmNNddeeffaauullttAAccttiioonnCCaallllbbaacckk:
-
- ttyyppeeddeeff ssttrruucctt {{
- iinntt _r_e_a_s_o_n;;
-
-
-
-Version 1.31 20 March 1995 11
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- XXEEvveenntt **_e_v_e_n_t;;
- XXmmSSttrriinngg _v_a_l_u_e;;
- iinntt _i_n_d_e_x;;
- }} XXmmCCoommbbooBBooxxSSeelleeccttiioonnCCaallllbbaacckkSSttrruucctt,, XXmmCCoommbbooBBooxxDDeeffaauullttAAcc--
- ttiioonnCCaallllbbaacckkSSttrruucctt;;
-
- _r_e_a_s_o_n Within this structure, _r_e_a_s_o_n indicates the
- reason why the callback was activated. At
- this time, the reason can be either
- XXmmCCRR__SSIINNGGLLEE__SSEELLEECCTT or XXmmCCRR__BBRROOWWSSEE__SSEELLEECCTT
- depending on the setting of XXmmNNsseelleeccttiioonn--
- PPoolliiccyy. It indicates that the user
- selected a (potentially new) item in the
- list. Whether this callback is activated
- every time the user moves into a new item
- of the list or only when the user releases
- the mouse button is controlled through the
- setting of XXmmNNaauuttoommaattiiccSSeelleeccttiioonn.
-
- _e_v_e_n_t Points to the XXEEvveenntt, which triggered the
- callback.
-
- _v_a_l_u_e Points to a XXmmSSttrriinngg, which contains the
- text of the current selected item. This
- XXmmSSttrriinngg must never be freed or changed by
- the called program code!
-
- _i_n_d_e_x Index (starting from 1) of the currently
- selected item in the list.
-
- A pointer to the following structure is passed to the
- XXmmNNuunnsseelleeccttiioonnCCaallllbbaacckk callback:
-
- ttyyppeeddeeff ssttrruucctt {{
- iinntt _r_e_a_s_o_n;;
- XXEEvveenntt **_e_v_e_n_t;;
- }} XXmmCCoommbbooBBooxxUUnnsseelleeccttiioonnCCaallllbbaacckkSSttrruucctt;;
-
- _r_e_a_s_o_n Indicates why the callback was invoked.
- This is XXmmCCRR__UUNNSSEELLEECCTT.
-
- _e_v_e_n_t Points to the XXEEvveenntt, which triggered the
- callback.
-
- A pointer to the following structure is passed to the
- XXmmNNmmooddiiffyyVVeerriiffyyCCaallllbbaacckk and XXmmNNmmoottiioonnVVeerriiffyyCCaallllbbaacckk call-
- backs:
-
- ttyyppeeddeeff ssttrruucctt {{
- iinntt _r_e_a_s_o_n;;
- XXEEvveenntt **_e_v_e_n_t;;
- BBoooolleeaann _d_o_i_t;;
- PPoossiittiioonn _c_u_r_r_I_n_s_e_r_t_, _n_e_w_I_n_s_e_r_t;;
- PPoossiittiioonn _s_t_a_r_t_P_o_s_, _e_n_d_P_o_s;;
-
-
-
-Version 1.31 20 March 1995 12
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- XXmmTTeexxttBBlloocckk _t_e_x_t;;
- }} XXmmCCoommbbooBBooxxTTeexxttVVeerriiffyyCCaallllbbaacckkSSttrruucctt,, **XXmmCCoommbbooBBooxxTTeexxttVVeerrii--
- ffyyPPttrr;;
-
- _r_e_a_s_o_n Indicates the reason why the callback was
- activated. This can be either
- XXmmCCRR__MMOODDIIFFYYIINNGG__TTEEXXTT__VVAALLUUEE or
- XXmmCCRR__MMOOVVIINNGG__IINNSSEERRTT__CCUURRSSOORR.
-
- _e_v_e_n_t Points to the XXEEvveenntt, which triggered the
- callback.
-
- _d_o_i_t Indicates whether the offending action
- should be performed. Setting this field of
- the callback structure to FFaallssee denies the
- action.
-
- _c_u_r_r_I_n_s_e_r_t Specifies the current position of the
- insert cursor.
-
- Indicates the position at which the user
- attempts to position the cursor.
-
- _s_t_a_r_t_P_o_s Indicates the starting position of the text
- to modify. If the reason is
- XXmmCCRR__MMOOVVIINNGG__IINNSSEERRTT__CCUURRSSOORR this value is the
- same as ccuurrrrIInnsseerrtt.
-
- _e_n_d_P_o_s Specifies the ending position of the text
- to modify. If no text is replaced or
- deleted, then the value will be the same as
- ssttaarrttPPooss. If the reason is
- XXmmCCRR__MMOODDIIFFYYIINNGG__TTEEXXTT__VVAALLUUEE this value is the
- same as _c_u_r_r_I_n_s_e_r_t.
-
- _t_e_x_t Holds the address of a structure of type
- XXmmTTeexxttBBlloocckkRReecc which holds the textual
- information to be inserted.
-
- The following table describes the reasons why the individ-
- ual verification callback structure fields are valid.
-
- RReeaassoonn VVaalliidd FFiieellddss
- -----------------------------------------------------
- XXmmCCRR__MMOODDIIFFYYIINNGG__TTEEXXTT__VVAALLUUEE _r_e_a_s_o_n, _e_v_e_n_t, _d_o_i_t,
- _s_t_a_r_t_P_o_s, _e_n_d_P_o_s, _t_e_x_t
-
- XXmmCCRR__MMOOVVIINNGG__IINNSSEERRTT__CCUURRSSOORR _r_e_a_s_o_n, _e_v_e_n_t, _d_o_i_t,
- _c_u_r_r_I_n_s_e_r_t, _n_e_w_I_n_s_e_r_t,
-
- A pointer to the following structure is passed to the XXmmNN--
- ssoorrttiinnggCCaallllbbaacckk callback: ttyyppeeddeeff ssttrruucctt {{
- iinntt _r_e_a_s_o_n;;
- XXEEvveenntt **_e_v_e_n_t;;
-
-
-
-Version 1.31 20 March 1995 13
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- iinntt _o_p_e_r_a_t_i_o_n;;
- vvooiidd **_i_t_e_m___i_n_t_e_r_n_a_l;;
- XXmmSSttrriinngg _i_t_e_m;;
- iinntt _r_e_s_u_l_t;;
- }} XXmmCCoommbbooBBooxxSSoorrttiinnggCCaallllbbaacckkSSttrruucctt,, **XXmmCCoommbbooBBooxxSSoorrttiinnggPPttrr;;
-
- _r_e_a_s_o_n Indicates the reason why the callback was
- activated. This is XXmmCCRR__SSOORRTTIINNGG.
-
- _e_v_e_n_t Contains always NNUULLLL and is just there for
- compatibility reasons.
-
- _o_p_e_r_a_t_i_o_n Indicates the operation to carry out and
- can be either XXmmOOPP__IINNIITT,XXmmOOPP__DDOONNEE or
- XXmmOOPP__CCOOMMPPAARREE.
-
- _i_t_e_m___i_n_t_e_r_n_a_l Must be set during the XXmmOOPP__IINNIITT operation
- to a suitable representation of the new
- item which is to be added to the list. In
- all subsequent calls to this callback with
- XXmmOOPP__CCOOMMPPAARREEorXXmmOOPP__DDOONNEE this field will
- contain whatever you've put into it during
- XXmmOOPP__IINNIITT. For detailed information refer
- to the documentation "_T_h_e _C_o_m_b_o_B_o_x _W_i_d_g_e_t".
-
- _i_t_e_m During XXmmOOPP__IINNIITT this field points to the
- item to be added to the list. When sorting
- the list ( XXmmOOPP__CCOOMMPPAARREE) the field contains
- the address of an item in the list which
- should be compared against the new item (as
- remembered in _i_t_e_m___i_n_t_e_r_n_a_l).
-
- _r_e_s_u_l_t When comparing an item (out of the list) in
- _i_t_e_m with the new item (as remembered in
- _i_t_e_m___i_n_t_e_r_n_a_l) the result has to be stored
- into this structure's field.
-
- The following table describes which individual callback
- structure fields are valid during which operations.
-
- RReeaassoonn VVaalliidd FFiieellddss
- ---------------------------------------------
- XXmmOOPP__IINNIITT _r_e_a_s_o_n, _e_v_e_n_t, _o_p_e_r_a_t_i_o_n,
- _i_t_e_m, _i_t_e_m___i_n_t_e_r_n_a_l
- XXmmOOPP__DDOONNEE _r_e_a_s_o_n, _e_v_e_n_t, _o_p_e_r_a_t_i_o_n,
- _i_t_e_m___i_n_t_e_r_n_a_l
- XXmmOOPP__CCOOMMPPAARREE _r_e_a_s_o_n, _e_v_e_n_t, _o_p_e_r_a_t_i_o_n,
- _i_t_e_m, _i_t_e_m___i_n_t_e_r_n_a_l, _r_e_s_u_l_t
-
- For more information about controlling the sorting order
- see the acompanying documentation "_T_h_e _C_o_m_b_o_B_o_x _W_i_d_g_e_t".
-
- CCoonnvveenniieennccee rroouuttiinneess
- ComboBox has a number of convenience routines to control
-
-
-
-Version 1.31 20 March 1995 14
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- the behavior and contents of its children.
-
- vvooiidd XXmmCCoommbbooBBooxxAAddddIItteemm((WWiiddggeett ww,, XXmmSSttrriinngg iitteemm,, iinntt ppooss))
- Add a new item to the list's contents. If XXmmNNssoorrtteedd
- is set to True, the new item is inserted alphabeti-
- cally. If the list is unsorted, the same assump-
- tions can be applied as with XXmmLLiissttAAddddIItteemm.
-
-
- vvooiidd XXmmCCoommbbooBBooxxAAddddIItteemmss((WWiiddggeett ww,, XXmmSSttrriinngg **iitteemmss,,
- iinntt iitteemm__ccoouunntt,, iinntt ppooss))
- Similar to XXmmCCoommbbooBBooxxAAddddIItteemm. Also see XXmmLLiissttAAdd--
- ddIItteemmss.
-
-
- vvooiidd XXmmCCoommbbooBBooxxAAddddIItteemmUUnnsseelleecctteedd((WWiiddggeett ww,, XXmmSSttrriinngg
- iitteemm,, iinntt ppooss))
- See XXmmLLiissttAAddddIItteemmUUnnsseelleecctteedd.
-
-
- vvooiidd XXmmCCoommbbooBBooxxCClleeaarrIItteemmSSeelleeccttiioonn((WWiiddggeett ww))
- Deselects all currently selected items when
- XXmmNNsseelleeccttiioonnPPoolliiccyy is XXmmSSIINNGGLLEE__SSEELLEECCTT.
-
-
- vvooiidd XXmmCCoommbbooBBooxxDDeelleetteeIItteemm((WWiiddggeett ww,, XXmmSSttrriinngg iitteemm))
- See XXmmLLiissttDDeelleetteeIItteemm.
-
-
- vvooiidd XXmmCCoommbbooBBooxxDDeelleetteeIItteemmss((WWiiddggeett ww,, XXmmSSttrriinngg
- **iitteemmss,, iinntt iitteemm__ccoouunntt))
- See XXmmLLiissttDDeelleetteeIItteemmss.
-
-
- vvooiidd XXmmCCoommbbooBBooxxDDeelleetteePPooss((WWiiddggeett ww,, iinntt ppooss))
- See XXmmLLiissttDDeelleetteePPooss.
-
-
- vvooiidd XXmmCCoommbbooBBooxxDDeelleetteeIItteemmssPPooss((WWiiddggeett ww,, iinntt iitteemm__ccoouunntt,,
- iinntt ppooss))
- See XXmmLLiissttDDeelleetteeIItteemmssPPooss.
-
-
- vvooiidd XXmmCCoommbbooBBooxxDDeelleetteeAAllllIItteemmss((WWiiddggeett ww))
- See XXmmLLiissttDDeelleetteeAAllllIItteemmss.
-
-
- vvooiidd XXmmCCoommbbooBBooxxRReeppllaacceeIItteemmss((WWiiddggeett ww,, XXmmSSttrriinngg
- **oolldd__iitteemmss,, iinntt iitteemm__ccoouunntt,, XXmmSSttrriinngg **nneeww__iitteemmss))
- See XXmmLLiissttRReeppllaacceeIItteemmss.
-
-
- vvooiidd XXmmCCoommbbooBBooxxRReeppllaacceeIItteemmssPPooss((WWiiddggeett ww,, XXmmSSttrriinngg
- **nneeww__iitteemmss,, iinntt iitteemm__ccoouunntt,, iinntt ppoossiittiioonn))
-
-
-
-Version 1.31 20 March 1995 15
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- See XXmmLLiissttRReeppllaacceeIItteemmssPPooss.
-
-
- BBoooolleeaann XXmmCCoommbbooBBooxxIItteemmEExxiissttss((WWiiddggeett ww,, XXmmSSttrriinngg iitteemm))
- See XXmmLLiissttIItteemmEExxiissttss.
-
-
- iinntt XXmmCCoommbbooBBooxxIItteemmPPooss((WWiiddggeett ww,, XXmmSSttrriinngg iitteemm))
- See XXmmLLiissttIItteemmPPooss.
-
-
- BBoooolleeaann XXmmCCoommbbooBBooxxGGeettMMaattcchhPPooss((WWiiddggeett ww,, XXmmSSttrriinngg
- iitteemm,, iinntt ****ppooss__lliisstt,, iinntt **ppooss__ccoouunntt))
- See XXmmLLiissttGGeettMMaattcchhPPooss.
-
-
- vvooiidd XXmmCCoommbbooBBooxxSSeelleeccttPPooss((WWiiddggeett ww,, iinntt ppooss,, BBoooolleeaann
- nnoottiiffyy))
- See XXmmLLiissttSSeelleeccttPPooss.
-
-
- vvooiidd XXmmCCoommbbooBBooxxSSeelleeccttIItteemm((WWiiddggeett ww,, XXmmSSttrriinngg iitteemm,,
- BBoooolleeaann nnoottiiffyy))
- See XXmmLLiissttSSeelleeccttIItteemm.
-
-
- iinntt XXmmCCoommbbooBBooxxGGeettSSeelleecctteeddPPooss((WWiiddggeett ww))
- This function differs from XXmmLLiissttGGeettSSeelleecctteeddPPooss.
- The list in a combo box can contain only one
- selected item. Therefore this function returns the
- index of the selected item in the list or zero, if
- none is currently selected.
-
-
- vvooiidd XXmmCCoommbbooBBooxxCClleeaarrSSeelleeccttiioonn((WWiiddggeett ww,, TTiimmee ttiimmee))
- See XXmmTTeexxttFFiieellddCClleeaarrSSeelleeccttiioonn.
-
-
- BBoooolleeaann XXmmCCoommbbooBBooxxCCooppyy((WWiiddggeett ww,, TTiimmee ttiimmee))
- See XXmmTTeexxttFFiieellddCCooppyy.
-
-
- BBoooolleeaann XXmmCCoommbbooBBooxxCCuutt((WWiiddggeett ww,, TTiimmee ttiimmee))
- See XXmmTTeexxttFFiieellddCCuutt.
-
-
- XXmmTTeexxttPPoossiittiioonn XXmmCCoommbbooBBooxxGGeettIInnsseerrttiioonnPPoossiittiioonn((WWiiddggeett ww))
- See XXmmTTeexxttFFiieellddGGeettIInnsseerrttiioonnPPoossiittiioonn.
-
-
- XXmmTTeexxttPPoossiittiioonn XXmmCCoommbbooBBooxxGGeettLLaassttPPoossiittiioonn((WWiiddggeett ww))
- See XXmmTTeexxttFFiieellddGGeettLLaassttPPoossiittiioonn.
-
-
-
-
-
-Version 1.31 20 March 1995 16
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- iinntt XXmmCCoommbbooBBooxxGGeettMMaaxxLLeennggtthh((WWiiddggeett ww))
- See XXmmTTeexxttFFiieellddGGeettMMaaxxLLeennggtthh.
-
-
- cchhaarr **XXmmCCoommbbooBBooxxGGeettSSeelleeccttiioonn((WWiiddggeett ww))
- See XXmmTTeexxttFFiieellddGGeettSSeelleeccttiioonn.
-
-
- BBoooolleeaann XXmmCCoommbbooBBooxxGGeettSSeelleeccttiioonnPPoossiittiioonn((WWiiddggeett ww,,
- XXmmTTeexxttPPoossiittiioonn **lleefftt,, XXmmTTeexxttPPoossiittiioonn **rriigghhtt))
- See XXmmTTeexxttFFiieellddGGeettSSeelleeccttiioonnPPoossiittiioonn.
-
-
- cchhaarr **XXmmCCoommbbooBBooxxGGeettSSttrriinngg((WWiiddggeett ww))
- See XXmmTTeexxttFFiieellddGGeettSSttrriinngg.
-
-
- vvooiidd XXmmCCoommbbooBBooxxIInnsseerrtt((WWiiddggeett ww,, XXmmTTeexxttPPoossiittiioonn
- ppoossiittiioonn,, cchhaarr **vvaalluuee))
- See XXmmTTeexxttFFiieellddIInnsseerrtt.
-
-
- BBoooolleeaann XXmmCCoommbbooBBooxxPPaassttee((WWiiddggeett ww))
- See XXmmTTeexxttFFiieellddPPaassttee.
-
-
- BBoooolleeaann XXmmCCoommbbooBBooxxRReemmoovvee((WWiiddggeett ww))
- See XXmmTTeexxttFFiieellddRReemmoovvee.
-
-
- vvooiidd XXmmCCoommbbooBBooxxRReeppllaaccee((WWiiddggeett ww,, XXmmTTeexxttPPoossiittiioonn
- ffrroomm__ppooss,, XXmmTTeexxttPPoossiittiioonn ttoo__ppooss,, cchhaarr **vvaalluuee))
- See XXmmTTeexxttFFiieellddRReeppllaaccee.
-
-
- vvooiidd XXmmCCoommbbooBBooxxSSeettAAddddMMooddee((WWiiddggeett ww,, BBoooolleeaann ssttaattee))
- See XXmmTTeexxttFFiieellddSSeettAAddddMMooddee.
-
-
- vvooiidd XXmmCCoommbbooBBooxxSSeettHHiigghhlliigghhtt((WWiiddggeett ww,, XXmmTTeexxttPPoossiittiioonn
- lleefftt,, XXmmTTeexxttPPoossiittiioonn rriigghhtt,, XXmmHHiigghhlliigghhttMMooddee mmooddee))
- See XXmmTTeexxttFFiieellddSSeettHHiigghhlliigghhtt.
-
-
- vvooiidd XXmmCCoommbbooBBooxxSSeettIInnsseerrttiioonnPPoossiittiioonn((WWiiddggeett ww,,
- XXmmTTeexxttPPoossiittiioonn ppoossiittiioonn))
- See XXmmTTeexxttFFiieellddSSeettIInnsseerrttiioonnPPoossiittiioonn.
-
-
- vvooiidd XXmmCCoommbbooBBooxxSSeettMMaaxxLLeennggtthh((WWiiddggeett ww,, iinntt mmaaxx__lleennggtthh))
- See XXmmTTeexxttFFiieellddSSeettMMaaxxLLeennggtthh.
-
-
-
-
-
-
-Version 1.31 20 March 1995 17
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- vvooiidd XXmmCCoommbbooBBooxxSSeettSSeelleeccttiioonn((WWiiddggeett ww,, XXmmTTeexxttPPoossiittiioonn
- ffiirrsstt,, XXmmTTeexxttPPoossiittiioonn llaasstt,, TTiimmee ttiimmee))
- See XXmmTTeexxttFFiieellddSSeettSSeelleeccttiioonn.
-
-
- vvooiidd XXmmCCoommbbooBBooxxSSeettSSttrriinngg((WWiiddggeett ww,, cchhaarr **vvaalluuee))
- At least Motif 1.1 contains a very anoying bug. If
- you try to set the contents of an XmTextField to an
- empty string (""), you'll get garbage, when asking
- the XmTextField for its contents afterwards. This
- interface function provides a work around. Also see
- XXmmTTeexxttFFiieellddSSeettSSttrriinngg.
-
-
- vvooiidd XXmmCCoommbbooBBooxxSShhoowwPPoossiittiioonn((WWiiddggeett ww,, XXmmTTeexxttPPoossiittiioonn ppoossii--
- ttiioonn))
- See XXmmTTeexxttFFiieellddSShhoowwPPoossiittiioonn.
-
-
- TThhee DDiisslliikkeedd KKeeyybbooaarrdd FFooccuuss
- Now I'll annotate a somewhat tricky subject. If the
- resource XXmmNNppeerrssiisstteennttDDrrooppDDoowwnn defaults to its initial
- value of FFaallssee, one can observe the following effect (this
- may be annoying).
-
- When the user drops down the list and then moves the mouse
- cursor out of the window where the combo box resides in,
- the list will be hidden. This is because the widget lost
- the keyboard focus. Some users are irritated because they
- didn't expect that behavior, because they just moved the
- mouse to get it out of the way. If your window manager's
- focus policy is "pointer focus", i.e. if you move the
- pointer into another window, that window will automati-
- cally get the keyboard focus. On the other hand, if your
- window manager's focus policy is "explicit", you have to
- move the pointer into another window and click a mouse
- button to give that window the keyboard focus. This is
- often referred to as the "click-to-type" method. In
- "explicit" mode, you will never see the list's annoying
- behavior.
-
- To bypass this behavior on some window managers a really
- dirty hack was used. The user can activate that hack, if
- he sets XXmmNNppeerrssiisstteennttDDrrooppDDoowwnn to TTrruuee in the application's
- resources. Sorry, on some window managers this will not
- fix the annoying behavior.
-
- Try it if you like - but don't complain at me if it
- doesn't work as expected. But at least it worked on the
- author's machine: a cute little SGI Indigo running 4dwm as
- the window manager.
-
- On some other window managers like twm you will face
- another problem: the list gets hidden as soon as the mouse
-
-
-
-Version 1.31 20 March 1995 18
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- cursor enters the list. Try to set XXmmNNttwwmmHHaannddlliinnggOOnn to
- TTrruuee. This resource will also work with other window man-
- agers.
-
-
- CCrreeaattiinngg aa CCoommbbooBBooxx
- Using the combo box in your own programs is easy. Just
- create the widget with one of the innumerable X toolkit
- functions (like XXttCCrreeaatteeMMaannaaggeeddWWiiddggeett or XXttVVaaCCrreeaatteeMMaann--
- aaggeeddWWiiddggeett).
-
-
- Specify as the widget class xmComboBoxWidgetClass - that's
- all. There is also a so-called creation convenience func-
- tion called XXmmCCrreeaatteeCCoommbbooBBooxx, but it isn't really needed.
-
- WWiiddggeett XXmmCCrreeaatteeCCoommbbooBBooxx((_p_a_r_e_n_t_, _n_a_m_e_, _a_r_g_l_i_s_t_, _a_r_g_c_o_u_n_t))
- WWiiddggeett _p_a_r_e_n_t;
- SSttrriinngg _n_a_m_e;
- AArrggLLiisstt _a_r_g_l_i_s_t;
- CCaarrddiinnaall _a_r_g_c_o_u_n_t;
-
- Somewhere in your program you'll need something like the
- following code fragment:
-
-
- Widget ComboBox;
-
- ComboBox = XtVaCreateManagedWidget("combobox",
- xmComboBoxWidgetClass, Parent,
- XmNeditable, True or False,
- other Resources...
- NULL);
-
-
- Setting the resource XXmmNNeeddiittaabbllee is not absolutely neces-
- sary, but it's better to do so.
-
- After creation, items can be added to the combo box's list
- by means of interface functions like XXmmCCoommbbooBBooxxAAdd--
- ddIItteemm((......)). Which item the user selected can be deter-
- mined by calling XXmmCCoommbbooBBooxxGGeettSSttrriinngg((......)).
-
-
- If you want to preselect an item (that is setting a
- default item to the input field of the combo box) you can
- use several convenience functions. On a combo box with a
- non editable input field there are two ways to select an
- item:
-
-
- XmComboBoxSelectPos(ComboBox, item #, False);
-
- or:
-
-
-
-Version 1.31 20 March 1995 19
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- XmComboBoxSelectItem(ComboBox, itemString, False);
-
- The third parameter in these two function calls indicates
- whether the XXmmNNsseelleeccttiioonnCCaallllbbaacckk should be called. The
- only difference between these functions is the first one
- is expecting an item number whereas the second one expects
- a XmString. The list is then searched for this string and
- if it is found the input field will be updated.
-
- On a combo box with XXmmNNeeddiittaabbllee set to TTrruuee use another
- function:
-
- XmComboBoxSetString(ComboBox, string);
-
- This sets the contents of the text input field to string.
-
-
-
-BBUUGGSS
- Not more than currently available in Motif 1.2.3 or Motif
- 1.2.4, but less than in the upcomming Motif 2.0. Report
- bugs to albrecht@igpm.rwth-aachen.de. Include a thoroughly
- description, and say which version of the ComboBox widget
- you are using.
-
-
-
-CCOOPPYYRRIIGGHHTT
- Copyright 1993, 1994 Harald Albrecht.
-
- The ComboBox widget is free software; you can redistribute
- it and/or modify it under the terms of the GNU General
- Public License as published by the Free Software Founda-
- tion; either version 2, or (at your option) any later ver-
- sion.
-
-
-
-AAVVAAIILLAABBIILLIITTYY
- The most recent released version of the ComboBox widget is
- always available for anonymous ftp from either
-
- ftp.x.org (198.112.44.100)
- /contrib/widgets/motif/ComboBox
-
- or from
-
- ftp.informatik.rwth-aachen.de (137.226.112.172)
- /pub/packages/ComboBox
-
-
-
-AAUUTTHHOORR
- Author of Software & Documentation:
-
-
-
-Version 1.31 20 March 1995 20
-
-
-
-
-
-XmComboBox(3Xm) Harry's Motif Tools XmComboBox(3Xm)
-
-
- Harald Albrecht
- Institut fuer Geometrie und Praktische Mathematik
- RWTH Aachen, Bundesrepublik Deutschland
- e-mail: albrecht@igpm.rwth-aachen.de
-
- English Documentation:
- Chris Marotz
- Sterling Software ITD
- e-mail: marotz@itd.sterling.com
-
-
-
-RREELLAATTEEDD IINNFFOORRMMAATTIIOONN
- "_T_h_e _C_o_m_b_o_B_o_x _W_i_d_g_e_t" documentation
- CCoorree((33XX)), XXmmCCoommppoossiittee((33XX)), XXmmLLiisstt((33XX)), XXmmTTeexxttFFiieelldd((33XX))
- _D_o_u_g_l_a_s _A_d_a_m_s_: _T_h_e _H_i_t_c_h_h_i_k_e_r_'_s _G_u_i_d_e _t_o _t_h_e _G_a_l_a_x_y_.
- ffiillee::////113344..113300..116611..3300//aarrcc//ppuubb//uunniixx//hhttmmll//mmoottiiffccoorrnneerr..hhttmmll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Version 1.31 20 March 1995 21
-
-
diff --git a/src/motif/xmcombo/combop.h b/src/motif/xmcombo/combop.h
deleted file mode 100644
index 3e1c8591f8..0000000000
--- a/src/motif/xmcombo/combop.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * ComboBoxP.h - Das schon lange schmerzlich vermisste Combo-Box-
- * Widget -- nun endlich auf fuer Motif!
- * Wahlweise Motif 1.1 oder 1.2.
- *
- * Letzte Modifikation: 04.10.1995 Revisionsstand: 1.32a
- *
- * (c) 1993, 1994 Harald Albrecht
- * Institut fuer Geometrie und Praktische Mathematik
- * RWTH Aachen, Germany
- * albrecht@igpm.rwth-aachen.de
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program (see the file COPYING for more details);
- * if not, write to the Free Software Foundation, Inc., 675 Mass Ave,
- * Cambridge, MA 02139, USA.
- *
- */
-#ifndef __ComboBoxWidgetP_h
-#define __ComboBoxWidgetP_h
-
-#include "xmcombo.h"
-#include
-#if (XmVersion > 1001) /* sounds like tales from 1000 and 1 night.... */
-#include
-#endif
-
-/*********************************************************************
- * Klassendefinition
- *********************************************************************/
-/* Neue Datenfelder fuer den Klassenrecord der Center-Widgetklasse */
-typedef struct _XmComboBoxClassPart {
- int Just_to_keep_the_compiler_happy; /* Der Name ist Programm */
-} XmComboBoxClassPart;
-/*
- * Nun folgt die vollstaendige Klassenstruktur, mit all' den Felder,
- * die bereits von den Vorfahren geerbt wurden.
- */
-typedef struct _XmComboBoxClassRec {
- CoreClassPart core_class;
- CompositeClassPart composite_class;
- ConstraintClassPart constraint_class;
- XmManagerClassPart manager_class;
- XmComboBoxClassPart combobox_class;
-} XmComboBoxClassRec;
-extern XmComboBoxClassRec xmComboBoxClassRec;
-
-/*********************************************************************
- *Instanzdefinition
- *********************************************************************/
-typedef struct _XmComboBoxPart {
-/* Resourcen ... hierauf darf von aussen zugegriffen werden! */
- Boolean Editable; /* Editierbare Eingabezeile ? */
- Boolean StaticList; /* Liste immer dargestellt? */
- unsigned char SelectionPolicy; /* Was geht hier ab?! */
- unsigned char ScrollBarDisplayPolicy;
- unsigned char ListSizePolicy; /* Rollbalken! */
- Boolean AutomaticSelection; /* Wann Callbacks aufrufen? */
- Boolean Sorted; /* Liste sortiert */
- XtCallbackList SortingCBL; /* Wie wird extern sortiert? */
- int VisibleItemCount; /* Anz dargstellte Eintraege */
- XmFontList Font; /* verwendete Fonts */
- XtCallbackList SelectionCBL; /* Auswahl aus Liste */
- XtCallbackList UnselectionCBL; /* Auswahl zurueckgenommen */
- XtCallbackList DefaultActionCBL; /* bei Doppelklick */
- XtCallbackList DropDownCBL; /* Liste angezeigt/versteckt */
- XtCallbackList ModifyVerifyCBL; /* Vor Aenderung im Textfeld */
- XtCallbackList ValueChangedCBL; /* Danach... */
- XtCallbackList MotionVerifyCBL; /* Der Cursor bewegt sich doch*/
- XtCallbackList ActivateCBL; /* Eingabe beendet? */
- Boolean SquareArrow; /* Quadratischer Pfeil? */
- Boolean ArrowSpacingOn; /* Abstand zw. Pfeil und Text */
- Boolean Persistent; /* Liste & Focus-Out */
- Boolean TwmHandlingOn; /* dto. */
- Boolean ShowLabel; /* Label anzeigen? */
- Position DropDownOffset; /* delta Ecke Eingabefeld,
- Liste */
-
-/* Ab hier wird's privat! */
- Widget EditCtrl; /* Editorzeile */
- Widget ArrowCtrl; /* Pfeil nach unten */
- Widget LabelCtrl; /* Text links neben dem Eingabefeld */
-
- Widget PopupShell; /* Shell, in der die Liste liegt */
- Widget ListCtrl; /* Listenfeld */
-
- Widget MyNextShell;
-
- Cursor ArrowCursor;
- Boolean InInit;
-
- int LastSelection;
-
- Boolean ListVisible;
- Boolean IgnoreFocusOut;
- Boolean PendingFocusOut;
- Boolean PendingOverrideInOut;
- XtWorkProcId WorkProcID;
- XEvent xevent;
-
- Boolean PassVerification;
- Boolean ConvertBitmapToPixmap,
- ConvertBitmapToPixmapInsensitive;
- Pixmap LabelPixmap, LabelInsensitivePixmap;
-
- XtPointer Dummy;
-} XmComboBoxPart;
-
-/*
- * vollstaengige Instanzenstruktur
- */
-typedef struct _XmComboBoxRec {
- CorePart core;
- CompositePart composite;
- ConstraintPart constraint;
- XmManagerPart manager;
- XmComboBoxPart combobox;
-} XmComboBoxRec;
-
-#endif
-/* Ende von ComboBoxP.h */
diff --git a/src/motif/xmcombo/copying.txt b/src/motif/xmcombo/copying.txt
deleted file mode 100644
index e77696ae8d..0000000000
--- a/src/motif/xmcombo/copying.txt
+++ /dev/null
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C) 19yy
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) 19yy name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- , 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/src/motif/xmcombo/demo.c b/src/motif/xmcombo/demo.c
deleted file mode 100644
index 797f62bb64..0000000000
--- a/src/motif/xmcombo/demo.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * demo.c -- Example how to use a ComboBox
- *
- * compile and link with:
- * $ cc -DFUNCPROTO ComboBoxDemo.c ComboBox.o -o ComboBoxDemo \
- * -lXm -lXt -lX11
- * then run:
- * $ ./ComboBoxDemo
- *
- * (c) 1993, 1994 Harald Albrecht
- * Institut fuer Geometrie und Praktische Mathematik
- * RWTH Aachen, Germany
- * albrecht@igpm.rwth-aachen.de
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program (see the file COPYING for more details);
- * if not, write to the Free Software Foundation, Inc., 675 Mass Ave,
- * Cambridge, MA 02139, USA.
- *
- */
-#include
-#include
-#include
-#include
-#include
-#include
-#include "combobox.h"
-
-Widget TopLevel, Form, Button, Text, Sepp, ComboBox1, ComboBox2, ComboBox3, Label;
-
-void QuitCB(Widget w, caddr_t pClientData, caddr_t pCallData)
-{
- char *text;
-
- text = XmComboBoxGetString(ComboBox1);
- fprintf(stderr, "You choosed \"%s\" out of the first ComboBox\n", text);
- XtFree(text);
- text = XmComboBoxGetString(ComboBox2);
- fprintf(stderr, "You entered \"%s\" into the second ComboBox\n", text);
- XtFree(text);
- fprintf(stderr, "Bye! ... have fun with XmComboBox!\n");
- exit(0);
-} /* QuitCB */
-
-int main(int argc, String argv[])
-{
- XmString str;
- Boolean Trav;
- XtAppContext AppContext;
-
-#if (XmREVISION > 1)
- XtSetLanguageProc(NULL,NULL,NULL);
-#endif
- TopLevel = XtAppInitialize(&AppContext, "XFontSelDemo", NULL, 0,
-#if (XmREVISION > 1)
- &argc,
-#else
- (Cardinal *) &argc,
-#endif
- argv, NULL, NULL, 0);
-
- Form = XtVaCreateManagedWidget("form", xmFormWidgetClass, TopLevel, NULL);
- str = XmStringCreateLtoR("Click to quit", XmSTRING_DEFAULT_CHARSET);
- Button = XtVaCreateManagedWidget("quit", xmPushButtonWidgetClass, Form,
- XmNlabelString, str,
- XmNleftAttachment, XmATTACH_FORM,
- XmNleftOffset, 8,
- XmNtopAttachment, XmATTACH_FORM,
- XmNtopOffset, 8,
- NULL);
- XmStringFree(str);
- XtAddCallback(Button, XmNactivateCallback, (XtCallbackProc) QuitCB, NULL);
-
- Sepp = XtVaCreateManagedWidget("separator1", xmSeparatorWidgetClass, Form,
- XmNleftAttachment, XmATTACH_FORM,
- XmNrightAttachment, XmATTACH_FORM,
- XmNtopAttachment, XmATTACH_WIDGET,
- XmNtopOffset, 8,
- XmNtopWidget, Button,
- NULL);
-
- str = XmStringCreateLtoR("Choose one:", XmSTRING_DEFAULT_CHARSET);
- ComboBox1 = XtVaCreateManagedWidget("combobox1", xmComboBoxWidgetClass, Form,
- XmNeditable, False,
- XmNsorted, True,
- XmNleftAttachment, XmATTACH_FORM,
- XmNleftOffset, 8,
- XmNrightAttachment, XmATTACH_FORM,
- XmNrightOffset, 8,
- XmNtopAttachment, XmATTACH_WIDGET,
- XmNtopOffset, 8,
- XmNtopWidget, Sepp,
- XmNshowLabel, True,
- XmNlabelString, str,
- NULL);
- XmStringFree(str);
- /* Put string unordered into the combo box! They'll get sorted
- * by the box.
- */
- str = XmStringCreateLtoR("William the conquerior", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox1, str, 0); XmStringFree(str);
- str = XmStringCreateLtoR("Karl der Gro\337e", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox1, str, 0); XmStringFree(str);
- str = XmStringCreateLtoR("Henry VIII & his chicken band", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox1, str, 0); XmStringFree(str);
- str = XmStringCreateLtoR("Louis XIV", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox1, str, 0); XmStringFree(str);
- str = XmStringCreateLtoR("Louis de Funes", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox1, str, 0); XmStringFree(str);
- str = XmStringCreateLtoR("Helmut Kohl", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox1, str, 0); XmStringFree(str);
- str = XmStringCreateLtoR("James Major", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox1, str, 0); XmStringFree(str);
- str = XmStringCreateLtoR("James Bond", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox1, str, 0); XmStringFree(str);
- str = XmStringCreateLtoR("Billy Boy (M$ Windoze)", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox1, str, 0); XmStringFree(str);
- str = XmStringCreateLtoR("Francois Mitterand", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox1, str, 0);
- XmComboBoxSelectItem(ComboBox1, str, False);
- XmStringFree(str);
-
- str = XmStringCreateLtoR("Choose/edit:", XmSTRING_DEFAULT_CHARSET);
- ComboBox2 = XtVaCreateManagedWidget("combobox2", xmComboBoxWidgetClass, Form,
- XmNeditable, True,
- XmNsorted, True,
- XmNleftAttachment, XmATTACH_FORM,
- XmNleftOffset, 8,
- XmNrightAttachment, XmATTACH_FORM,
- XmNrightOffset, 8,
- XmNtopAttachment, XmATTACH_WIDGET,
- XmNtopOffset, 8,
- XmNtopWidget, ComboBox1,
- XmNshowLabel, True,
- XmNlabelString, str,
- NULL);
- str = XmStringCreateLtoR("item can be edited after choosing it", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox2, str, 0); XmStringFree(str);
- str = XmStringCreateLtoR("just to fill the list", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox2, str, 0); XmStringFree(str);
- str = XmStringCreateLtoR("so it contains more entries", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox2, str, 0); XmStringFree(str);
-
- str = XmStringCreateLtoR("Static ComboBox:", XmSTRING_DEFAULT_CHARSET);
- ComboBox3 = XtVaCreateManagedWidget("combobox3", xmComboBoxWidgetClass, Form,
- XmNeditable, True,
- XmNstaticList, True,
- XmNsorted, False,
- XmNcolumns, 30,
- XmNleftAttachment, XmATTACH_FORM,
- XmNleftOffset, 8,
- XmNrightAttachment, XmATTACH_FORM,
- XmNrightOffset, 8,
- XmNtopAttachment, XmATTACH_WIDGET,
- XmNtopOffset, 8,
- XmNtopWidget, ComboBox2,
- XmNshowLabel, True,
- XmNlabelString, str,
- NULL);
- XmStringFree(str);
- str = XmStringCreateLtoR("ComboBox (noneditable)", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox3, str, 0); XmStringFree(str);
- str = XmStringCreateLtoR("ComboBox (editable)", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox3, str, 0); XmStringFree(str);
- str = XmStringCreateLtoR("ComboBox (editable & static List)", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox3, str, 0); XmStringFree(str);
- str = XmStringCreateLtoR("Center widget", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox3, str, 0); XmStringFree(str);
- str = XmStringCreateLtoR("The ButtonFace Library", XmSTRING_DEFAULT_CHARSET);
- XmComboBoxAddItem(ComboBox3, str, 0); XmStringFree(str);
-
- Sepp = XtVaCreateManagedWidget("separator", xmSeparatorWidgetClass, Form,
- XmNleftAttachment, XmATTACH_FORM,
- XmNrightAttachment, XmATTACH_FORM,
- XmNtopAttachment, XmATTACH_WIDGET,
- XmNtopOffset, 8,
- XmNtopWidget, ComboBox3,
- NULL);
-
- str = XmStringCreateLtoR(
-"xmComboBoxWidgetClass Demo\n\nby Harald Albrecht\n\n\
-albrecht@igpm.rwth-aachen.de", XmSTRING_DEFAULT_CHARSET);
- Label = XtVaCreateManagedWidget("label", xmLabelWidgetClass, Form,
- XmNlabelString, str,
- XmNleftAttachment, XmATTACH_FORM,
- XmNleftOffset, 80,
- XmNrightAttachment, XmATTACH_FORM,
- XmNrightOffset, 80,
- XmNbottomAttachment, XmATTACH_FORM,
- XmNbottomOffset, 24,
- XmNtopAttachment, XmATTACH_WIDGET,
- XmNtopWidget, Sepp,
- XmNtopOffset, 24,
- NULL);
- XmStringFree(str);
-
- XtRealizeWidget(TopLevel);
-
- XtAppMainLoop(AppContext);
- return 0; /* Never will reach this */
-} /* main */
-
-
-/* End of ComboBoxDemo.c */
diff --git a/src/motif/xmcombo/xmcombo.c b/src/motif/xmcombo/xmcombo.c
deleted file mode 100644
index 961d8475e3..0000000000
--- a/src/motif/xmcombo/xmcombo.c
+++ /dev/null
@@ -1,3571 +0,0 @@
-/*
- * ComboBox.c - Das schon lange schmerzlich vermisste Combo-Box-
- * Widget -- nun endlich auf fuer Motif!
- *
- * Version 1.32a -- 04.10.95
- *
- * Letzte Modifikation:
- * 04.10.1995 Layoutfehler behoben, der bei angezeigter horizontaler Liste
- * dazu fuehrt, dass das Listenfeld schrumpft. Daneben wird
- * jetzt auch der Fall beruecksichtigt, dass das Listenfeld am
- * unteren Bildschirmrand abgeschnitten wuerde. In diesem Fall
- * erscheint das Listenfeld oberhalb des Eingabefeldes.
- * 20.03.1995 XmNscrollbarDisplayPolicy,... koennen nun immer vom Pro-
- * grammierer gesetzt werden, statische Liste hin und her.
- * 21.10.1994 Fehler in SetValues behoben, der auftritt, wenn man versucht,
- * XmNitems und XmNitemCount zu setzen.
- * 01.10.1994 Externe Sortierung wird nun unterstuetzt sowie seitenweises
- * Rollen in der Liste mittels PgUp und PgDn.
- * 25.09.1994 Unterstuetzung fuer XmNautomaticSelection implementiert.
- * Damit wird die Sache noch ein bischen runder in der Bedienung.
- * Des weiteren sind etliche Callbacks neu hinzugekommen.
- * 04.09.1994 Erweiterungen fuer XmSINGLE_SELECT eingebaut. Ausserdem
- * kann die Liste jetzt auch statisch unterhalb des Eingabe-
- * felds erscheinen. Damit sind wir nun noch kompatibler ge-
- * worden -- fragt sich nur, zu was?!
- * 29.08.1994 Alle Mirror-Ressourcen tauchen nun auch in der Ressourcen-
- * liste der ComboBox-Klasse auf. Allerdings stehen keine
- * sinnvollen Werte fuer die Initialisierung 'drin. Weiterhin
- * den GeometryManager so veraendert, dass ab sofort das
- * Label in der Breite wachsen oder schrumpfen darf.
- * 07.06.1994 XmNmnemonic und XmNmnemonicCharSet implementiert.
- * 29.05.1994 XmNsensitive angepasst. XmNcursorPositionVisible ist nun
- * False, falls die ComboBox nicht editierbar ist.
- * 07.05.1994 Drag'n'Drop funktioniert endlich!!! Zudem Anpassung an
- * den fvwm ausgefuehrt ('st vom Focus-Verhalten ja ein halber
- * twm). Hach', so'ne Linux-Box mit Motif 1.2 macht doch
- * einfach Spass... vor allem geht hier so richtig die Post ab.
- * Das kann man ja von M$ Windoze (Windoze for Mondays) nicht
- * behaupten!
- * 14.04.1994 Ein paar Speicherlecks korrigiert.
- * 21.02.1994 Die Resourcen XmNitems und XmNitemCount lassen sich nun
- * auch von einer Resourcendatei aus initialisieren. ACHTUNG:
- * diese beiden Resourcen mussen immer beide beim Aufruf von
- * XtSetValues zugleich angegeben werden, ansonsten werden
- * diese Angaben ignoriert.
- * 03.02.1994 Convenience-Funktionen auf Vordermann gebracht und noch
- * einen Callback eingebaut, der immer dann aufgerufen wird,
- * wenn die List angezeigt oder wieder versteckt wird.
- * 01.02.1994 Motif 1.2-fest!!! Das wird aber heute abend gefeiert!!
- * Endlich EIN Alptraum weniger! Naja, Drag'n'Drop bleibt
- * noch zu loesen. Spaeter...
- * 31.01.1994 VAX-fest (mit Hilfe von Vincenct Li)
- * owlm sollte man abschaffen! Aber es scheint so, als ob
- * ich jetzt doch noch das FocusOut-Problem geknackt habe.
- * Ebenso die OSF...mit viel Arbeit habe ich nun auch noch
- * eine anstaendige Initialisierung der Fontliste des Label-
- * Kinds erreicht.
- * 12.01.1994 Revisionsstand: 1.10a
- * nun wirklich voll ANSI-faehiger C-Code
- * Pixmaps werden ggf. aufgeraeumt; Druckrichtung
- * wird vom Vater erfragt und an das Label weiter-
- * gegeben.
- * ESC-Behandlung implementiert.
- * Spiegel-Ressourcen-Initialisierung aus Ressourcen-Daten-
- * bank implementiert.
- * Weitergabe von neu gesetzten Farben an die Kinder
- * implementiert.
- * Combo-Box kann jetzt wahlweise auch links neben dem
- * Eingabefeld ein Label anzeigen.
- * 09.12.1993 Revisionsstand: 1.00
- * erste oeffentlich zugaengliche Version der Combo-Box
- *
- * (c) 1993, 1994, 1995 Harald Albrecht
- * Institut fuer Geometrie und Praktische Mathematik
- * RWTH Aachen, Germany
- * albrecht@igpm.rwth-aachen.de
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program (see the file COPYING for more details);
- * if not, write to the Free Software Foundation, Inc., 675 Mass Ave,
- * Cambridge, MA 02139, USA.
- *
- */
-#ifdef __VMS
-/* vms_x_fix.h should be included before any of the X11/Motif headers */
-#include
-#undef XtDisplay
-#undef XtScreen
-#undef XtWindow
-#undef XtIsRealized
-#undef XtParent
-#undef XtClass
-#endif
-
-/* get XmVersion definition */
-#include
-
-#if (XmVersion < 2000)
-
-#include
-#include
-#include
-#include
-#ifdef VMS /* Huch, wo gibt's denn noch sowas ... ?! */
- /* Bitte keine Mail bzgl. dieser Bemerkung schicken...
- * Ich weiss, das ist ein Vorurteil...aber es gibt
- * ja auch wahre Vorurteile....
- */
-#include
-#else
-#include
-#endif
-#include
-#include
-#include
-#include
-
-#include
-#include /* define toupper */
-#include "combop.h"
-
-#include
-
-/* --- Systemspezifische Definitionen */
-#if defined(VMS)
-#define strcasecmp(s1, s2) strcmp(s1, s2)
-#endif
-
-/* --- sonstiger Quark */
-/* #ifdef DEBUG */
-#if 0
-#define LOG(p1) fprintf(stderr, p1);
-#define LOG2(p1, p2) fprintf(stderr, p1, p2);
-#define LOG3(p1, p2, p3) fprintf(stderr, p1, p2, p3);
-#else
-#define LOG(p1)
-#define LOG2(p1, p2)
-#define LOG3(p1, p2, p3)
-#endif
-
-/* ---------------------------------------------------------------------------
- * Resourcen-Liste...
- * Hier werden diejenigen Resourcen definiert, die von "aussen" - also fuer
- * den Programmierer oder Anwender - benutzbar und veraenderbar sind.
- *
- * Der Aufbau der einzelnen Eintraege ist immer wieder gleich:
- * Resourcen-Name XmN... oder XtN
- * Resourcen-Klasse XmC... oder XtC
- * Resourcen-Type XmR... oder XtR (Datentyp der Variable in der
- * struct der jeweiligen Widgetinstanz)
- * Resourcen-Groesse aktuelle Groesse dieses Datentyps
- * Resourcen-Offset Lage der Variable innerhalb der struct der
- * Widgetinstanz
- * Defaultwert-Type Typ des Defaultwertes
- * Defaultwert (normalerweise) Zeiger auf den Defaultwert
- */
-#define offset(field) XtOffsetOf(XmComboBoxRec, field)
-static XtResource resources[] = {
- { /* Eingabefeld kann veraendert werden, oder aber es sind nur
- * die Vorgaben aus der Liste auswaehlbar.
- */
- XmNeditable, XmCEditable, XmRBoolean, sizeof(Boolean),
- offset(combobox.Editable), XmRString, "False"
- },
- { /* Liste wird automatisch sortiert -- wie konnten die bei
- * der OSF denn SOETWAS nur vergessen ??
- */
- XmNsorted, XmCSorted, XmRBoolean, sizeof(Boolean),
- offset(combobox.Sorted), XmRString, "False"
- },
- { /* externe Sortierreihenfolge */
- XmNsortingCallback, XmCSortingCallback, XmRCallback,
- sizeof(XtCallbackList),
- offset(combobox.SortingCBL), XmRCallback, NULL
- },
- { /* Anzahl auf einmal sichtbarer Eintraege in der Liste (ent-
- * spricht damit der Listenhoehe.
- */
- XmNvisibleItemCount, XmCVisibleItemCount, XmRInt, sizeof(int),
- offset(combobox.VisibleItemCount), XmRImmediate, (caddr_t) 8
- },
- { /* Fuer das Eingabefeld sowie die Liste verwandte Fonts */
- XmNfontList, XmCFontList, XmRFontList, sizeof(XmFontList),
- offset(combobox.Font), XmRImmediate, NULL
- },
- { /* Rueckruf bei Anwahl */
- XmNselectionCallback, XmCSelectionCallback, XmRCallback,
- sizeof(XtCallbackList),
- offset(combobox.SelectionCBL), XmRCallback, NULL
- },
- { /* Gegenteil zum vorherigen Callback! */
- XmNunselectionCallback, XmCUnselectionCallback, XmRCallback,
- sizeof(XtCallbackList),
- offset(combobox.UnselectionCBL), XmRCallback, NULL
- },
- { /* Doppelklick in der Liste */
- XmNdefaultActionCallback, XmCCallback, XmRCallback,
- sizeof(XtCallbackList),
- offset(combobox.DefaultActionCBL), XmRCallback, NULL
- },
- { /* Rueckruf bei Liste ausklappen/verstecken */
- XmNdropDownCallback, XmCDropDownCallback, XmRCallback,
- sizeof(XtCallbackList),
- offset(combobox.DropDownCBL), XmRCallback, NULL
- },
- { /* Eingabe abchecken... */
- XmNmodifyVerifyCallback, XmCCallback, XmRCallback,
- sizeof(XtCallbackList),
- offset(combobox.ModifyVerifyCBL), XmRCallback, NULL
- },
- {
- XmNvalueChangedCallback, XmCCallback, XmRCallback,
- sizeof(XtCallbackList),
- offset(combobox.ValueChangedCBL), XmRCallback, NULL
- },
- {
- XmNactivateCallback, XmCCallback, XmRCallback,
- sizeof(XtCallbackList),
- offset(combobox.ActivateCBL), XmRCallback, NULL
- },
- {
- XmNmotionVerifyCallback, XmCCallback, XmRCallback,
- sizeof(XtCallbackList),
- offset(combobox.MotionVerifyCBL), XmRCallback, NULL
- },
- { /* Verhalten der ausgeklappten Liste bei Focus-Out */
- XmNpersistentDropDown, XmCPersistentDropDown, XmRBoolean,
- sizeof(Boolean),
- offset(combobox.Persistent), XmRString, "False"
- },
- { /* Wie verhaelt sich der Window-Manager? */
- XmNtwmHandlingOn, XmCTwmHandlingOn, XmRBoolean, sizeof(Boolean),
- offset(combobox.TwmHandlingOn), XmRString, "False"
- },
- { /* Label anzeigen oder nicht? */
- XmNshowLabel, XmCShowLabel, XmRBoolean, sizeof(Boolean),
- offset(combobox.ShowLabel), XmRString, "False"
- },
- { /* Abstand zw. linkem Rand Eingabefeld und linkem Rand Liste */
- XmNdropDownOffset, XmCDropDownOffset, XmRPosition,
- sizeof(Position), offset(combobox.DropDownOffset),
- XmRImmediate, (caddr_t) -1
- },
- { /* Neue Voreinstellung bzgl. des Randes */
- XmNborderWidth, XmCBorderWidth, XmRDimension, sizeof(Dimension),
- offset(core.border_width), XmRImmediate, (caddr_t) 0
- },
- { /* welcher Cursor soll in der Dropdown-Liste benutzt werden? */
- XmNdropDownCursor, XmCDropDownCursor, XmRCursor, sizeof(Cursor),
- offset(combobox.ArrowCursor), XmRString, "center_ptr"
- },
- { /* wie lassen sich Eintraege auswaehlen? */
- XmNselectionPolicy, XmCSelectionPolicy, XmRSelectionPolicy, sizeof(unsigned char),
- offset(combobox.SelectionPolicy), XmRImmediate, (caddr_t) XmBROWSE_SELECT
- },
- { /* Wann werden die Callbacks aufgerufen? */
- XmNautomaticSelection, XmCAutomaticSelection, XmRBoolean, sizeof(Boolean),
- offset(combobox.AutomaticSelection), XmRString, "False"
- },
- { /* erscheint die Liste staendig? */
- XmNstaticList, XmCStaticList, XmRBoolean, sizeof(Boolean),
- offset(combobox.StaticList), XmRString, "False"
- },
- {
- XmNscrollBarDisplayPolicy, XmCScrollBarDisplayPolicy, XmRScrollBarDisplayPolicy, sizeof(unsigned char),
- offset(combobox.ScrollBarDisplayPolicy), XmRImmediate, (caddr_t) XmAS_NEEDED
- },
- {
- XmNlistSizePolicy, XmCListSizePolicy, XmRListSizePolicy, sizeof(unsigned char),
- offset(combobox.ListSizePolicy), XmRImmediate, (caddr_t) XmVARIABLE
- },
- {
- XmNsquareArrow, XmCSquareArrow, XmRBoolean, sizeof(Boolean),
- offset(combobox.SquareArrow), XmRString, "False"
- },
- {
- XmNarrowSpacingOn, XmCArrowSpacingOn, XmRBoolean, sizeof(Boolean),
- offset(combobox.ArrowSpacingOn), XmRString, "True"
- },
-#ifndef DONT_LOOK_IN_THE_MIRROR
- /* Mirror-Ressourcen, Adressen sind ungueltig!!!! */
- {
- XmNalignment, XmCAlignment, XmRAlignment, sizeof(unsigned char),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNblinkRate, XmCBlinkRate, XmRInt, sizeof(int),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNcolumns, XmCColumns, XmRShort, sizeof(short),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNcursorPosition, XmCCursorPosition, XmRTextPosition, sizeof(XmTextPosition),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNitemCount, XmCItemCount, XmRInt, sizeof(int),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNitems, XmCItems, XmRXmStringTable, sizeof(XmStringTable),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNlabelFontList, XmCLabelFontList, XmRFontList, sizeof(XmFontList),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNlabelInsensitivePixmap, XmCLabelInsensitivePixmap, XmRPixmap, sizeof(Pixmap),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNlabelMarginBottom, XmCLabelMarginBottom, XmRDimension, sizeof(Dimension),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNlabelMarginHeight, XmCLabelMarginHeight, XmRDimension, sizeof(Dimension),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNlabelMarginLeft, XmCLabelMarginLeft, XmRDimension, sizeof(Dimension),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNlabelMarginRight, XmCLabelMarginRight, XmRDimension, sizeof(Dimension),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNlabelMarginTop, XmCLabelMarginTop, XmRDimension, sizeof(Dimension),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNlabelMarginWidth, XmCLabelMarginWidth, XmRDimension, sizeof(Dimension),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNlabelPixmap, XmCLabelPixmap, XmRPixmap, sizeof(Pixmap),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNlabelString, XmCLabelString, XmRString, sizeof(XmString),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNlabelType, XmCLabelType, XmRLabelType, sizeof(unsigned char),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNlistMarginHeight, XmCListMarginHeight, XmRDimension, sizeof(Dimension),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNlistMarginWidth, XmCListMarginWidth, XmRDimension, sizeof(Dimension),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNlistSpacing, XmCListSpacing, XmRDimension, sizeof(Dimension),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNmarginHeight, XmCMarginHeight, XmRDimension, sizeof(Dimension),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNmarginWidth, XmCMarginWidth, XmRDimension, sizeof(Dimension),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNmaxLength, XmCMaxLength, XmRInt, sizeof(int),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNselectThreshold, XmCSelectThreshold, XmRInt, sizeof(int),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNstringDirection, XmCStringDirection, XmRStringDirection, sizeof(XmStringDirection),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNtopItemPosition, XmCTopItemPosition, XmRInt, sizeof(int),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNvalue, XmCValue, XmRString, sizeof(String),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
- {
- XmNvalue, XmCValue, XmRInt, sizeof(int),
- offset(combobox.Dummy), XmRImmediate, (caddr_t) 0
- },
-#endif
-}; /* resources[] */
-
-/* ---------------------------------------------------------------------------
- * Funktions-Prototypen fuer die 'Methoden' des ComboBox-Widgets. Diese
- * 'Methoden' werden vom Xt-Toolkit aufgerufen und sorgen dafuer, dass eine
- * ComboBox sich wie ein anstaendiges Widget verhaelt.
- */
-static void Initialize (Widget, XmComboBoxWidget, ArgList,
- Cardinal *);
-static void Destroy (XmComboBoxWidget);
-static void Resize (XmComboBoxWidget);
-static Boolean SetValues (XmComboBoxWidget, XmComboBoxWidget,
- XmComboBoxWidget, ArgList, Cardinal *);
-static void GetValuesAlmost(XmComboBoxWidget, ArgList, Cardinal *);
-static XtGeometryResult QueryGeometry (XmComboBoxWidget, XtWidgetGeometry *,
- XtWidgetGeometry *);
-static XtGeometryResult GeometryManager(Widget, XtWidgetGeometry *,
- XtWidgetGeometry *);
-static void ClassInit ();
-static void Realize (XmComboBoxWidget, Mask *,
- XSetWindowAttributes *);
-/* ---------------------------------------------------------------------------
- * diverse restliche Prototypen... naja, hier halt etwas mager! Hierbei
- */
-static void ShowHideDropDownList (XmComboBoxWidget w, XEvent *event,
- Boolean Show);
-static void ShellCallback (Widget w, XtPointer cbw,
- XEvent *event, Boolean *ContDispatch);
-static void DoLayout (XmComboBoxWidget w);
-/* --------------------------------------------------------------------
- * Klassen-Definition
- */
-XmComboBoxClassRec xmComboBoxClassRec = {
- { /*** core-Klasse ***/
- /* superclass */ (WidgetClass) &xmManagerClassRec,
- /* class_name */ "XmComboBox",
- /* widget_size */ sizeof(XmComboBoxRec),
- /* class_initialize */ (XtProc) ClassInit,
- /* class_part_initialize */ NULL,
- /* class_inited */ False, /* IMMER mit FALSE initialisieren !! */
- /* initialize */ (XtInitProc) Initialize,
- /* initialize_hook */ NULL,
- /* realize */ (XtRealizeProc) Realize,
- /* actions */ NULL,
- /* num_actions */ 0,
- /* resources */ resources,
- /* num_resources */ XtNumber(resources),
- /* xrm_class */ NULLQUARK,
- /* compress_motion */ True,
- /* compress_exposure */ XtExposeCompressMultiple,
- /* compress_enterleave */ True,
- /* visible_interest */ False,
- /* destroy */ (XtWidgetProc) Destroy,
- /* resize */ (XtWidgetProc) Resize,
- /* expose */ NULL,
- /* set_values */ (XtSetValuesFunc) SetValues,
- /* set_values_hook */ NULL,
- /* set_values_almost */ XtInheritSetValuesAlmost,
- /* get_values_hook */ (XtArgsProc) GetValuesAlmost,
- /* accept_focus */ NULL,
- /* version */ XtVersion,
- /* callback_private */ NULL,
- /* tm_table */ XtInheritTranslations, /* Changed from NULL: Bug #406153 */
- /* query_geometry */ (XtGeometryHandler) QueryGeometry,
- /* display_accelerator */ XtInheritDisplayAccelerator,
- /* extension */ NULL
- },
- { /*** composite-Klasse ***/
- /* geometry_manager */ (XtGeometryHandler) GeometryManager,
- /* change_managed */ XtInheritChangeManaged,
- /* insert_child */ XtInheritInsertChild,
- /* delete_child */ XtInheritDeleteChild,
- /* extension */ NULL
- },
- { /*** constraint-Klasse ***/
- /* resources */ NULL,
- /* num_resources */ 0,
- /* constraint_size */ sizeof(XmManagerConstraintPart),
- /* initialize */ NULL,
- /* destroy */ NULL,
- /* set_values */ NULL,
- /* extension */ NULL
- },
- { /*** xmManager-Klasse ***/
- /* translations */ XtInheritTranslations,
- /* syn_resources */ NULL,
- /* num_syn_resources */ 0,
- /* syn_constraint_resources */ NULL,
- /* num_syn_constraint_resources */ 0,
- /* parent_process */ XmInheritParentProcess,
- /* extension */ NULL
- },
- { /*** combobox-Klasse ***/
- /* */ 0
- }
-}; /* xmComboBoxClassRec */
-WidgetClass xmComboBoxWidgetClass = (WidgetClass) &xmComboBoxClassRec;
-
-/* --------------------------------------------------------------------
- * --------------------------------------------------------------------
- * Translation-Tabelle (hier allerdings fuer das Eingabefeld!)
- * Tjaja....mit der Reihenfolge von Translations ist das schon so eine
- * ziemlich boese Sache!
- */
-static char newEditTranslations[] =
- "AltosfDown: ComboBox-Manager(show-hide-list) \n\
- MetaosfDown: ComboBox-Manager(show-hide-list) \n\
- AltosfUp: ComboBox-Manager(hide-list) \n\
- MetaosfUp: ComboBox-Manager(hide-list) \n\
- osfUp: ComboBox-Manager(up) \n\
- osfDown: ComboBox-Manager(down) \n\
- osfPageUp: ComboBox-Manager(page-up) \n\
- osfPageDown: ComboBox-Manager(page-down) \n\
- osfCancel: ComboBox-Manager(cancel) \n\
- Return: ComboBox-Manager(activate) activate()"
- ;
-/* speziell bei der nicht editierbaren Combo-Box sind noch einige
- * andere Tasten belegt, die sonst dem Eingabefeld alleine gehoeren.
- * Die dazugehoerigen neuen Translations befinden sich in dieser
- * zusaetzlichen Tabelle, das Anhaengsel ...NE ist dabei die Ab-
- * kuerzung fuer "non editable".
- */
-static char newEditTranslationsNE[] =
- "osfDelete: ComboBox-Manager(wipe-out) \n\
- osfBeginLine: ComboBox-Manager(top) \n\
- osfEndLine: ComboBox-Manager(bottom) "
- ;
-/* Momentan gibt es noch Aerger mit dem Drag'n'Drop-Mechanismus
- * von Motif 1.2. Legen wir ihn deshalb erst einmal still, solange
- * bis ich weiss, warum, und eine Loesung parat habe. NEU: Nur wenn
- * Sie mit einer libXm geschlagen sind, die partout nicht funktionieren
- * will, muessen Sie Drag'n'Drop stillegen, ansonsten klappts doch!
- */
-#ifdef NODRAGNDROP
-static char newListTranslations[] =
- ": ComboBox-Manager(no-operation) ";
-#endif
-static char newListTranslationsE[] =
- "osfPageUp: ComboBox-Manager(page-up) \n\
- osfPageDown: ComboBox-Manager(page-down) ";
-
-/* ---------------------------------------------------------------------------
- * ---------------------------------------------------------------------------
- * Aktionen-Tabelle: Hierdurch werden den einzelnen Translations die dazuge-
- * hoerigen C-Routinen zugeordnet. Da wir hier ein anstaendiges ANSI-C be-
- * nutzen, werden hier zuerst einmal die Prototypen faellig... Ach ja, noch
- * ein Hinweis in eigener Sache... der ComboBox-Manager muss applikationsweit
- * registriert werden, da er auch von Translationen in den Kindern der Combo-
- * Box aktiviert wird. Bei diesem Namen der 'Aktion' steht aber nicht zu be-
- * fuerchten, dass er anderweitig bereits in Anwendung ist.
- */
-static void CBoxManager(Widget w, XEvent *event, String *params,
- Cardinal *num_params);
-
-static XtActionsRec actions[] = {
- { "ComboBox-Manager", CBoxManager },
- { NULL, NULL }
-}; /* actions */
-
-
-/* --------------------------------------------------------------------
- * Eine Instanz dieser Widget-Klasse wird erstmalig in Betrieb ge-
- * nommen, daher sind noch Vorbereitungen notwendig, die nun hier
- * durchgefuehrt werden.
- */
-static XtTranslations NewEditTranslations, NewEditTranslationsNE,
-#ifdef NODRAGNDROP
- NewListTranslations,
-#endif
- NewListTranslationsE;
-
-static XtConvertArgRec ConverterScreenConvertArg[] = {
- { XtBaseOffset, (XtPointer) XtOffset(Widget, core.screen),
- sizeof(Screen *) }
-};
-
-static void ClassInit()
-{
- NewEditTranslations =
- XtParseTranslationTable(newEditTranslations);
- NewEditTranslationsNE =
- XtParseTranslationTable(newEditTranslationsNE);
-#ifdef NODRAGNDROP
- NewListTranslations =
- XtParseTranslationTable(newListTranslations);
-#endif
- NewListTranslationsE =
- XtParseTranslationTable(newListTranslationsE);
- XtAddConverter(XtRString, XtRBitmap,
- XmuCvtStringToBitmap,
- ConverterScreenConvertArg,
- XtNumber(ConverterScreenConvertArg));
-} /* ClassInit */
-
-/* ---------------------------------------------------------------------------
- * Weil es sich bei diesem Widget um ein etwas komplizierteres zusammengesetz-
- * tes Widget handelt, muessen wir hier - wo eigentlich nur das die Combobox
- * bildende Fenster auf dem X-Server erzeugt wird - noch einmal das Layout
- * auf Vordermann bringen. Den Aerger loest dabei das Listenfeld der OSF aus,
- * das einfach keine Geometrie-Nachfragen verschickt, solange es nicht
- * 'realized' ist!!! Nicht, dass ich mich ueber so einen Sauhaufen aufregen
- * wuerde...ich doch nicht! ABER MACHT IHR DENN NUR SO'N MIST...? WARUM KOENNT
- * IHR DENN NICHT EINMAL DIESES ****(BIEP)**** MOTIF TOOLKIT ANSTAENDIG
- * DOKUMENTIEREN! Ich glaub', ich kann mich nach dem Chaos eigentlich nur noch
- * hemmungslos besaufen... Die Suche nach der Ursache (bzw. Urheber = OSF) hat
- * mich doch einige Tage gekostet (jaja...die Mannstunden!).
- */
-static void Realize(XmComboBoxWidget w, Mask *ValueMask,
- XSetWindowAttributes *Attributes)
-{
- /*
- * Also: wenn die Liste staendig sichtbar ist, dann zuerst noch einmal
- * das Layout berechnen. Sonst wird vorne und hinten 'was abgeschnitten.
- */
- if ( w->combobox.StaticList )
- DoLayout(w);
- (*w->core.widget_class->core_class.superclass->core_class.realize)
- ((Widget) w, ValueMask, Attributes);
-} /* Realize */
-
-/* ---------------------------------------------------------------------------
- * Suche dasjenige Fenster, in dem unsere Shell liegt, in der wiederum die
- * Combo-Box steckt. Diese Information wird benoetigt, um die Drop-Down-Liste
- * innerhalb des Fensterstacks immer direkt oberhalb der Shell mit der Combo-
- * Box zu halten. Jajaja -- ich muss halt davon ausgehen, dass der Fenster-
- * manager ein sog. "reparenting wm" ist; also die Dekorationen in einem
- * Fenster dargestellt werden und unsere Shell in dieses Fenster hineingepackt
- * ist. Die Dekoration ist damit ein Kind des 'root window' - wie die Shell,
- * in der die Drop-Down-Liste steckt. Und da nur Geschwisterfenster (sibling
- * windows) im gleichen Stapel stecken, reicht das Shellfenster nicht aus.
- * Alle gaengigen Fenstermanager sind solche "reparenting wm's", so dass ich
- * hier zu diesem Trick greifen kann, um die Drop-Down-Liste immer ueber der
- * ComboBox zu halten.
- *
- * Parameter:
- * w Diejenige Combo-Box, fuer die wir dasjenige
- * Fenster des Window-Managers ermitteln sollen,
- * dass direkt unterhalb des Root-Fensters liegt.
- * Ergebnis:
- * besagtes zu suchendes Fenster, dass die Dekoration enthaelt (hoffentlich
- * nur echte Bruesseler Spitze!)
- */
-static Window GetDecorationWindow(XmComboBoxWidget w)
-{
- Window Root, Parent, AWindow;
- Window *Children;
- unsigned int NumChildren;
-
- Parent = XtWindow((Widget) w);
- /* Suche nach dem Dekorationsfenster des Window-Managers */
- do {
- AWindow = Parent;
- XQueryTree(XtDisplay((Widget) w), AWindow,
- &Root, &Parent, &Children, &NumChildren);
- XFree((char *) Children);
- } while ( Parent != Root );
- return AWindow;
-} /* GetDecorationWindow */
-
-/* --------------------------------------------------------------------
- * Eine Combo-Box aus dem Wege raeumen...
- * Momentan muessen wir hier nur den Cursor wieder los werden sowie
- * eventuell reservierte Pixmaps.
- * Ups -- natuerlich muss auch wieder der Callback entfernt werden,
- * der noch an der Shell haengt.
- */
-static void Destroy(XmComboBoxWidget w)
-{
-/* fprintf(stderr, "Destroy: %08X\n", w->core.window);*/
- if ( w->combobox.ConvertBitmapToPixmap )
- XFreePixmap(XtDisplay((Widget) w),
- w->combobox.LabelPixmap);
- if ( w->combobox.ConvertBitmapToPixmapInsensitive )
- XFreePixmap(XtDisplay((Widget) w),
- w->combobox.LabelInsensitivePixmap);
- if ( w->combobox.PendingFocusOut )
- XtRemoveWorkProc(w->combobox.WorkProcID);
- XtRemoveEventHandler(w->combobox.MyNextShell,
- StructureNotifyMask | FocusChangeMask,
- True, (XtEventHandler) ShellCallback,
- (XtPointer) w);
-} /* Destroy */
-
-/* ---------------------------------------------------------------------------
- * Ueberpruefe, ob fuer die Ressource "DropDownOffset" ein gueltiger Wert vom
- * Benutzer angegeben wurde. Diese Ressource gibt an, wie weit die Drop-Down-
- * Liste nach rechts gegenueber dem Eingabefeld eingerueckt sein soll. Wenn
- * hierfuer ein negativer Wert angegeben ist, so berechne statt dessen einen
- * Standardwert: dieser entspricht der Breite der Pfeilschaltflaeche, was
- * optisch ganz gut wirkt (jedenfall nach meinem Dafuerhalten).
- */
-static void CheckDropDownOffset(XmComboBoxWidget w)
-{
- if ( w->combobox.DropDownOffset < 0 ) {
- XtWidgetGeometry ArrowGeom;
-
- XtQueryGeometry(w->combobox.ArrowCtrl, NULL, &ArrowGeom);
- w->combobox.DropDownOffset = ArrowGeom.width;
- }
-} /* CheckDropDownOffset */
-
-/* --------------------------------------------------------------------
- * Berechne die voreinzustellende Groesse, die diese Combo-Box be-
- * sitzen muss, um ausreichenden Raum fuer das Eingabefeld und den
- * Pfeil rechts daneben zur Verfuegung zu stellen. Bei einer
- * editierbaren Combo-Box ist zwischen dem Eingabefeld und dem Pfeil
- * noch ein Angst-Rasen von der halben Breite eines Pfeiles vorhanden.
- * Wird das Listenfeld staendig dargestellt, so entfallen sowohl Pfeil
- * als auch der Angstrasen, dafuer muss aber die Hoehe des Listenfelds
- * beruecksichtigt werden.
- */
-static void DefaultGeometry(XmComboBoxWidget w,
- Dimension *TotalWidth,
- Dimension *TotalHeight,
- Dimension *EditCtrlWidth,
- Dimension *LabelCtrlWidth)
-{
- XtWidgetGeometry EditGeom, ArrowGeom, LabelGeom, ListGeom;
-
- XtQueryGeometry(w->combobox.EditCtrl, NULL, &EditGeom);
- XtQueryGeometry(w->combobox.ArrowCtrl, NULL, &ArrowGeom);
- XtQueryGeometry(w->combobox.LabelCtrl, NULL, &LabelGeom);
-
- /*
- * Soll die Pfeilschaltflaeche quadratisch, praktisch, gut sein?
- */
- if ( w->combobox.SquareArrow )
- ArrowGeom.width = ArrowGeom.height;
- else
- ArrowGeom.width = (ArrowGeom.height * 4) / 5;
-
- /*
- * Zuerst einmal ein paar einfache Werte ermitteln und zurueckgeben...
- */
- *TotalHeight = EditGeom.height;
- *EditCtrlWidth = EditGeom.width;
- *LabelCtrlWidth = LabelGeom.width;
-
- /*
- * Ermittele nun die Breite, welche die Combobox benoetigt. Je nach-
- * dem, ob das Eingabefeld oder die Liste breiter sind, wird der
- * entsprechende Wert genommen. Diese Auswahl zwischen der Breite von
- * Eingabefeld und Liste findet aber nur statt, wenn die Liste auch
- * wirklich staendig sichtbar ist. Waehrend der Initialisierung hat
- * allerdings XmNcolumns, so dass in diesem Moment die List nicht
- * mehr die Breite kontrollieren kann!
- */
- if ( w->combobox.StaticList ) {
- /*
- * Beachte: Frage nicht die Listbox, sondern das ScrolledWindow,
- * in welchem die Liste eingebettet ist.
- */
- CheckDropDownOffset(w);
- XtQueryGeometry(XtParent(w->combobox.ListCtrl), NULL, &ListGeom);
- if ( w->combobox.InInit ) {
- *TotalWidth = EditGeom.width;
- } else {
- if ( EditGeom.width < (Dimension)
- (ListGeom.width + w->combobox.DropDownOffset) )
- *TotalWidth = ListGeom.width + w->combobox.DropDownOffset;
- else
- *TotalWidth = EditGeom.width;
- }
- *TotalHeight += ListGeom.height;
- } else {
- /*
- * Das Listenfeld interessiert uns hier nicht. Degegen sollte noch
- * die Breite fuer den Pfeil und ein evtl. Angstrasen beachtet
- * werden.
- */
- *TotalWidth = EditGeom.width + ArrowGeom.width;
- if ( w->combobox.Editable && w->combobox.ArrowSpacingOn )
- *TotalWidth += ArrowGeom.width/2;
- }
-
- /*
- * Vergiss nicht, auch noch ein evtl. sichtbares Schriftfeld zu berueck-
- * sichtigen!
- */
- if ( w->combobox.ShowLabel )
- *TotalWidth += LabelGeom.width;
-
-} /* DefaultGeometry */
-
-/* --------------------------------------------------------------------
- * Anhand eines Widgets ermittele darueber die Screennummer desjenigen
- * Screens, auf dem das Widget erscheint.
- * Parameter:
- * w betroffenes Widget.
- * Ergebnis:
- * Nummer desjenigen Screens, auf dem das Widget angezeigt wird.
- */
-static int WidgetToScreen(Widget w)
-{
- Screen *screen;
- Display *display;
- int NumScreens, i;
-
- screen = XtScreen(w); NumScreens = ScreenCount(XtDisplay(w));
- display = DisplayOfScreen(screen);
- for ( i = 0; i < NumScreens; ++i )
- if ( ScreenOfDisplay(display, i) == screen )
- return i;
- XtError("WidgetToScreen: data structures are destroyed.");
- return 0; /* to avoid a compiler warning */
-} /* WidgetToScreen */
-
-/* --------------------------------------------------------------------
- * Positioniere die DropDown-Liste (soweit sie natuerlich auch momentan
- * sichtbar ist) so auf dem Bildschirm, dass sie sich unterhalb des
- * Eingabefeldes anschliesst.
- */
-static void DoDropDownLayout(XmComboBoxWidget w)
-{
- Position abs_x, abs_y;
- Dimension ArrowWidth, ListWidth, ListHeight;
- Dimension ScreenHeight, LabelWidth;
- XWindowChanges WindowChanges;
-
- /*
- * etwa nicht sichtbar ?!! Oder etwa immer sichtbar ?!!
- * Dann sind wir jetzt sofort fertig.
- */
- if ( !w->combobox.ListVisible || w->combobox.StaticList ) return;
- /*
- * Finde zuerst einmal heraus, wo wir uns denn auf dem Bildschirm be-
- * finden sollen... Beachte dabei auch, dass eventuell die Liste zu schmal
- * werden koennte und gib' ihr dann ggf. eine Mindestbreite, damit es
- * keinen core-Dump gibt.
- */
- XtVaGetValues(w->combobox.ArrowCtrl, XmNwidth, &ArrowWidth, NULL);
- XtTranslateCoords((Widget) w, 0, w->core.height, &abs_x, &abs_y);
- CheckDropDownOffset(w);
- ListWidth = w->core.width - w->combobox.DropDownOffset - 2;
- abs_x += w->combobox.DropDownOffset;
- if ( w->combobox.ShowLabel ) {
- XtVaGetValues(w->combobox.LabelCtrl, XmNwidth, &LabelWidth, NULL);
- ListWidth -= LabelWidth;
- abs_x += LabelWidth;
- }
- if ( ListWidth < 20 ) ListWidth = 20;
- XtVaGetValues(XtParent(w->combobox.ListCtrl), XmNheight, &ListHeight, NULL);
- /*
- * Hier ueberpruefen wir noch, ob die Liste unten aus dem Bildschirm
- * herausfallen wuerde. In dem Fall klappen wir die Liste oberhalb des
- * Eingabefeldes auf.
- */
- ScreenHeight = DisplayHeight(XtDisplay((Widget) w),
- WidgetToScreen((Widget) w));
- if ( abs_y + ListHeight + 2 > ScreenHeight ) {
- int y;
-
- y = ((int) abs_y) - ListHeight - w->core.height - 1;
- if ( y < 0 ) y = 0;
- abs_y = (Position) y;
- }
- XtConfigureWidget(w->combobox.PopupShell,
- abs_x, abs_y, ListWidth, ListHeight, 1);
- /*
- * So...das hier dient der Kosmetik: hier sorgen wir dafuer, dass die
- * Liste auch wirklich immer direkt ueber der ComboBox innerhalb des
- * Fensterstapels schwebt. Siehe dazu auch die Erlaeuterungen und An-
- * merkungen in GetDecorationWindow().
- */
- if ( XtIsRealized((Widget) w) ) {
- WindowChanges.sibling = GetDecorationWindow(w);
- WindowChanges.stack_mode = Above;
- XReconfigureWMWindow(XtDisplay((Widget) w),
- XtWindow(w->combobox.PopupShell),
- WidgetToScreen(w->combobox.PopupShell),
- CWSibling | CWStackMode, &WindowChanges);
- }
-} /* DoDropDownLayout */
-
-/* --------------------------------------------------------------------
- * Naja... diese Routine scheint ja bereits zu einer Institution beim
- * Schreiben von Composite-Widgets geworden zu sein.
- *
- * Hier beim ComboBox-Widget ist die Aufgabe ziemlich einfach: es
- * genuegt, die Eingabezeile und den Pfeil-Button entsprechend inner-
- * halb des ComboBox-Widgets zu plazieren. Seit allerdings noch das
- * Textlabel hinzukommt, wird's langsam aufwendiger. Nun ja - da sich
- * das Listenfeld wahlweise auch statisch einblenden laesst, ist nun
- * noch mehr zu beruecksichtigen, wenn die Kinder-Widgets an ihre
- * Plaetze geschoben werden.
- */
-static void DoLayout(XmComboBoxWidget w)
-{
- Dimension EditCtrlWidth, ArrowCtrlWidth, LabelCtrlWidth;
- Dimension ComboBoxHeight;
- Dimension BorderWidth;
- Dimension HighlightThickness;
- Position EditX;
-
- XtVaGetValues(w->combobox.ArrowCtrl,
- XmNheight, &ArrowCtrlWidth, NULL);
- if ( !w->combobox.SquareArrow )
- ArrowCtrlWidth = (ArrowCtrlWidth * 4) / 5;
- XtVaGetValues(w->combobox.LabelCtrl,
- XmNwidth, &LabelCtrlWidth, NULL);
-
- /*
- * In Abhaengigkeit davon, ob die ComboBox editierbar ist und ob das
- * Listenfeld staendig sichtbar sein soll, hier die Breite einzelner
- * Widgets bestimmen.
- */
- if ( w->combobox.StaticList ) {
- ComboBoxHeight = w->combobox.EditCtrl->core.height;
- EditCtrlWidth = w->core.width;
- } else {
- ComboBoxHeight = w->core.height;
- EditCtrlWidth = w->core.width - ArrowCtrlWidth;
- if ( w->combobox.Editable && w->combobox.ArrowSpacingOn )
- EditCtrlWidth -= ArrowCtrlWidth/2;
- }
- /* Beruecksichtige noch ein evtl. ebenfalls anzuzeigendes Schriftfeld
- * neben dem Eingabefeld.
- */
- if ( w->combobox.ShowLabel ) {
- EditX = LabelCtrlWidth;
- EditCtrlWidth -= LabelCtrlWidth;
- } else
- EditX = 0;
- if ( EditCtrlWidth < 20 ) EditCtrlWidth = 20;
-/* Plaziere nun das Eingabefeld... */
- XtVaGetValues(w->combobox.EditCtrl,
- XmNborderWidth, &BorderWidth,
- XmNhighlightThickness, &HighlightThickness,
- NULL);
- XtConfigureWidget(w->combobox.EditCtrl,
- EditX, 0,
- EditCtrlWidth, ComboBoxHeight, BorderWidth);
-/* ...und nun den Pfeil... */
- XtVaGetValues(w->combobox.ArrowCtrl,
- XtNborderWidth, &BorderWidth, NULL);
- XtConfigureWidget(w->combobox.ArrowCtrl,
- w->core.width-ArrowCtrlWidth, HighlightThickness,
- ArrowCtrlWidth,
- ComboBoxHeight - 2 * HighlightThickness,
- BorderWidth);
-/* ...und ggf. das Textlabel. */
- if ( w->combobox.ShowLabel ) {
- XtVaGetValues(w->combobox.LabelCtrl,
- XmNborderWidth, &BorderWidth,
- NULL);
- XtConfigureWidget(w->combobox.LabelCtrl,
- 0, 0,
- LabelCtrlWidth, ComboBoxHeight,
- BorderWidth);
- }
-/* Falls da noch die Liste herumgurkt... */
- if ( w->combobox.StaticList ) {
- Dimension Width, Height;
-
- if ( w->core.height > ComboBoxHeight )
- Height = w->core.height - ComboBoxHeight;
- else
- Height = 10;
-
- if ( w->core.width > (Dimension)(ArrowCtrlWidth + EditX) )
- Width = w->core.width - ArrowCtrlWidth - EditX;
- else
- Width = 10;
-
- XtConfigureWidget(XtParent(w->combobox.ListCtrl),
- EditX + ArrowCtrlWidth, ComboBoxHeight, Width, Height, 0);
- } else if ( w->combobox.ListVisible )
- DoDropDownLayout(w);
-} /* DoLayout */
-
-/* --------------------------------------------------------------------
- * Pappi fragt nach, wie gross wir denn sein wollen.
- * Die hier benutzte Vorgehensweise zur Ermittlung der Groesse:
- * Sobald der Vater uns eine Breite (oder aber Hoehe) vorschlaegt,
- * die fuer uns eigentlich zu klein ist, meckern wir und schlagen
- * die von uns benoetigte Breite (Hoehe) vor.
- * Soweit also zur Theorie... leider sieht es beispielsweise das
- * Motif Form-Widget ueberhaupt nicht ein, uns auch nur ein einziges
- * Mal nach unseren Wuenschen zu fragen! Damit es bei derart unum-
- * gaenglichen Widgets dann doch noch geht, muss ChangedManaged die
- * Kohlen wieder aus dem Feuer holen mit einer Sondertour.
- * Parameter:
- * *Request Vom Vater vorgeschlagene Geometrie
- * Ergebnis:
- * *Reply Unsere Antwort auf die vorgeschlagene Geometrie
- * sowie XtGeometryYes oder XtGeometryAlmost, je nachdem, wie gut
- * uns Pappis Vorschlag in den Kram passt.
- */
-static XtGeometryResult QueryGeometry(XmComboBoxWidget w,
- XtWidgetGeometry *Request,
- XtWidgetGeometry *Reply)
-{
- XtGeometryResult result = XtGeometryYes;
- Dimension minW, minH, editW, labelW;
-
-/* Elternteil will nichts weiter aendern, also ist uns das
- * recht so.
- */
- Request->request_mode &= CWWidth | CWHeight;
- if ( Request->request_mode == 0 ) return result;
-
- DefaultGeometry(w, &minW, &minH, &editW, &labelW);
-
-/* Ueberpruefe, ob uns das in der Breite passt, was Pappi moechte... */
- if ( Request->request_mode & CWWidth ) {
- if ( Request->width < minW ) {
-/* Wenn Pappi uns etwas vorschlaegt, was im wahrsten Sinne des Wortes
- * vorn und hinten nicht reicht, dann versuchen wir ihn entsprechend
- * zu korrigieren. ("Versuchen" deshalb, weil er diesen Vorschlag auch
- * voellig ignorieren kann.)
- */
- result = XtGeometryAlmost;
- Reply->width = minW;
- Reply->request_mode |= CWWidth;
- }
- }
-/* Die ganze Chose nun noch vertikal */
- if ( Request->request_mode & CWHeight ) {
- if ( Request->height < minH ) {
- result = XtGeometryAlmost;
- Reply->height = minH;
- Reply->request_mode |= CWHeight;
- }
- }
- return result;
-} /* QueryGeometry */
-
-/* --------------------------------------------------------------------
- * Die Groesse des ComboBox-Widgets hat sich veraendert und deshalb
- * mussen alle Kinder neu positioniert werden.
- * Letzten Endes laeuft hier alles auf ein ordinaeres DoLayout()
- * hinaus, um die Kinder umher zu schieben.
- * Parameter:
- * w Die bereits hinlaenglich bekannte Instanz dieses
- * Widgets
- */
-static void Resize(XmComboBoxWidget w)
-{
- DoLayout(w);
-} /* Resize */
-
-/* --------------------------------------------------------------------
- * Dieses Widget hat sich in irgendeiner Form bewegt (und das nicht
- * nur relativ zum Vater, sondern moeglicherweise auch der Vater
- * selbst!) bzw. die Shell, in der sich irgendwo unsere Combo-Box
- * befindet, hat soeben den Fokus verschusselt und kann ihn nicht
- * mehr wiederfinden. Daneben kann es auch sein, dass die Shell
- * ikonisiert wurde. (Welch' Vielfalt! Dieses ist hier halt eine
- * multifunktionale Routine.)
- *
- * Parameter:
- * w Die naechste Shell in Reichweite ueber unserer
- * Combo-Box.
- * cbw Diese Combo-Box.
- * event ^ auf den Event, enthaelt genauerere Informationen
- * (naja... sieht so aus, als ob Motif hier auch
- * schon 'mal Schrott 'reinpackt...)
- * ContDispatch Auf True setzen, damit dieser Event noch weiter-
- * gereicht wird an all' die anderen, die auch noch
- * mithoeren.
- */
-static void ShellCallback(Widget w, XtPointer pClientData,
- XEvent *event, Boolean *ContDispatch)
-{
- XmComboBoxWidget cbw = (XmComboBoxWidget) pClientData;
-
- switch ( event->type ) {
- case ConfigureNotify:
- case CirculateNotify:
- DoDropDownLayout((XmComboBoxWidget) cbw);
- break;
- case FocusOut:
- LOG3("ShellCallback: FocusOut, mode: %i, detail: %i\n",
- (int)event->xfocus.mode, (int)event->xfocus.detail);
- if ( cbw->combobox.Persistent )
- cbw->combobox.IgnoreFocusOut = True;
- else if ( (event->xfocus.mode == NotifyGrab) &&
- cbw->combobox.ListVisible )
- cbw->combobox.IgnoreFocusOut = True;
- break;
- case UnmapNotify:
- ShowHideDropDownList((XmComboBoxWidget) cbw,
- event, False);
- break;
- }
- *ContDispatch = True;
-} /* ShellCallback */
-
-/* --------------------------------------------------------------------
- * Diese Routine sorgt dafuer, dass die Liste nicht irrtuemlich bei
- * manchen Window Managern vom Bildschirm genommen wird, bloss weil
- * diese der OverrideShell den Tastaturfocus schenken bzw. diesen
- * dem Combo-Box-Widget wegnehmen, sobald der Mauszeiger in die Liste
- * bewegt wird.
- */
-static void OverrideShellCallback(Widget w, XtPointer pClientData,
- XEvent *event, Boolean *ContDispatch)
-
-{
- XmComboBoxWidget cbw = (XmComboBoxWidget) pClientData;
- switch ( event->type ) {
- case EnterNotify:
- LOG2("OverrideShellCallback: EnterNotify, PendingFO: %s\n",
- cbw->combobox.PendingFocusOut ? "True" : "False");
- if ( cbw->combobox.PendingFocusOut )
- cbw->combobox.IgnoreFocusOut = True;
- if ( cbw->combobox.TwmHandlingOn )
- cbw->combobox.PendingOverrideInOut = True;
- break;
- case LeaveNotify:
- LOG("OverrideShellCallback: LeaveNotify\n");
- if ( cbw->combobox.TwmHandlingOn )
- cbw->combobox.PendingOverrideInOut = True;
- break;
- }
-} /* OverrideShellCallback */
-
-/* --------------------------------------------------------------------
- * Ha! Anscheinend kann man das Problem mit der einklappenden Liste,
- * sobald man den Arrow-Button anklickt, doch loesen! Allerdings geht
- * das auch nur von hinten durch die Brust in's Auge. Hier war die
- * Reihenfolge der Events bislang das Problem: Klickt man den Arrow-
- * Button an, so verliert das Eingabefeld den Focus, dann wird leider
- * schon die WorkProc aktiviert und laesst die Liste verschwinden.
- * Danach erst kommt der Arrow-Button-Callback an die Reihe. Um dieses
- * Dilemma doch noch zu loesen, wird hier darauf gelauert, wann und
- * welcher LeaveNotify kommt. Klickt der Benutzer den Pfeil an, so
- * kommt hier noch rechtzeitig ein LeaveNotify vorbei, der aber durch
- * einen Grab ausgeloest wurde. Und das ist eben nur beim Anklicken
- * der Fall. Damit wissen wir, das der FocusOut getrost ignoriert
- * werden darf.
- * Puhhh -- ist das ein kompliziertes Chaos.
- * Uebrigends...auch wenn manche Befehle zuerst ueberfluessig er-
- * scheinen...sie sind erforderlich, damit die ComboBox auch mit unter-
- * schiedlichen Window Managern zurechtkommt!
- */
-static void ArrowCrossingCallback(Widget w, XtPointer pClientData,
- XEvent *event, Boolean *ContDispatch)
-
-{
- XmComboBoxWidget cbw = (XmComboBoxWidget) pClientData;
- switch ( event->type ) {
- case LeaveNotify:
- LOG2("ArrowCrossingCallback: LeaveNotify, mode: %i\n",
- event->xcrossing.mode);
- if ( event->xcrossing.mode == NotifyGrab )
- cbw->combobox.IgnoreFocusOut = True;
- else
- cbw->combobox.IgnoreFocusOut = False;
- break;
- }
-} /* ArrowCrossingCallback */
-
-/* --------------------------------------------------------------------
- * Alle Hilfeaufrufe innerhalb der Kinder gehen an das eigentliche
- * Combo-Box-Widget weiter, so dass auch hier nach aussen hin die
- * Kinder-Widgets nicht in Erscheinung treten.
- */
-static void HelpCallback(Widget w, XtPointer cbw, XtPointer CallData)
-{
- XtCallCallbacks((Widget) cbw, XmNhelpCallback, CallData);
-} /* HelpCallback */
-
-/* --------------------------------------------------------------------
- * Wenn der Benutzer im Eingabefeld osfActivate drueckt, dann dieses
- * Ereignis offiziell bekanntgeben.
- */
-static void ActivateCallback(Widget w, XtPointer cbw, XtPointer CallData)
-{
- XtCallCallbacks((Widget) cbw, XmNactivateCallback, CallData);
-} /* ActivateCallback */
-
-/* --------------------------------------------------------------------
- * Ein Kind moechte sein Groesse veraendern und fragt deshalb hier bei
- * uns an.
- * Parameter:
- * w Naja...
- * *Request Vorschlag des Kindes
- * Ergebnis:
- * *Reply Unsere Antwort darauf
- * XtGeometryNo, da es uns bislang grundsaetzlich nie passt, es sei
- * denn, es ist das Label... Naja, jetzt darf auch schon einmal das
- * Listenfeld quengeln (aber nur, wenn es staendig sichtbar ist,
- * ansonsten wird es nicht beruecksichtigt!).
- */
-static XtGeometryResult GeometryManager(Widget w,
- XtWidgetGeometry *Request,
- XtWidgetGeometry *Reply)
-{
- XmComboBoxWidget cbw = (XmComboBoxWidget) XtParent(w);
- XtGeometryResult Result = XtGeometryNo;
-
- /*
- * Falls das Listenfeld statisch dargestellt wird, muessen wir seine
- * Wuensche doch beruecksichtigen. Was fuer ein Aufwand...
- */
- if ( (w == XtParent(cbw->combobox.ListCtrl)) && cbw->combobox.StaticList ) {
- Dimension TotalWidth, TotalHeight, EditWidth, LabelWidth;
- XtWidgetGeometry MyRequest, YourReply, EditGeom;
-
- XtQueryGeometry(cbw->combobox.EditCtrl, NULL, &EditGeom);
- DefaultGeometry(cbw, &TotalWidth, &TotalHeight,
- &EditWidth, &LabelWidth);
- CheckDropDownOffset(cbw);
-
- if ( Request->request_mode && CWWidth )
- if ( (Dimension)(LabelWidth + cbw->combobox.DropDownOffset +
- Request->width) > TotalWidth )
- TotalWidth = LabelWidth + cbw->combobox.DropDownOffset +
- Request->width;
-
- if ( Request->request_mode && CWHeight )
- TotalHeight = EditGeom.height + Request->height;
- /*
- * Bastele nun eine Anfrage an Pappi zusammen und geh' ihm damit auf den
- * Keks. Wenn er zustimmt, ist sofort alles gut, wir muessen dann nur
- * noch das Layout aufpolieren, damit das Listenfeld die neue Groesse
- * bekommt. Wenn Pappi nur halb zustimmt, akzeptieren wir das und fragen
- * ihn damit noch einmal....
- */
- MyRequest.request_mode = CWWidth | CWHeight;
- MyRequest.width = TotalWidth;
- MyRequest.height = TotalHeight;
- Result = XtMakeGeometryRequest((Widget) cbw, &MyRequest, &YourReply);
- if ( Result == XtGeometryAlmost ) {
- MyRequest.width = YourReply.width;
- MyRequest.height = YourReply.height;
- Result = XtMakeGeometryRequest((Widget) cbw, &MyRequest, &YourReply);
- }
- if ( Result == XtGeometryYes )
- DoLayout(cbw);
- } else
- /*
- * Ansonsten darf nur noch das Schriftfeld Ansprueche anmelden.
- */
- if ( w != cbw->combobox.LabelCtrl )
- return XtGeometryNo; /* Was ICH hier vorgegeben habe, gilt! */
- else if ( cbw->combobox.ShowLabel ) { /* Naja, 'mal schauen! */
- Dimension TotalWidth, TotalHeight, EditWidth, LabelWidth;
- XtWidgetGeometry MyRequest;
-
- if ( Request->request_mode & CWWidth ) {
- DefaultGeometry(cbw, &TotalWidth, &TotalHeight,
- &EditWidth, &LabelWidth);
- TotalWidth = TotalWidth - LabelWidth +
- Request->width;
-
- MyRequest.request_mode = CWWidth;
- MyRequest.width = TotalWidth;
- Result = XtMakeGeometryRequest((Widget) cbw, &MyRequest, NULL);
-
- if ( Result == XtGeometryYes )
- DoLayout(cbw);
- }
- }
- return Result;
-} /* GeometryManager */
-
-/* --------------------------------------------------------------------
- * Hier werden auf Wunsch diejenigen Farben, die bei der Combo-Box neu
- * gesetzt wurden, an alle Kinder weitergegeben.
- */
-#define BOTTOMSHADOWCOLOR 0x0001
-#define TOPSHADOWCOLOR 0x0002
-#define FOREGROUND 0x0004
-#define BACKGROUND 0x0008
-
-static struct { String Resource; int Flag; }
- ColorResources[] = {
- { XmNbottomShadowColor, BOTTOMSHADOWCOLOR },
- { XmNtopShadowColor, TOPSHADOWCOLOR },
- { XmNforeground, FOREGROUND },
- { XmNbackground, BACKGROUND }
- };
-
-static int UpdateColors(XmComboBoxWidget w, int flags)
-{
- Pixel Color, White, Black, EditCol;
- int i, size = XtNumber(ColorResources);
- Widget ScrolledWin, ScrollBar;
-
- ScrolledWin = XtParent(w->combobox.ListCtrl);
- XtVaGetValues(ScrolledWin, XmNverticalScrollBar, &ScrollBar, NULL);
- White = WhitePixel(XtDisplay(w), WidgetToScreen((Widget) w));
- Black = BlackPixel(XtDisplay(w), WidgetToScreen((Widget) w));
- for ( i=0; icombobox.ListCtrl,
- ColorResources[i].Resource, EditCol, NULL);
- XtVaSetValues(w->combobox.EditCtrl,
- ColorResources[i].Resource, EditCol, NULL);
- XtVaSetValues(ScrolledWin,
- ColorResources[i].Resource, Color, NULL);
- XtVaSetValues(w->combobox.LabelCtrl,
- ColorResources[i].Resource, Color, NULL);
- XtVaSetValues(w->combobox.ArrowCtrl,
- ColorResources[i].Resource, Color, NULL);
- if ( ColorResources[i].Flag & BACKGROUND )
- XtVaSetValues(ScrollBar, XmNtroughColor, Color, NULL);
- }
-
- return 1;
-} /* UpdateColors */
-
-/* --------------------------------------------------------------------
- * Liste aller vorgespiegelten Resourcen, die automatisch verarbeitet
- * werden koennen, ohne weiter darueber nachdenken zu muessen...
- */
-typedef enum { EDITCTRL, LISTCTRL, LABELCTRL } CHILDCTRL;
-typedef enum { RO, RW, RWS, RWL, RWI, RWIGNORE } aUniqueName;
-typedef struct {
- String rsc;
- CHILDCTRL ctrl;
-/* enum { RO, RW, RWS, RWL, RWI, RWIGNORE } dir; */
- aUniqueName dir;
- /* nur lesen, lesen&schreiben, lesen&schreiben spezial,
- lesen&schreiben label, lesen&schreiben items */
-} MIRROR;
-
-/* Alle mit !!! gekennzeichneten Eintraege werden auf die richtigen
- * Namen des entsprechenden Widgets umgesetzt.
- */
-static MIRROR MirroredResources[] = {
- { XmNitems, LISTCTRL, RWI }, /* Urgs! */
- { XmNitemCount, LISTCTRL, RWIGNORE }, /* dto. */
- { XmNlistMarginHeight, LISTCTRL, RW },
- { XmNlistMarginWidth, LISTCTRL, RW },
- { XmNlistSpacing, LISTCTRL, RW },
- { XmNstringDirection, LISTCTRL, RO }, /* Naja? */
- { XmNtopItemPosition, LISTCTRL, RO },
-
- { XmNblinkRate, EDITCTRL, RW },
- { XmNcolumns, EDITCTRL, RW },
- { XmNcursorPosition, EDITCTRL, RW },
- { XmNcursorPositionVisible, EDITCTRL, RW },
- { XmNmarginHeight, EDITCTRL, RW },
- { XmNmarginWidth, EDITCTRL, RW },
- { XmNmaxLength, EDITCTRL, RW },
- { XmNselectThreshold, EDITCTRL, RW },
- { XmNvalue, EDITCTRL, RWS },
-
- { XmNalignment, LABELCTRL, RW },
- { XmNmnemonic, LABELCTRL, RW },
- { XmNmnemonicCharSet, LABELCTRL, RW },
- { XmNlabelPixmap, LABELCTRL, RW },
- { XmNlabelInsensitivePixmap, LABELCTRL, RW },
- { XmNlabelString, LABELCTRL, RW },
- { XmNlabelType, LABELCTRL, RW },
- { XmNlabelMarginBottom, LABELCTRL, RWL }, /* !!! */
- { XmNlabelMarginHeight, LABELCTRL, RWL }, /* !!! */
- { XmNlabelMarginLeft, LABELCTRL, RWL }, /* !!! */
- { XmNlabelMarginRight, LABELCTRL, RWL }, /* !!! */
- { XmNlabelMarginTop, LABELCTRL, RWL }, /* !!! */
- { XmNlabelMarginWidth, LABELCTRL, RWL }, /* !!! */
- { XmNlabelFontList, LABELCTRL, RWL }, /* !!! */
-};
-
-typedef struct {
- char *from, *to;
-} TRANSFORMATION;
-static TRANSFORMATION Transformations[] = {
- { XmNlabelMarginBottom, XmNmarginBottom },
- { XmNlabelMarginHeight, XmNmarginHeight },
- { XmNlabelMarginLeft, XmNmarginLeft },
- { XmNlabelMarginRight, XmNmarginRight },
- { XmNlabelMarginTop, XmNmarginTop },
- { XmNlabelMarginWidth, XmNmarginWidth },
- { XmNlabelFontList, XmNfontList },
-};
-
-/* --------------------------------------------------------------------
- * Sobald irgendeine Resource veraendert wird, erfolgt der Aufruf
- * hierin als Benachrichtigung, einmal nach dem rechten zu sehen.
- * Parameter:
- * current Kopie der Widget-Instanz, bevor irgendwelche
- * Resourcen veraendert oder set_values()-Methoden
- * aufgerufen wurden.
- * req Kopie der Widget-Instanz, aber bereits mit den
- * durch XtSetValues veraenderten Werten
- * new aktuellster Zustand der Widget-Instanz mit
- * veraenderten Werten (entweder durch XtSetValues
- * oder set_values()-Methoden der Superklasse)
- * args Argumentenliste beim Aufruf von XtSetValues()
- * NumArgs Anzahl der Argumente in der Liste
- * Ergebnis:
- * True, falls Widget neu gezeichnet werden soll.
- */
-static Boolean SetValues(XmComboBoxWidget current, XmComboBoxWidget req,
- XmComboBoxWidget newW,
- ArgList args, Cardinal *NumArgs)
-{
- Boolean Update = False;
- int i, j, MirrorSize = XtNumber(MirroredResources);
- int k, TransformationSize = XtNumber(Transformations);
- Arg arg;
- int Flags;
-
-/*
- * Alle Resourcen, die nicht mehr nach dem Erstellen der Widget-Instanz
- * veraendert werden koennen.
- */
- newW->combobox.Editable = current->combobox.Editable;
- newW->combobox.ListCtrl = current->combobox.ListCtrl;
- newW->combobox.EditCtrl = current->combobox.EditCtrl;
- newW->combobox.LabelCtrl = current->combobox.LabelCtrl;
- newW->combobox.SelectionPolicy = current->combobox.SelectionPolicy;
- newW->combobox.ListSizePolicy = current->combobox.ListSizePolicy;
- newW->combobox.StaticList = current->combobox.StaticList;
-
-/*
- * Kontrolliere nun alle Resourcen, die sich veraendert haben koennten
- * und gebe die neuen Einstellungen entsprechend weiter...
- *
- * Hat sich der Sensitive-Zustand veraendert? Dann muessen wir hier dafuer
- * sorgen, dass alle Kinder ebenfalls den neuen Zustand annehmen.
- */
- if ( current->core.sensitive != newW->core.sensitive ) {
- XtSetSensitive(newW->combobox.ListCtrl, newW->core.sensitive);
- XtSetSensitive(newW->combobox.EditCtrl, newW->core.sensitive);
- XtSetSensitive(newW->combobox.ArrowCtrl, newW->core.sensitive);
- XtSetSensitive(newW->combobox.ListCtrl, newW->core.sensitive);
- if ( !newW->core.sensitive )
- ShowHideDropDownList(newW, NULL, False);
- }
-/*
- * Die ScrollBarPolicy kann nur dann geaendert werden, wenn das Listenfeld
- * dauerhaft dargestellt wird.
- */
- if ( newW->combobox.ScrollBarDisplayPolicy !=
- current->combobox.ScrollBarDisplayPolicy ) {
- if ( newW->combobox.StaticList )
- XtVaSetValues(newW->combobox.ListCtrl,
- XmNscrollBarDisplayPolicy, newW->combobox.ScrollBarDisplayPolicy,
- NULL);
- else
- XtWarning(
-"XmComboBox: ScrollBarDisplayPolicy can not be changed when StaticList == False."
-);
- }
-/* Anzahl der in der Liste gleichzeitig darstellbaren Eintraege */
- if ( current->combobox.VisibleItemCount !=
- newW->combobox.VisibleItemCount ) {
- XtVaSetValues(newW->combobox.ListCtrl,
- XmNvisibleItemCount, newW->combobox.VisibleItemCount,
- NULL);
- Update = True;
- }
- if ( current->combobox.AutomaticSelection !=
- newW->combobox.AutomaticSelection ) {
- XtVaSetValues(newW->combobox.ListCtrl,
- XmNautomaticSelection, newW->combobox.AutomaticSelection,
- NULL);
- }
-/*
- * benutzter Font: hier erhalten Liste und Eingabefeld jeweils die
- * gleiche Fontliste, wohingegen das Label getrennt behandelt wird.
- * Das macht auch Sinn, denn Liste und Eingabefeld beinhalten gleich-
- * artigen Text, so dass hier auch tunlichst der gleiche Font zu
- * benutzen ist.
- */
- if ( current->combobox.Font != newW->combobox.Font ) {
- XtVaSetValues(newW->combobox.ListCtrl,
- XmNfontList, newW->combobox.Font, NULL);
- XtVaSetValues(newW->combobox.EditCtrl,
- XmNfontList, newW->combobox.Font, NULL);
- Update = True;
- }
-
- Flags = 0;
- if ( newW->manager.top_shadow_color !=
- current->manager.top_shadow_color ) Flags |= TOPSHADOWCOLOR;
- if ( newW->manager.bottom_shadow_color !=
- current->manager.bottom_shadow_color ) Flags |= BOTTOMSHADOWCOLOR;
- if ( newW->manager.foreground !=
- current->manager.foreground ) Flags |= FOREGROUND;
- if ( newW->core.background_pixel !=
- current->core.background_pixel ) Flags |= BACKGROUND;
- if ( Flags ) { UpdateColors(newW, Flags); Update = True; }
-
-
- if ( newW->combobox.ArrowCursor != current->combobox.ArrowCursor ) {
- if ( newW->combobox.ListVisible )
- XDefineCursor(XtDisplay(newW->combobox.PopupShell),
- XtWindow(newW->combobox.PopupShell),
- newW->combobox.ArrowCursor);
- }
-/* Hier werden die vorgespiegelten Resourcen verwaltet, die in
- * Wirklichkeit zu einem unserer Kinder gehoeren.
- */
- for ( i = 0; i < *NumArgs; i++ ) {
-/* Ist es eine vorgespiegelte Resource ? Wenn ja, dann leite die
- * Anfrage an das entsprechende Kind-Widget weiter.
- */
- for ( j = 0; j < MirrorSize; j++ ) {
- if ( (strcmp(args[i].name, MirroredResources[j].rsc) == 0) ) {
- switch ( MirroredResources[j].dir ) {
- case RW: /* schreibender Zugriff erlaubt */
- XtSetValues(MirroredResources[j].ctrl == LISTCTRL ?
- newW->combobox.ListCtrl :
- (MirroredResources[j].ctrl == EDITCTRL ?
- newW->combobox.EditCtrl :
- newW->combobox.LabelCtrl),
- &(args[i]), 1);
- break;
- case RWS: /* schreibender Zugriff unter Kontrolle */
- if ( strcmp(args[i].name, XmNvalue) == 0 ) {
- if ( newW->combobox.Editable )
- XtSetValues(newW->combobox.EditCtrl,
- &(args[i]), 1);
- }
- break;
- case RWL: /* Transformation in andere Resource beim
- Label-Widget */
- for ( k = 0; k < TransformationSize; k++ )
- if ( strcmp(args[i].name, Transformations[k].from) == 0 ) {
- arg.value = args[i].value;
- arg.name = Transformations[k].to;
- XtSetValues(newW->combobox.LabelCtrl,
- &arg, 1);
- break;
- }
- break;
- case RWIGNORE: /* Zugriff auf XmNitemCount */
- /* Wird von XmNitems erledigt! */
- break;
- case RWI: /* Zugriff auf XmNitems */
- for ( k = 0; k < *NumArgs; k++ )
- if ( strcmp(args[k].name, XmNitemCount) == 0 ) {
- Arg MyArgs[2];
-
- MyArgs[0].name = XmNitems;
- MyArgs[0].value = args[i].value;
- MyArgs[1].name = XmNitemCount;
- MyArgs[1].value = args[k].value;
- XtSetValues(newW->combobox.ListCtrl,
- args, 2);
- /*XtVaSetValues(newW->combobox.ListCtrl,
- XmNitems, args[i].value,
- XmNitemCount, args[k].value,
- NULL);*/
- break;
- }
- break;
- case RO:
- break;
- } /* case write mode */
- goto ScanForNextResource;
- } /* if entry found */
- } /* for every mirrored entry */
- ScanForNextResource: ;
- } /* for every Arg */
-
- if ( (newW->combobox.SquareArrow != current->combobox.SquareArrow) ||
- (newW->combobox.ArrowSpacingOn != current->combobox.ArrowSpacingOn) ) {
- Update = False;
- DoLayout(newW);
- }
-
- return Update;
-} /* SetValues */
-
-/* --------------------------------------------------------------------
- * Werden irgendwelche Resourcen abgefragt, so muessen wir hier erst
- * noch vor der Rueckkehr zum Frager klaeren, ob davon eine Resource
- * betroffen ist, die nur vorgespiegelt ist, da sie eigentlich einem
- * der Widgets gehoert, die von uns hier verwaltet werden, um daraus
- * eine ordentliche Combo-Box zu machen.
- * Parameter:
- * w Widget-Instanz
- * args Abgefragte Resourcen
- * NumArgs Anzahl der abgefragten Resourcen
- */
-static void GetValuesAlmost(XmComboBoxWidget w, ArgList args,
- Cardinal *NumArgs)
-{
- int i, j, MirrorSize = XtNumber(MirroredResources);
- int k, TransformationSize = XtNumber(Transformations);
- Arg arg;
-
- for ( i = 0; i < *NumArgs; i++ ) {
-/* Ist es eine vorgespiegelte Resource ? Wenn ja, dann leite die
- * Anfrage an das entsprechende Kind-Widget weiter.
- */
- for ( j = 0; j < MirrorSize; j++ ) {
- if ( strcmp(args[i].name, MirroredResources[j].rsc) == 0 ) {
- switch ( MirroredResources[j].dir ) {
- case RO:
- case RW:
- case RWS:
- case RWI:
- XtGetValues(MirroredResources[j].ctrl == LISTCTRL ?
- w->combobox.ListCtrl :
- MirroredResources[j].ctrl == EDITCTRL ?
- w->combobox.EditCtrl :
- w->combobox.LabelCtrl,
- &(args[i]), 1);
- break;
- case RWL: /* Umzuleitende Resource bei Label-Widget */
- for ( k = 0; k < TransformationSize; k++ )
- if ( strcmp(args[i].name, Transformations[k].from) == 0 ) {
- arg.value = args[i].value;
- arg.name = Transformations[k].to;
- XtGetValues(w->combobox.LabelCtrl,
- (ArgList) &arg, 1);
- break;
- }
- break;
- case RWIGNORE:
- ;
- } /* case read mode */
- } /* if entry found */
- } /* for every mirrored entry */
- } /* for every Arg */
-} /* GetValuesAlmost */
-
-/* --------------------------------------------------------------------
- * Zeige beziehungsweise verstecke die Drop-Down-Liste der Combo-Box.
- * Falls die Liste bereits den entsprechenden Zustand hat, geht's
- * sofort zum Aufrufer zurueck.
- * Parameter:
- * w Her Royal Majesty ComboBox
- * Show True, falls anzuzeigen, andernfalls False
- */
-static void ShowHideDropDownList(XmComboBoxWidget w, XEvent *event,
- Boolean Show)
-{
- XmComboBoxDropDownCallbackStruct info;
-
- if ( w->combobox.StaticList ||
- (Show == w->combobox.ListVisible) ) return;
- w->combobox.ListVisible = Show;
- if ( Show ) { /* Klapp' die Liste aus! */
- DoDropDownLayout(w);
- info.reason = XmCR_SHOW_LIST;
- info.event = event;
- XtCallCallbacks((Widget) w, XmNdropDownCallback,
- (XtPointer) &info);
- XDefineCursor(XtDisplay(w->combobox.PopupShell),
- XtWindow(w->combobox.PopupShell),
- w->combobox.ArrowCursor);
- XtPopup(w->combobox.PopupShell, XtGrabNone);
- XtVaSetValues(w->combobox.ArrowCtrl,
- XmNarrowDirection, XmARROW_UP, NULL);
- } else { /* Klapp' die Liste wieder ein... */
- XtPopdown(w->combobox.PopupShell);
- XtVaSetValues(w->combobox.ArrowCtrl,
- XmNarrowDirection, XmARROW_DOWN, NULL);
- info.reason = XmCR_HIDE_LIST;
- info.event = event;
- XtCallCallbacks((Widget) w, XmNdropDownCallback,
- (XtPointer) &info);
- }
-} /* ShowHideDropDownList */
-
-/* --------------------------------------------------------------------
- * Hier laeuft die Nachricht auf, dass der Pfeil ausgeloest wurde...
- * (Daraufhin sollte die Liste aus- oder eingeklappt werden)
- * ...oder dass der Benutzer da draussen auf der anderen Seite der
- * Mattscheibe den Pfeil bereits anklickte ohne aber bereits losge-
- * gelassen zu haben. Bereits hier bekommt das Eingabefeld den Fokus
- * vor den Latz geknallt, denn sonst kann es passieren, dass zwar die
- * Liste ausgeklappt ist, aber das Eingabefeld noch keinen Tastatur-
- * fokus erhalten hat. Das sollte aber nicht so sein, denn es ist dann
- * keine konsequente Tastaturbedienung.
- */
-static void ArrowCallback(Widget w, XtPointer pClientData,
- XmAnyCallbackStruct *info)
-{
- XmComboBoxWidget cbw = (XmComboBoxWidget) XtParent(w);
-
- switch ( info->reason ) {
- case XmCR_ARM:
- LOG("ArrowCallback: XmCR_ARM\n");
- XmProcessTraversal(cbw->combobox.EditCtrl, XmTRAVERSE_CURRENT);
- if ( cbw->combobox.TwmHandlingOn && cbw->combobox.ListVisible )
- cbw->combobox.IgnoreFocusOut = True;
- break;
- case XmCR_ACTIVATE:
- XmProcessTraversal(cbw->combobox.EditCtrl, XmTRAVERSE_CURRENT);
- ShowHideDropDownList(cbw, info->event,
- (Boolean)(!cbw->combobox.ListVisible));
- break;
- }
-} /* ArrowCallback */
-
-/* --------------------------------------------------------------------
- * Diese Benachrichtigung moechte uns nur mitteilen, dass wir soeben
- * den Fokus verloren haben (Ohhhh!) Sollte allerdings der Fokus nur
- * aus dem Grunde perdue sein, dass der Anwender den Mauszeiger ausser-
- * halb des Applikationsfensters plaziert hat, so koennen wir diese
- * Nachricht uebergehen. Erst wenn der Fokus an ein anderes Widget in
- * unserer Applikation verlorenging, muessen wir auf diese Information
- * reagieren.
- * Und jetzt zu noch einem total beknackten Problem - alles nur wegen
- * Motif und den diversen Window-Managern (bspw. olwm)... Leider kommt
- * beim FocusOut kein richtiger Hinweis auf den tatsaechlichen Event,
- * der dieses Callback ausloeste -- warum liefert denn dann Motif ueber-
- * haupt noch den Event???? Und ueberhauupt, die Geschichte mit dem
- * Fokus ist schon der reinste Horror. Aktueller Ausweg: wenn wir die
- * Benachrichtigung ueber den Focusabgang bekommen, registrieren wir
- * eine Work-Prozedur, die, sobald der Rechner wieder Luft hat, auf-
- * gerufen wird. Sie kann dann nachschauen, ob nicht inzwischen die
- * OverrideShell den Focus bekahm. Wenn ja, koennen wir den FocusOut
- * uebergehen, ansonsten muessen wir ihn beruecksichtigen.
- * -- Ist das eine ^@#$^*(#$^&! (Meine gute Erziehung hindert mich
- * daran, diesen Begriff hier zu nennen.)
- */
-static Boolean DelayedFocusOutWorkProc(XtPointer pClientData)
-{
- XmComboBoxWidget cbw = (XmComboBoxWidget) pClientData;
- LOG2("DelayedFocusOutWorkProc: IgnoreFocusOut: %s\n",
- cbw->combobox.IgnoreFocusOut ? "True" : "False");
- if ( !cbw->combobox.IgnoreFocusOut )
- ShowHideDropDownList(cbw, &(cbw->combobox.xevent), False);
- cbw->combobox.IgnoreFocusOut = False;
- cbw->combobox.PendingFocusOut = False;
- return True; /* diese Routine wird nicht mehr benoetigt. */
-} /* DelayedFocusOutWorkProc */
-
-static void EditFocusCallback(Widget w, XtPointer pClientData,
- XmAnyCallbackStruct *info)
-{
- XmComboBoxWidget cbw = (XmComboBoxWidget) XtParent(w);
-
- if ( cbw->combobox.StaticList ) return;
-
- if ( info->reason == XmCR_LOSING_FOCUS ) {
- LOG2("EditFocusCallback: PendingFocusOut: %s, ",
- cbw->combobox.PendingFocusOut ? "True" : "False");
- LOG3("mode: %i, detail: %i, ", (int)info->event->xcrossing.mode,
- (int)info->event->xcrossing.detail);
- LOG2("PendingOverrideInOut: %s\n",
- cbw->combobox.PendingOverrideInOut ? "True" : "False");
- if ( !cbw->combobox.PendingFocusOut &&
- !cbw->combobox.PendingOverrideInOut ) {
- /* Normalerweise duerfen aber keine NULL-Events hier
- * vorbeikommen...aber man weiss ja nie so genau und
- * sicher ist sicher. Defensiv programmieren!
- */
- if ( info->event )
- cbw->combobox.xevent = *info->event;
- cbw->combobox.WorkProcID = XtAppAddWorkProc(
- XtWidgetToApplicationContext((Widget) cbw),
- (XtWorkProc) DelayedFocusOutWorkProc,
- (XtPointer) cbw);
- cbw->combobox.PendingFocusOut = True;
- }
- cbw->combobox.PendingOverrideInOut = False;
- }
-} /* EditFocusCallback */
-
-/* --------------------------------------------------------------------
- * Hier wird der angegebene Eintrag in der Listbox der Combo-Box
- * markiert und zudem in den sichtbaren Bereich gerollt, sollte er
- * sich ausserhalb des dargestellten Bereichs der Liste befinden.
- * Parameter:
- * w Die Combo-Box (ueblicher Parameter)
- * Index Index des neu zu markierenden Eintrages.
- * Notify Schickt Mitteilung via Callback
- * Ergebnis:
- * Index des markierten Eintrages oder 0, falls die Listbox leer
- * war und deshalb auch kein Eintrag markiert werden konnte.
- */
-static int SetSelectionPos(XmComboBoxWidget w, int Index, Boolean Notify)
-{
- Widget ListBox = w->combobox.ListCtrl;
- int ItemCount; /* Anzahl Eintraege in Listbox */
- int TopItem, VisibleItems;
-
- XtVaGetValues(ListBox, XmNitemCount, &ItemCount,
- XmNtopItemPosition, &TopItem,
- XmNvisibleItemCount, &VisibleItems,
- NULL);
- if ( Index < 1 ) Index = 1;
- if ( Index > ItemCount ) Index = ItemCount;
- if ( Index != 0 && ItemCount != 0 ) {
- if ( Index < TopItem )
- XmListSetPos(ListBox, Index);
- if ( Index >= TopItem + VisibleItems )
- XmListSetBottomPos(ListBox, Index);
- XmListSelectPos(ListBox, Index, Notify);
- return Index;
- } else
- return 0;
-} /* SetSelectionPos */
-
-/* --------------------------------------------------------------------
- * Diese Routine kuemmert sich darum, denjenigen Eintrag aus der List-
- * box mit der angegebenen Nummer herauszufischen und an die Eingabe-
- * zeile zu uebergeben. Dabei wird der Index auf den Eintrag auto-
- * matisch auf den zulaessigen Bereich begrenzt. Zugleich wird auch
- * noch der angegebene Eintrag in der Listbox markiert.
- */
-static void TransferToEditCtrl(XmComboBoxWidget w, int SelectionIndex,
- Boolean MayWipeOut)
-{
- Widget ListBox = w->combobox.ListCtrl;
- XmStringTable Items;
- char *pItemText;
-
- XtVaGetValues(ListBox, XmNitems, &Items, NULL);
-
- if ( MayWipeOut &&
- (SelectionIndex == w->combobox.LastSelection) &&
- (w->combobox.SelectionPolicy == XmSINGLE_SELECT) ) {
- SelectionIndex = 0;
- }
-
- if ( (SelectionIndex == 0) &&
- (w->combobox.SelectionPolicy == XmSINGLE_SELECT) ) {
- XmListDeselectAllItems(w->combobox.ListCtrl);
- w->combobox.PassVerification = True;
- XmTextFieldSetString(w->combobox.EditCtrl, "");
- } else {
- SelectionIndex = SetSelectionPos(w, SelectionIndex, False);
- if ( SelectionIndex > 0 ) {
- XmStringGetLtoR(Items[SelectionIndex-1],
- XmSTRING_DEFAULT_CHARSET, &pItemText);
- w->combobox.PassVerification = True;
- XmTextFieldSetString(w->combobox.EditCtrl, pItemText);
- XtFree(pItemText);
- }
- }
- w->combobox.LastSelection = SelectionIndex;
-} /* TransferToEditCtrl */
-
-/* --------------------------------------------------------------------
- * Alle registrierten Callbacks bei Anwahl eines neuen Eintrages in
- * der Listbox aktivieren.
- */
-static void CallSelectionCBL(XmComboBoxWidget w, XEvent *Event)
-{
- int index;
-
- index = XmComboBoxGetSelectedPos((Widget) w);
- /*
- * Wenn momentan KEIN Eintrag selektiert ist, dann rufe den neuen
- * XmNunselectionCallback auf!
- */
- if ( index == 0 ) {
- XmComboBoxUnselectionCallbackStruct info;
-
- info.reason = XmCR_UNSELECT;
- info.event = Event;
- XtCallCallbacks((Widget) w, XmNunselectionCallback, (XtPointer) &info);
- } else {
- /*
- * Ansonsten den ueblichen SelectionCallback!
- */
- XmComboBoxSelectionCallbackStruct info;
- XmStringTable Items;
-
- info.reason = w->combobox.SelectionPolicy == XmSINGLE_SELECT ?
- XmCR_SINGLE_SELECT : XmCR_BROWSE_SELECT;
- info.event = Event;
- info.index = index;
- XtVaGetValues(w->combobox.ListCtrl, XmNitems, &Items, NULL);
- info.value = Items[info.index-1];
- XtCallCallbacks((Widget) w, XmNselectionCallback, (XtPointer) &info);
- }
-} /* CallSelectionCBL */
-
-/* --------------------------------------------------------------------
- * Hier laeuft das Tastatur-Management fuer die ComboBox zusammen.
- * ACHTUNG: Der 'w'-Parameter wird nur benoetigt, um das eigentliche
- * ComboBox-Widget zu ermitteln. Er muss daher die ID eines direkten
- * Kinds der ComboBox enthalten!
- */
-static void CBoxManager(Widget w, XEvent *Event, String *params,
- Cardinal *num_params)
-{
- XmComboBoxWidget cbw;
- Widget ListBox;
- int *SelectionList;
- int SelectionCount;
- int SelectionIndex; /* Wer denn nun markiert wird... */
- int ItemCount; /* Anzahl Eintraege in Listbox */
- int VisibleItems; /* Hoehe der Liste in Eintraegen */
- char opt;
-
- /*
- * Nur wenn eine der Translationen page-up und page-down direkt im
- * Listenfeld ausgeloest wurden, wird auch als "w" die Liste ueber-
- * geben. Bei allen anderen Faellen ist dieses zumeist das TextField.
- */
- if ( XtClass(w) == xmListWidgetClass )
- cbw = (XmComboBoxWidget) XtParent(XtParent(w));
- else
- cbw = (XmComboBoxWidget) XtParent(w);
- ListBox = cbw->combobox.ListCtrl;
-
- switch ( *(params[0]) ) {
-/* --------------------------------------------------------------------
- * Klappe die Liste auf Wunsch des Benutzers aus oder wieder ein.
- */
- case 's': /* show-hide-list */
- ShowHideDropDownList(cbw, Event,
- (Boolean)(!cbw->combobox.ListVisible));
- break;
- case 'h': /* hide-list */
- ShowHideDropDownList(cbw, Event, False);
- break;
-/* --------------------------------------------------------------------
- * Hier werden die Bewegungen in der Listbox behandelt.
- */
- case 'u': /* up */
- case 'd': /* down */
- case 't': /* top */
- case 'b': /* bottom */
- case 'p': /* page-up/page-down */
- opt = *(params[0]);
- XtVaGetValues(ListBox, XmNitemCount, &ItemCount,
- XmNvisibleItemCount, &VisibleItems, NULL);
- if ( XmListGetSelectedPos(ListBox,
- &SelectionList, &SelectionCount) ) {
- SelectionIndex = *SelectionList;
- XtFree((char *)SelectionList);
- switch ( opt ) {
- case 'u': SelectionIndex--; break;
- case 'd': SelectionIndex++; break;
- case 't': SelectionIndex = 1; break;
- case 'b': SelectionIndex = ItemCount; break;
- case 'p': if ( *(params[0]+5) == 'u' )
- SelectionIndex -= VisibleItems;
- else
- SelectionIndex += VisibleItems;
- break;
- }
- } else { /* momentan noch kein Eintrag in der Liste ausgewaehlt */
- if ( opt == 'b' ) SelectionIndex = ItemCount;
- else SelectionIndex = 1; /* nun ersten Eintrag nehmen */
- }
- TransferToEditCtrl(cbw, SelectionIndex, False);
- CallSelectionCBL(cbw, Event);
- break;
-/* --------------------------------------------------------------------
- * Der Benutzer hat die Eingabetaste gedrueckt oder einen Eintrag in
- * der Listbox angeklickt.
- */
- case 'a': /* Return = activate */
- case 'S': /* Selection */
- if ( !cbw->combobox.StaticList && !cbw->combobox.ListVisible ) break;
- XtVaGetValues(ListBox, XmNitemCount, &ItemCount, NULL);
- if ( ItemCount == 0 ) break;
- if ( XmListGetSelectedPos(ListBox,
- &SelectionList, &SelectionCount) ) {
- SelectionIndex = *SelectionList;
- XtFree((char *)SelectionList);
- } else {
- if ( cbw->combobox.SelectionPolicy != XmSINGLE_SELECT )
- SelectionIndex = 1;
- else
- SelectionIndex = 0;
- }
-
- TransferToEditCtrl(cbw, SelectionIndex,
- *(params[0]) == 'S');
- CallSelectionCBL(cbw, Event);
- ShowHideDropDownList(cbw, Event, (Boolean)
- (*(params[0]) == 'S' ? True : False));
- break;
-/* --------------------------------------------------------------------
- * Der Benutzer hat die ESC-Taste gedrueckt. Ist die Liste zu diesem
- * Zeitpunkt noch ausgeklappt, so wird sie einfach nur eingeklappt und
- * weiter passiert nichts. Ist die Liste jedoch eingeklappt, so wird
- * das ESC an die normale Action-Routine des Eingabefeldes weiter-
- * gegeben, damit damit bspw. Dialog u.a. abgebrochen werden koennen.
- */
- case 'c': /* Cancel */
- if ( cbw->combobox.ListVisible )
- ShowHideDropDownList(cbw, Event, False);
- else
- XtCallActionProc(cbw->combobox.EditCtrl,
- "process-cancel", Event, NULL, 0);
- break;
-/* --------------------------------------------------------------------
- * Wenn es erlaubt ist, dass auch einmal kein Eintrag in einer ComboBox
- * mit nicht editierbarem Eingabefeld ausgewaehlt ist, dann darf der
- * Anwender mittels osfDelete den aktuellen Eintrag deselektieren.
- */
- case 'w': /* wipe */
- if ( cbw->combobox.SelectionPolicy == XmSINGLE_SELECT ) {
- TransferToEditCtrl(cbw, 0, True);
- CallSelectionCBL(cbw, Event);
- }
- break;
-/* --------------------------------------------------------------------
- * Dummy-Operation
- */
- case 'n': /* no-operation */
- break;
- }
-} /* CBoxManager */
-
-/* --------------------------------------------------------------------
- * Der Benutzer hat einen Eintrag in der Listbox angeklickt. Der Ein-
- * fachkeit halber wird einfach nur ein Druecken der Eingabetaste
- * simuliert.
- */
-static void ListSelectionCallback(Widget w, XtPointer pClientData,
- XmAnyCallbackStruct *info)
-{
- String paramsMouse[1] = { "a" }, paramsKeyboard[1] = { "S" };
- Cardinal NumParams = 1;
- XmComboBoxWidget cbw = (XmComboBoxWidget) pClientData;
-/*
- * Wurde der Event durch die Tastatur oder einen Mausklick
- * ausgeloest? Wenn es ein Mausklick auf das Listenfeld war und es
- * sich um ein staendig angezeigtes Listenfeld einer nicht editierbaren
- * ComboBox handelt, dann gib' dem Eingabefeld den Tastaturfokus.
- */
- if ( info->event == NULL )
- CBoxManager(cbw->combobox.EditCtrl, info->event,
- paramsKeyboard, &NumParams);
- else {
- CBoxManager(cbw->combobox.EditCtrl, info->event,
- paramsMouse, &NumParams);
- if ( !cbw->combobox.StaticList ||
- (cbw->combobox.StaticList && !cbw->combobox.Editable) )
- XmProcessTraversal(cbw->combobox.EditCtrl,
- XmTRAVERSE_CURRENT);
- }
-} /* ListSelectionCallback */
-
-/* --------------------------------------------------------------------
- * Nach einem Doppelklick innerhalb des Listenfelds wird diese Routine
- * aufgerufen. Zunaechst einmal wird ganz normal wie bei einem ein-
- * fachen Anklicken vorgegangen, danach aber noch der ein spezieller
- * Callback aufgerufen.
- */
-static void ListDefaultActionCallback(Widget w, XtPointer pClientData,
- XmAnyCallbackStruct *OldInfo)
-{
- XmComboBoxWidget cbw = (XmComboBoxWidget) pClientData;
- XmComboBoxDefaultActionCallbackStruct info;
- XmStringTable Items;
-
- ListSelectionCallback(w, pClientData, OldInfo);
- info.reason = XmCR_DEFAULT_ACTION;
- info.event = OldInfo->event;
- info.index = XmComboBoxGetSelectedPos((Widget) cbw);
- XtVaGetValues(cbw->combobox.ListCtrl, XmNitems, &Items, NULL);
- info.value = Items[info.index-1];
- XtCallCallbacks((Widget) cbw, XmNdefaultActionCallback, (XtPointer) &info);
-} /* ListDefaultActionCallback */
-
-
-/* --------------------------------------------------------------------
- * Ohweh!! Diese Routine wurde erforderlich, um XmNautomaticSelection
- * zu unterstuetzen. Denn wenn der Benutzer in der Liste herumsucht und
- * automaticSelection 'True' ist, kommt kein Callback-Aufruf mehr, wenn
- * die Maustaste losgelassen wird. Und damit wuessten wir sonst nicht,
- * wann die Liste einzuklappen ist! Irgendwie wird das alles mit der
- * Zeit immer konfuser und aufwendiger. Wenn das Chaos gequantelt
- * sein sollte, dann muss das Chaos-Quant (sog. 'Chaotonen') aber jede
- * Menge Chaos transportieren!!!
- */
-static void Button1UpInList(Widget w, XtPointer pClientData,
- XEvent *Event, Boolean *ContDispatch)
-{
- XmComboBoxWidget cbw = (XmComboBoxWidget) pClientData;
-
- if ( Event->xbutton.button == Button1 ) {
- if ( cbw->combobox.AutomaticSelection )
- ShowHideDropDownList(cbw, Event, False);
- }
-} /* Button1UpInList */
-
-/* --------------------------------------------------------------------
- * Sobald sich irgendetwas im Eingabefeld veraenderte, kommt das
- * TextField-Widget zuerst zu uns gelaufen, um sich unser Okay zu
- * holen. Bei einer nicht editierbaren Combo-Box wird hierueber die
- * Schnellsuche realisiert.
- */
-static void EditVerifyCallback(Widget w, XtPointer pClientData,
- XmTextVerifyCallbackStruct *info)
-{
- XmComboBoxWidget cbw = (XmComboBoxWidget) XtParent(w);
-
-/*
- * Sollte gerade dem Eingabefeld Text aus der Listbox einverleibt
- * werden, so duerfen wir hier darueber natuerlich nicht meckern,
- * sondern unser <> dazu geben. (D.h. in diesem Fall haben wir
- * kein Recht, zu intervenieren.)
- */
- if ( cbw->combobox.PassVerification ) {
- cbw->combobox.PassVerification = False;
- info->doit = True;
- return;
- }
-/*
- * Ist es eine Combo-Box, in die kein Text vom Benutzer eingegeben
- * werden kann, so wird bei der Eingabe von Zeichen die Schnellsuche
- * ausgeloest.
- */
- if ( !cbw->combobox.Editable ) {
- Widget ListBox = cbw->combobox.ListCtrl;
- char WarpCharLow, WarpCharHigh;
- XmString Item;
- XmStringTable Items;
- int *SelectionList;
- int SelectionCount;
- int i, ItemCount, Start;
- char *pItem;
- Boolean Ignore;
-
- info->doit = False;
- if ( (info->text == NULL ) ||
- (info->text->length == 0 ) ) return; /* Hoppala! */
-/*
- * Nun aus dem Zeichen einen String (Motif-like) basteln und
- * in der Listbox danach auf die Suche gehen.
- */
- if ( info->text->length > 1 ) {
- /* Das ist nun endweder ein normaler Paste, oder aber
- * das Ergebnis einer Drag'n'Drop-Operation.
- */
- Item = XmStringCreateSimple(info->text->ptr);
- XmComboBoxSelectItem((Widget) cbw, Item, True);
- XmStringFree(Item);
- } else {
- /* Ansonsten soll nur eine Schnellsuche ausgefuehrt
- * werden, der entsprechende Buchstabe ist das einzige
- * Zeichen im dem Callback uebergebenen Text.
- */
- WarpCharLow = tolower(*(info->text->ptr));
- WarpCharHigh = toupper(WarpCharLow);
-
- XtVaGetValues(ListBox, XmNitemCount, &ItemCount,
- XmNitems, &Items,
- NULL);
- if ( ItemCount < 1 ) return;
- /* Ermittele, wo's los geht mit der Suche... */
- if ( XmListGetSelectedPos(ListBox,
- &SelectionList, &SelectionCount) ) {
- Start = *SelectionList; i = Start + 1;
- XtFree((char *)SelectionList);
- } else i = Start = 1;
-
- if ( i > ItemCount ) i = 1;
- Ignore = True;
- while ( i != Start || Ignore ) {
- Ignore = False;
- XmStringGetLtoR(Items[i-1], XmSTRING_DEFAULT_CHARSET,
- &pItem);
- if ( (strchr(pItem, WarpCharLow ) == pItem) ||
- (strchr(pItem, WarpCharHigh) == pItem) ) {
- XtFree(pItem);
- TransferToEditCtrl(cbw, i, False);
- CallSelectionCBL(cbw, info->event);
- break;
- }
- XtFree(pItem);
- if ( ++i > ItemCount ) i = 1;
- }
- }
- } else {
-/*
- * Wenn das Eingabefeld editierbar ist, dann fragen wir ueber die Callbacks
- * nach, ob es genehm ist, den neuen Text einzufuegen.
- */
- XtCallCallbacks((Widget) cbw, XmNmodifyVerifyCallback,
- (XtPointer) info);
- }
-} /* EditVerifyCallback */
-
-/* --------------------------------------------------------------------
- * Dieser Callback wird immer dann aufgerufen, wenn in einer ComboBox
- * mit einem veraenderlichem Eingabefeld der Eingabetext veraendert
- * wurde. In diesem Fall suchen wir hier nach einem passenden gleich-
- * lautenden Eintrag. Wenn wir einen finden, heben wir ihn in der Liste
- * sogleich hervor, ansonsten ist kein Eintrag hervorgehoben.
- */
-static void EditChangedCallback(Widget w, XtPointer pClientDate,
- XmAnyCallbackStruct *info)
-{
- XmComboBoxWidget cbw = (XmComboBoxWidget) XtParent(w);
- XmStringTable Items;
- int ItemCount, i;
- XmString EditStr;
- String EditLine;
-
- /*
- * Zuerst nach einem passenden Eintrag zum Eingabefeld in der Liste
- * suchen...
- */
- XtVaGetValues(cbw->combobox.EditCtrl, XmNvalue, &EditLine, NULL);
- XtVaGetValues(cbw->combobox.ListCtrl,
- XmNitemCount, &ItemCount,
- XmNitems, &Items,
- NULL);
- EditStr = XmStringCreateSimple(EditLine);
- XtVaSetValues(cbw->combobox.ListCtrl, XmNselectedItemCount, 0, NULL);
- if ( ItemCount < 1 ) return;
- for ( i = 0; i < ItemCount; i++ )
- if ( XmStringCompare(Items[i], EditStr) ) {
- SetSelectionPos(cbw, i+1, False);
- break;
- }
- XmStringFree(EditStr);
- /*
- * Zum Abschluss noch den Callback aufrufen...
- */
- XtCallCallbacks((Widget) cbw, XmNvalueChangedCallback, (XtPointer) info);
-} /* EditChangedCallback */
-
-/* --------------------------------------------------------------------
- * Dieser Callback wird immer dann aufgerufen, wenn in einer ComboBox
- * mit einem veraenderlichem Eingabefeld der Cursor bewegt wurde.
- * Dieser Callback ist nur fuer echte Fans von Callbacks da...
- */
-static void MotionVerifyCallback(Widget w, XtPointer pClientDate,
- XmTextVerifyCallbackStruct *info)
-{
- XmComboBoxWidget cbw = (XmComboBoxWidget) XtParent(w);
-
- XtCallCallbacks((Widget) cbw, XmNmotionVerifyCallback, (XtPointer) info);
-} /* MotionVerifyCallback */
-
-/* --------------------------------------------------------------------
- * Bastele einen vollstaendigen Namens- und Klassenbezeichner anhand
- * des angegebenen Widgets zusammen.
- */
-static void MakeNameAndClass(Widget w, char *NameBuff, char *ClassBuff)
-{
- Widget Parent = XtParent(w);
-
- if ( Parent ) MakeNameAndClass(Parent, NameBuff, ClassBuff);
- if ( XtIsSubclass(w, applicationShellWidgetClass) ) {
- /* Wenn wir ganz oben angekommen sind, holen wir uns den
- * Namen und die Klasse der Applikation selbst und nicht die
- * des Widgets.
- */
- String AppName, AppClass;
- XtGetApplicationNameAndClass(
- XtDisplayOfObject(w), &AppName, &AppClass);
- strcpy(NameBuff, AppName);
- strcpy(ClassBuff, AppClass);
- } else {
- /* Ansonsten sind wir noch mitten irgendwo in der Hierarchie
- * und besorgen uns den Namen und die Klasse dieses Widgets
- */
- strcat(NameBuff, ".");
- strcat(NameBuff, XtName(w));
- strcat(ClassBuff, ".");
- strcat(ClassBuff, ((CoreClassRec *) XtClass(w))->core_class.class_name);
- }
-} /* MakeNameAndClass */
-
-/* --------------------------------------------------------------------
- * Eine einzelne Resource aus der Datenbank herausholen. Diese Resource
- * kommt im Allgemeinen immer als String zurueck und muss daher erst
- * noch in das gewuenschte Zielformat konvertiert werden.
- */
-static Boolean FetchResource(Widget w,
- char *FullName, char *FullClass,
- char *RscName, char *RscClass,
- XrmValue *RscValue,
- String *RepresentationType)
-{
- Boolean ok;
- char *EndOfName = FullName + strlen(FullName);
- char *EndOfClass = FullClass + strlen(FullClass);
-
- strcat(FullName, "."); strcat(FullName, RscName);
- strcat(FullClass, "."); strcat(FullClass, RscClass);
- ok = XrmGetResource(
- XtDatabase(XtDisplayOfObject(w)),
- FullName, FullClass, RepresentationType, RscValue);
- /* Wieder den alten Namens- und Klassenrumpf herstellen */
- *EndOfName = 0; *EndOfClass = 0;
- return ok;
-} /* FetchResource */
-
-/* --------------------------------------------------------------------
- * Nun folgen diejenigen Routinen, mit denen die Konvertierung in das
- * gewuenschte Zielformat einer Resource moeglich ist.
- * Verfuegbar:
- * String --> Int
- * String --> Short
- * String XmPIXMAP / XmSTRING --> unsigned char
- * String --> Dimension
- * String --> XmString
- * String --> XmStringTable
- * String --> XmFontList
- * String --> Pixmap (genauer: Bitmap)
- * String --> String
- * String --> KeySym
- */
-static Boolean FetchIntResource(Widget w,
- char *FullName, char *FullClass,
- char *RscName, char *RscClass,
- int *pInt)
-{
- XrmValue RscValue, RscDest;
- String RepresentationType;
-
- if ( FetchResource(w, FullName, FullClass,
- RscName, RscClass,
- &RscValue, &RepresentationType) ) {
- RscDest.size = sizeof(int);
- RscDest.addr = (caddr_t) pInt;
- if ( XtConvertAndStore(w, RepresentationType, &RscValue,
- XtRInt, &RscDest) )
- return True;
- }
- return False;
-} /* FetchIntResource */
-
-static Boolean FetchShortResource(Widget w,
- char *FullName, char *FullClass,
- char *RscName, char *RscClass,
- short *pShort)
-{
- XrmValue RscValue, RscDest;
- String RepresentationType;
-
- if ( FetchResource(w, FullName, FullClass,
- RscName, RscClass,
- &RscValue, &RepresentationType) ) {
- RscDest.size = sizeof(short);
- RscDest.addr = (caddr_t) pShort;
- if ( XtConvertAndStore(w, RepresentationType, &RscValue,
- XtRShort, &RscDest) )
- return True;
- }
- return False;
-} /* FetchShortResource */
-
-static Boolean FetchLabelTypeResource(Widget w,
- char *FullName, char *FullClass,
- char *RscName, char *RscClass,
- unsigned char *pUChar)
-{
- XrmValue RscValue;
- String RepresentationType;
-
- if ( FetchResource(w, FullName, FullClass,
- RscName, RscClass,
- &RscValue, &RepresentationType) ) {
- if ( strcasecmp((char *) RscValue.addr, "XmPIXMAP") == 0 )
- *pUChar = XmPIXMAP;
- else
- *pUChar = XmSTRING;
- return True;
- }
- return False;
-} /* FetchLabelTypeResource */
-
-static Boolean FetchDimensionResource(Widget w,
- char *FullName, char *FullClass,
- char *RscName, char *RscClass,
- Dimension *pDimension)
-{
- XrmValue RscValue, RscDest;
- String RepresentationType;
-
- if ( FetchResource(w, FullName, FullClass,
- RscName, RscClass,
- &RscValue, &RepresentationType) ) {
- RscDest.size = sizeof(Dimension);
- RscDest.addr = (caddr_t) pDimension;
- if ( XtConvertAndStore(w, RepresentationType, &RscValue,
- XtRDimension, &RscDest) )
- return True;
- }
- return False;
-} /* FetchDimensionResource */
-
-static Boolean FetchStringResource(Widget w,
- char *FullName, char *FullClass,
- char *RscName, char *RscClass,
- String *pString)
-{
- XrmValue RscValue;
- String RepresentationType;
-
- if ( FetchResource(w, FullName, FullClass,
- RscName, RscClass,
- &RscValue, &RepresentationType) ) {
- *pString = (char *) RscValue.addr;
- return True;
- }
- return False;
-} /* FetchStringResource */
-
-static Boolean FetchKeySymResource(Widget w,
- char *FullName, char *FullClass,
- char *RscName, char *RscClass,
- KeySym *pKeySym)
-{
- XrmValue RscValue, RscDest;
- String RepresentationType;
-
- if ( FetchResource(w, FullName, FullClass,
- RscName, RscClass,
- &RscValue, &RepresentationType) ) {
- RscDest.size = sizeof(KeySym);
- RscDest.addr = (caddr_t) pKeySym;
- if ( XtConvertAndStore(w, RepresentationType, &RscValue,
- XmRKeySym, &RscDest) )
- return True;
- }
- return False;
-} /* FetchKeySymResource */
-
-static Boolean FetchXmStringResource(Widget w,
- char *FullName, char *FullClass,
- char *RscName, char *RscClass,
- XmString *pString)
-{
- XrmValue RscValue;
- String RepresentationType;
-
- if ( FetchResource(w, FullName, FullClass,
- RscName, RscClass,
- &RscValue, &RepresentationType) ) {
- *pString = XmCvtCTToXmString((char *) RscValue.addr);
- return True;
- }
- return False;
-} /* FetchXmStringResource */
-
-static Boolean FetchXmStringTableResource(Widget w,
- char *FullName, char *FullClass,
- char *RscName, char *RscClass,
- XmStringTable *pStringTable,
- int *pTableSize)
-{
- XrmValue RscValue;
- String RepresentationType;
- String TmpList, p, pStart;
- int Entries, Entry;
-
- if ( FetchResource(w, FullName, FullClass,
- RscName, RscClass,
- &RscValue, &RepresentationType) ) {
- /*
- * Zuerst eine Kopie erzeugen und dann daraus die Liste
- * zusammenbasteln.
- */
- TmpList = XtNewString((String)RscValue.addr);
- if ( TmpList == NULL ) return False;
- if ( *TmpList == 0 ) { XtFree(TmpList); return False; }
- /* Ermittele, wieviele Eintrage in der Liste sind und
- * erstelle dann daraus die Liste.
- */
- Entries = 1; p = TmpList;
- while ( *p )
- if ( *p++ == ',' ) ++Entries;
- *pStringTable = (XmStringTable)
- XtMalloc(Entries * sizeof(XmString));
-
- p = TmpList;
- for ( Entry = 0; Entry < Entries; ++Entry ) {
- pStart = p;
- while ( (*p != 0) && (*p != ',') ) ++p;
- *p++ = 0;
- (*pStringTable)[Entry] = (XmString)
- XmStringCreateSimple(pStart);
- }
- /* Hier geht ausnahmsweise einmal Rueckgabe vor
- * Entschaedigung... hey, das war doch nur ein
- * (wenn auch ziemlich miserabler) Scherz
- */
- XtFree(TmpList);
- *pTableSize = Entries;
- return True;
- }
- return False;
-} /* FetchXmStringTableResource */
-
-static Boolean FetchXmFontListResource(Widget w,
- char *FullName, char *FullClass,
- char *RscName, char *RscClass,
- XmFontList *pFontList)
-{
- XrmValue RscValue, RscDest;
- String RepresentationType;
-
- if ( FetchResource(w, FullName, FullClass,
- RscName, RscClass,
- &RscValue, &RepresentationType) ) {
- RscDest.size = sizeof(XmFontList);
- RscDest.addr = (caddr_t) pFontList;
- if ( XtConvertAndStore(w, RepresentationType, &RscValue,
- XmRFontList, &RscDest) )
- return True;
- }
- return False;
-} /* FetchXmFontListResource */
-
-static Boolean FetchPixmapResource(Widget w,
- char *FullName, char *FullClass,
- char *RscName, char *RscClass,
- Pixmap *pPixmap)
-{
- XrmValue RscValue, RscDest;
- String RepresentationType;
-
- if ( FetchResource(w, FullName, FullClass,
- RscName, RscClass,
- &RscValue, &RepresentationType) ) {
- RscDest.size = sizeof(Pixmap);
- RscDest.addr = (caddr_t) pPixmap;
- if ( XtConvertAndStore(w, RepresentationType, &RscValue,
- XtRBitmap, &RscDest) )
- return True;
- }
- return False;
-} /* FetchPixmapResource */
-
-/* --------------------------------------------------------------------
- * Waehrend der Initialisierung alle gespiegelten Resourcen, fuer die
- * Eintraege in der Resourcen-Datenbank existieren an die passenden
- * Kinder-Widgets weiterleiten. Der Trick an der Sache: wir setzen
- * die betroffenen Resourcen vie XtSetValues mit uns selbst als Ziel.
- * Dadurch bekommt SetValues die Arbeit aufgehalst, die Resourcen den
- * richtigen Kindern zuzuordnen...
- */
-
-#define RInt 0
-#define RShort 1
-#define RLType 2
-#define RDimension 3
-#define RXmString 4
-#define RPixmap 5
-#define RXmFontList 6
-#define RKeySym 7
-#define RString 8
-#define RXmStringTable 9
-#define RXmItemCount 10
-
-
-typedef struct
-{
- String Name, Class;
-
- int Converter;
-
-} RESOURCEMIRROR;
-
-static RESOURCEMIRROR ResourceMirror[] = {
- { XmNblinkRate, XmCBlinkRate, RInt, },
- { XmNcolumns, XmCColumns, RShort, },
- { XmNmaxLength, XmCMaxLength, RInt, },
- { XmNmarginHeight, XmCMarginHeight, RDimension },
- { XmNmarginWidth, XmCMarginWidth, RDimension },
- { XmNselectThreshold, XmCSelectThreshold, RInt },
-
- { XmNlistMarginHeight, XmCListMarginHeight, RDimension },
- { XmNlistMarginWidth, XmCListMarginWidth, RDimension },
- { XmNlistSpacing, XmCListSpacing, RDimension },
- { XmNitems, XmCItems, RXmStringTable },
- { XmNitemCount, XmCItemCount, RXmItemCount },
-
- { XmNmnemonic, XmCMnemonic, RKeySym },
- { XmNmnemonicCharSet, XmCMnemonicCharSet, RString },
- { XmNlabelString, XmCLabelString, RXmString },
- { XmNlabelMarginBottom, XmCLabelMarginBottom, RDimension },
- { XmNlabelMarginHeight, XmCLabelMarginHeight, RDimension },
- { XmNlabelMarginLeft, XmCLabelMarginLeft, RDimension },
- { XmNlabelMarginRight, XmCLabelMarginRight, RDimension },
- { XmNlabelMarginTop, XmCLabelMarginTop, RDimension },
- { XmNlabelMarginWidth, XmCLabelMarginWidth, RDimension },
- { XmNlabelPixmap, XmCLabelPixmap, RPixmap },
- { XmNlabelInsensitivePixmap, XmCLabelInsensitivePixmap, RPixmap },
- { XmNlabelType, XmCLabelType, RLType },
- { XmNlabelFontList, XmCLabelFontList, RXmFontList },
-};
-
-static void InitMirrorResources(XmComboBoxWidget w)
-{
- char FullName[1024], FullClass[1024];
- int AInt, TableSize;
- short AShort;
- unsigned char AUChar;
- Dimension ADimension;
- XmString AXmString;
- XmStringTable AStringTable;
- Pixmap APixmap;
- XmFontList AFontList;
- String AString;
- KeySym AKeySym;
- int i, size = XtNumber(ResourceMirror);
-
- FullName[0] = 0; FullClass[0] = 0;
- MakeNameAndClass((Widget) w, FullName, FullClass);
-
- for ( i=0; i < size; i++ ) {
- switch ( ResourceMirror[i].Converter ) {
- case RInt:
- if ( FetchIntResource((Widget) w,
- FullName, FullClass,
- ResourceMirror[i].Name, ResourceMirror[i].Class,
- &AInt) )
- XtVaSetValues((Widget) w, ResourceMirror[i].Name,
- AInt, NULL);
- break;
- case RXmItemCount:
- if ( FetchIntResource((Widget) w,
- FullName, FullClass,
- ResourceMirror[i].Name, ResourceMirror[i].Class,
- &AInt) && ( AInt != 0) )
- XtVaSetValues((Widget) w, ResourceMirror[i].Name,
- AInt, NULL);
- break;
- case RShort:
- if ( FetchShortResource((Widget) w,
- FullName, FullClass,
- ResourceMirror[i].Name, ResourceMirror[i].Class,
- &AShort) )
- XtVaSetValues((Widget) w, ResourceMirror[i].Name,
- AShort, NULL);
- break;
- case RLType:
- if ( FetchLabelTypeResource((Widget) w,
- FullName, FullClass,
- ResourceMirror[i].Name, ResourceMirror[i].Class,
- &AUChar) )
- XtVaSetValues((Widget) w, ResourceMirror[i].Name,
- AUChar, NULL);
- break;
- case RDimension:
- if ( FetchDimensionResource((Widget) w,
- FullName, FullClass,
- ResourceMirror[i].Name, ResourceMirror[i].Class,
- &ADimension) )
- XtVaSetValues((Widget) w, ResourceMirror[i].Name,
- ADimension, NULL);
- break;
- case RXmString:
- if ( FetchXmStringResource((Widget) w,
- FullName, FullClass,
- ResourceMirror[i].Name, ResourceMirror[i].Class,
- &AXmString) )
- XtVaSetValues((Widget) w, ResourceMirror[i].Name,
- AXmString, NULL);
- break;
- case RXmStringTable:
- if ( FetchXmStringTableResource((Widget) w,
- FullName, FullClass,
- ResourceMirror[i].Name, ResourceMirror[i].Class,
- &AStringTable, &TableSize) ) {
- XtVaSetValues((Widget) w,
- XmNitems, (XtPointer) AStringTable,
- XmNitemCount, TableSize, NULL);
- }
- break;
- case RKeySym:
- if ( FetchKeySymResource((Widget) w,
- FullName, FullClass,
- ResourceMirror[i].Name, ResourceMirror[i].Class,
- &AKeySym) )
- XtVaSetValues((Widget) w, ResourceMirror[i].Name,
- AKeySym, NULL);
- break;
- case RString:
- if ( FetchStringResource((Widget) w,
- FullName, FullClass,
- ResourceMirror[i].Name, ResourceMirror[i].Class,
- &AString) )
- XtVaSetValues((Widget) w, ResourceMirror[i].Name,
- AString, NULL);
- break;
- case RPixmap:
- if ( FetchPixmapResource((Widget) w,
- FullName, FullClass,
- ResourceMirror[i].Name, ResourceMirror[i].Class,
- &APixmap) ) {
- XtVaSetValues((Widget) w, ResourceMirror[i].Name,
- APixmap, NULL);
- if ( strcmp(ResourceMirror[i].Name, XmNlabelPixmap) == 0 )
- w->combobox.ConvertBitmapToPixmap = True;
- else
- w->combobox.ConvertBitmapToPixmapInsensitive = True;
- }
- break;
- case RXmFontList:
- if ( FetchXmFontListResource((Widget) w,
- FullName, FullClass,
- ResourceMirror[i].Name, ResourceMirror[i].Class,
- &AFontList) )
- XtVaSetValues((Widget) w, ResourceMirror[i].Name,
- AFontList, NULL);
- break;
- }
- }
-} /* InitMirrorResources */
-
-/* --------------------------------------------------------------------
- * Wandelt ein 1-Bit tiefes Bitmap in ein n-Bit tiefes Pixmap um, dass
- * die gleiche Tiefe besitzt, wie der Bildschirm, auf dem das Pixmap
- * spaeter erscheinen soll.
- */
-static Pixmap BitmapToPixmap(XmComboBoxWidget w,
- String Resource, GC ColorGC)
-{
- Pixmap LabelPixmap, LabelBitmap;
- Display *display = XtDisplay(w);
- Window root;
- int PixX, PixY;
- unsigned int PixW, PixH, PixBW, PixDepth;
-
- XtVaGetValues(w->combobox.LabelCtrl, Resource, &LabelBitmap, NULL);
- XGetGeometry(display, LabelBitmap, &root,
- &PixX, &PixY, &PixW, &PixH, &PixBW, &PixDepth);
- LabelPixmap = XCreatePixmap(
- display, RootWindowOfScreen(XtScreen(w)),
- PixW, PixH,
- (w->combobox.LabelCtrl)->core.depth);
- XCopyPlane(display, LabelBitmap, LabelPixmap,
- ColorGC, 0, 0, PixW, PixH, 0, 0, 1);
- XtVaSetValues(w->combobox.LabelCtrl, Resource, LabelPixmap, NULL);
- XFreePixmap(display, LabelBitmap);
- return LabelPixmap;
-} /* BitmapToPixmap */
-
-/* --------------------------------------------------------------------
- * Alles initialisieren, sobald das Widget eingerichtet wird. Das sagt
- * sich hier so einfach, ist es aber *definitiv* nicht!!!!
- */
-static void Initialize(Widget request, XmComboBoxWidget newW,
- ArgList wargs, Cardinal *ArgCount)
-{
- Dimension width, height, dummy;
- Widget w;
- Arg args[10];
- int n = 0;
-
-/*
- * Da zu allem Ueberfluss die einzelnen Instanzen einer XmComboBox
- * auf verschiedenen Displays auftauchen koennen, wird hier:
- * 1. pro Widget ein eigener Cursor erzeugt (benoetigt fuer die Liste)
- * 2. pro Widget (hier = pro Applikation) die benoetigte Action-Routine
- * registiert. Doppelte Registrierung macht dem Toolkit nichts aus, da es
- * dann eine evtl. aeltere Definition loescht.
- */
- XtAppAddActions(XtWidgetToApplicationContext((Widget) newW),
- actions, XtNumber(actions));
-
-/* Allgemeine Initialisierungen... */
- newW->combobox.ConvertBitmapToPixmap = False;
- newW->combobox.ConvertBitmapToPixmapInsensitive = False;
-
- newW->combobox.LastSelection = 0;
-
- newW->combobox.InInit = True;
-
-/*
- * Das folgende Problem mit der Kontrolle, ob sich das Widget absolut auf
- * dem Bildschirm verschoben hat, trifft uns nur, wenn die Liste nicht
- * dauernd auf dem Bildschirm erscheint:
- * Lass' dich benachrichtigen, sobald dieses Widget in irgendeiner
- * Form bewegt wird -- und sei es nur, dass das gesamte Applikations-
- * fenster umhergeschoben wurde. Um die Benachrichtigung ueberhaupt
- * zu erreichen, ist es erforderlich, sich benachrichtigen zu lassen,
- * sobald die naechste Shell (oder ein Nachkomme) im Widget-Instanzen-
- * Baum verschoben wurde.
- */
- if ( !newW->combobox.StaticList ) {
- w = (Widget) newW;
- while ( !XtIsSubclass(w, shellWidgetClass) )
- w = XtParent(w);
- newW->combobox.MyNextShell = w;
- XtAddEventHandler(w,
- StructureNotifyMask | FocusChangeMask,
- False, (XtEventHandler) ShellCallback,
- (XtPointer) newW);
- }
-
-/* Richte nun alle zu diesem Widget gehoerenden Kinder ein, als da
- * waeren:
- * 1 x editierbares Eingabefeld
- * 1 x ein Pfeil nach unten
- * 1 x ein Schriftfeld
- */
- newW->combobox.EditCtrl = XtVaCreateManagedWidget(
- "edit", xmTextFieldWidgetClass, (Widget) newW,
- XmNverifyBell, False,
- NULL);
- XtAddCallback(newW->combobox.EditCtrl,
- XmNlosingFocusCallback,
- (XtCallbackProc) EditFocusCallback, NULL);
- XtAddCallback(newW->combobox.EditCtrl,
- XmNmodifyVerifyCallback,
- (XtCallbackProc) EditVerifyCallback, NULL);
- XtAddCallback(newW->combobox.EditCtrl,
- XmNvalueChangedCallback,
- (XtCallbackProc) EditChangedCallback, NULL);
- XtAddCallback(newW->combobox.EditCtrl,
- XmNhelpCallback,
- (XtCallbackProc) HelpCallback,
- (XtPointer) newW);
- XtAddCallback(newW->combobox.EditCtrl,
- XmNactivateCallback,
- (XtCallbackProc) ActivateCallback,
- (XtPointer) newW);
- if ( newW->combobox.Editable )
- XtAddCallback(newW->combobox.EditCtrl,
- XmNmotionVerifyCallback,
- (XtCallbackProc) MotionVerifyCallback,
- (XtPointer) newW);
-/* Neue Translations fuer das Eingabefeld aufnehmen */
- XtOverrideTranslations(newW->combobox.EditCtrl,
- NewEditTranslations);
- if ( !newW->combobox.Editable ) {
- XtOverrideTranslations(newW->combobox.EditCtrl,
- NewEditTranslationsNE);
- XtVaSetValues(newW->combobox.EditCtrl,
- XmNcursorPositionVisible, False, NULL);
- }
-#ifdef NODRAGNDROP
- XtOverrideTranslations(newW->combobox.EditCtrl,
- NewListTranslations); /* Btn2Dwn aus! */
-#endif
-
-/* --- */
- newW->combobox.ArrowCtrl = XtVaCreateManagedWidget(
- "arrow", xmArrowButtonWidgetClass, (Widget) newW,
- XmNarrowDirection, XmARROW_DOWN,
- XmNtraversalOn, False,
- XmNnavigationType, XmNONE,
- XmNborderWidth, 0,
- XmNhighlightThickness, 0,
- NULL);
- XmRemoveTabGroup(newW->combobox.ArrowCtrl);
- if ( newW->combobox.StaticList ) {
- XtVaSetValues(newW->combobox.ArrowCtrl,
- XmNmappedWhenManaged, False, NULL);
- } else {
- XtAddEventHandler(newW->combobox.ArrowCtrl,
- EnterWindowMask | LeaveWindowMask,
- False, (XtEventHandler) ArrowCrossingCallback,
- (XtPointer) newW);
- XtAddCallback(newW->combobox.ArrowCtrl,
- XmNactivateCallback,
- (XtCallbackProc) ArrowCallback, NULL);
- XtAddCallback(newW->combobox.ArrowCtrl,
- XmNarmCallback,
- (XtCallbackProc) ArrowCallback, NULL);
- XtAddCallback(newW->combobox.ArrowCtrl,
- XmNhelpCallback,
- (XtCallbackProc) HelpCallback,
- (XtPointer) newW);
- }
-
-/* --- */
- newW->combobox.LabelCtrl = XtVaCreateWidget(
- "label", xmLabelWidgetClass, (Widget) newW,
- XmNstringDirection, newW->manager.string_direction,
- NULL);
- if ( newW->combobox.ShowLabel ) {
- XtManageChild((Widget) newW->combobox.LabelCtrl);
- XtAddCallback(newW->combobox.LabelCtrl,
- XmNhelpCallback,
- (XtCallbackProc) HelpCallback,
- (XtPointer) newW);
- }
-
-/*
- * Zuerst noch die Shell erzeugen, die so einfach mir nichts dir nichts
- * frei auf dem Bildschirm herumschweben kann und damit das Ausklappen
- * der Liste erst ermoeglicht -- und uns allerhand Scherereien bereitet!
- * War das ein bloeder Fehler in Motif 1.2! Diese Version vertraegt ab-
- * solut keine ShellWidgetClass noch overrideShellWidgetClass!!!! Naja,
- * mit einer vendorShellWidgetClass laesst sich aber exakt der gleiche
- * Effekt erreichen. NEU: vor allem funktioniert dann endlich auch
- * Drag'n'Drop!!!
- * Noch neuer: Wenn die Liste dauerhaft angezeigt werden muss, entfaellt
- * diese Shell zwangslaeufig. Dann ist das Listenfeld ein direktes Kind
- * der ComboBox.
- */
- if ( !newW->combobox.StaticList ) {
- newW->combobox.PopupShell = XtVaCreateWidget(
- "combobox_shell", vendorShellWidgetClass, (Widget) newW,
- XmNoverrideRedirect, True,
- XmNsaveUnder, False,
- XmNallowShellResize, True,
- NULL);
- XtAddEventHandler(newW->combobox.PopupShell,
- EnterWindowMask | LeaveWindowMask,
- False, (XtEventHandler) OverrideShellCallback,
- (XtPointer) newW);
- } else {
- /*
- * Sieht ja pervers nach einer Rekursion aus...daher: OBACHT!
- */
- newW->combobox.PopupShell = (Widget) newW;
- }
-
-/*
- * Nun kommt die Drop-Down-Liste an die Reihe. Die Liste muss dabei
- * mit einer Convenience-Funktion erstellt werden, damit ein Rollbalken
- * 'dran ist und das Ganze wird dann in eine Override-Shell gepackt.
- * Nicht zu vergessen ist der XtManageChild-Aufruf, damit die Liste
- * sofort nach dem Aufklappen der Shell sichtbar wird.
- */
- XtSetArg(args[n], XmNselectionPolicy, newW->combobox.SelectionPolicy); n++;
-
- if ( !newW->combobox.StaticList ) {
- /*
- * Es gibt halt so eine ganze Reihe von Einstellungen, die koennen nicht
- * veraendert werden, wenn das Listenfeld nur bei Bedarf ausgeklappt wird.
- */
- XtSetArg(args[n], XmNhighlightThickness, 0); n++;
- }
- XtSetArg(args[n], XmNlistSizePolicy,
- newW->combobox.ListSizePolicy); n++;
- XtSetArg(args[n], XmNscrollBarDisplayPolicy,
- newW->combobox.ScrollBarDisplayPolicy); n++;
-
- XtSetArg(args[n], XmNautomaticSelection,
- newW->combobox.AutomaticSelection); n++;
- XtSetArg(args[n], XmNvisibleItemCount,
- newW->combobox.VisibleItemCount); n++;
- newW->combobox.ListCtrl = XmCreateScrolledList(
- newW->combobox.PopupShell, "list",
- args, n);
-
-/*
- * Fuer den Fall, dass die Liste in einer eigenen Shell steckt und daher frei
- * auf dem Bildschirm herumschweben kann, sollten wir sicherheitshalber die
- * Tastaturbedienung (Fokus) abschalten, um Probleme zu vermeiden (jedenfalls
- * hoffentlich...!)
- */
- if ( !newW->combobox.StaticList ) {
- XtVaSetValues(newW->combobox.ListCtrl,
- XmNtraversalOn, False, NULL);
- XtVaSetValues(XtParent(newW->combobox.ListCtrl),
- XmNtraversalOn, False, NULL);
- } else {
- if ( !newW->combobox.Editable ) {
- XtVaSetValues(XtParent(newW->combobox.ListCtrl),
- XmNtraversalOn, False, NULL);
- XmRemoveTabGroup(newW->combobox.ListCtrl);
- }
- }
-
- XtManageChild(newW->combobox.ListCtrl);
- XtAddCallback(newW->combobox.ListCtrl,
- XmNsingleSelectionCallback,
- (XtCallbackProc) ListSelectionCallback,
- (XtPointer) newW);
- XtAddCallback(newW->combobox.ListCtrl,
- XmNbrowseSelectionCallback,
- (XtCallbackProc) ListSelectionCallback,
- (XtPointer) newW);
- XtAddCallback(newW->combobox.ListCtrl,
- XmNdefaultActionCallback,
- (XtCallbackProc) ListDefaultActionCallback,
- (XtPointer) newW);
- XtAddCallback(newW->combobox.ListCtrl,
- XmNhelpCallback,
- (XtCallbackProc) HelpCallback,
- (XtPointer) newW);
-
- XtAddEventHandler(newW->combobox.ListCtrl,
- ButtonReleaseMask,
- False, (XtEventHandler) Button1UpInList,
- (XtPointer) newW);
-
-#ifdef NODRAGNDROP
- XtOverrideTranslations(newW->combobox.ListCtrl,
- NewListTranslations);
-#endif
- if ( newW->combobox.StaticList && newW->combobox.Editable )
- XtOverrideTranslations(newW->combobox.ListCtrl,
- NewListTranslationsE);
-
-/* Jetzt wird es dann erst richtig spannend... Zuerst alle evtl.
- * in der Resource-Datenbank abgelegten Resourcen an die Kinder
- * weitergeben. Danach die uebergebenen Parameter ebenfalls an
- * die Kinder weiterreichen und schliesslich das Layout ermitteln.
- */
- InitMirrorResources(newW);
- UpdateColors(newW, -1);
- SetValues(newW, newW, newW, wargs, ArgCount);
-
- if ( newW->combobox.ConvertBitmapToPixmap )
- newW->combobox.LabelPixmap =
- BitmapToPixmap(newW, XmNlabelPixmap,
- ((XmLabelRec *) newW->combobox.LabelCtrl)->
- label.normal_GC);
- if ( newW->combobox.ConvertBitmapToPixmapInsensitive )
- newW->combobox.LabelInsensitivePixmap =
- BitmapToPixmap(newW, XmNlabelInsensitivePixmap,
- ((XmLabelRec *) newW->combobox.LabelCtrl)->
- label.insensitive_GC);
-
- DefaultGeometry(newW, &width, &height, &dummy, &dummy);
- if ( newW->core.width == 0 )
- newW->core.width = width;
- if ( newW->core.height == 0 )
- newW->core.height = height;
-
-/*
- * Falls wir keine Fontliste besitzen, dann nehmen wir die von
- * dem Eingabefeld...
- */
- if ( newW->combobox.Font == NULL ) {
- XtVaGetValues(newW->combobox.EditCtrl,
- XmNfontList, &newW->combobox.Font, NULL);
- XtVaSetValues(newW->combobox.ListCtrl,
- XmNfontList, newW->combobox.Font, NULL);
- } else {
- XtVaSetValues(newW->combobox.ListCtrl,
- XmNfontList, newW->combobox.Font, NULL);
- XtVaSetValues(newW->combobox.EditCtrl,
- XmNfontList, newW->combobox.Font, NULL);
- }
-
-/*
- * Initialisiere alle Statusflaggen, die mit diesem unseligen Focus-
- * problem zu tun haben...
- */
- newW->combobox.ListVisible = False;
- newW->combobox.IgnoreFocusOut = False;
- newW->combobox.PendingFocusOut = False;
- newW->combobox.PendingOverrideInOut = False;
-
- newW->combobox.PassVerification = False;
-
-/*
- * Jooa... bei der OSF pennen die wohl komplett?! Zusammen mit Form-
- * Widgets gibt das wohl immer Aerger...daher hier ein DoLayout()
- * aufrufen, damit Eingabefeld und Pfeil sowie das Listenfeld an der
- * richtigen Stelle sitzen!
- */
- DoLayout(newW);
-/*
- * Endlich fertig mit der Initialisierung. Das hier ist aber auch
- * wirklich viel Arbeit fuer so ein Widget!
- */
- newW->combobox.InInit = False;
-} /* Initialize */
-
-/* --------------------------------------------------------------------
- * Diese Funktionen bitte nur im aeussersten Notfall benutzen, da sie
- * die Abstraktion dieser neuen Klasse umgehen und Informationen ueber
- * den internen Aufbau voraussetzen.
- */
-Widget XmComboBoxGetEditWidget(Widget w)
-{
- return ((XmComboBoxWidget) w)->combobox.EditCtrl;
-} /* XmComboBoxGetEditWidget */
-
-Widget XmComboBoxGetListWidget(Widget w)
-{
- return ((XmComboBoxWidget) w)->combobox.ListCtrl;
-} /* XmComboBoxGetListWidget */
-
-Widget XmComboBoxGetLabelWidget(Widget w)
-{
- return ((XmComboBoxWidget) w)->combobox.LabelCtrl;
-} /* XmComboBoxGetLabelWidget */
-
-
-/* --------------------------------------------------------------------
- * Sobald sich im Listenfeld Eintraege veraenderten, sei es, dass sie
- * geloescht wurden, sei es, dass sie veraendert wurden, so muss hier
- * gegebenenfalls auch der Text im Eingabefeld angepasst werden.
- * Letzteres betrifft aber nur Combo-Boxen mit nicht editierbarem
- * Eingabefeld. In jedem Fall wird aber bei jeder Combo-Box-Type in
- * dem Fall, dass ein Eintrag geloescht wird, der darauffolgende
- * Eintrag markiert. Eigentlich ist dieses nur eine nette Geste
- * gegenueber dem Benutzer...
- *
- * Parameter:
- * w Combo-Box-Widget
- * Index Index auf denjenigen Eintrag der sich geaendert
- * hat, oder der geloescht wurde.
- * Deleted Zeigt an, ob der Eintrag geloescht wurde (True)
- * oder sich nur veraenderte (False)
- */
-static int UpdateComboBox(XmComboBoxWidget w, int Index, Boolean Deleted)
-{
- int OldIndex, ItemCount;
-
- OldIndex = XmComboBoxGetSelectedPos((Widget) w);
- if ( OldIndex == Index ) {
-/* Es betrifft den Eintrag, der auch momentan ausgewaehlt ist.
- * Sollte er geloescht werden, so nimm' (soweit vorhanden) den
- * naechsten Eintrag, wurde er ausgetauscht, so lass ihn ausge-
- * waehlt.
- */
- if ( Deleted ) {
- XtVaGetValues(w->combobox.ListCtrl,
- XmNitemCount, &ItemCount, NULL);
- if ( ItemCount != 0 ) {
- if ( Index >= ItemCount ) Index = ItemCount;
- /* Markieren des Eintrags, ohne jedoch jetzt schon
- * den Eintrag in die Eingabezeile zu kopieren.
- */
- SetSelectionPos(w, Index, False);
- }
- }
- }
-/* Das Problem betrifft uns nur bei nicht editierbaren Combo-Boxen
- * im vollen Umfang. Denn dann muss auch der Text im Eingabefeld
- * veraendert werden.
- */
- if ( !w->combobox.Editable ) {
- TransferToEditCtrl(w, Index, False);
- }
-
- return 1;
-} /* UpdateComboBox */
-
-
-/* --------------------------------------------------------------------
- * Die Eintragsposition finden, an der der Eintrag sortiert stehen
- * muesste. Naja, es wurde ja 'mal langsam Zeit, diese Routine etwas
- * aufzupolieren, damit sie schneller wird.
- */
-static int FindSortedItemPos(XmComboBoxWidget w, XmString item)
-{
- Widget ListBox = w->combobox.ListCtrl;
- XmStringTable Items;
- int ItemCount, index, Left, Right, Result;
- char *pItemText, *pCompareText;
- Boolean ExternSort;
- XmComboBoxSortingCallbackStruct data;
-
- XtVaGetValues(ListBox, XmNitems, &Items,
- XmNitemCount, &ItemCount, NULL);
- if ( ItemCount == 0 ) return 1;
-
- /*
- * Moechte das Programm die Kontrolle ueber den Sortiervorgang
- * uebernehmen? Dann bereite alles vor...
- */
- ExternSort = XtHasCallbacks((Widget) w, XmNsortingCallback) ==
- XtCallbackHasSome;
- if ( ExternSort ) {
- data.reason = XmCR_SORTING;
- data.event = NULL;
- data.operation = XmOP_INIT;
- data.item = item;
- XtCallCallbacks((Widget) w, XmNsortingCallback, (XtPointer) &data);
- } else
- XmStringGetLtoR(item, XmSTRING_DEFAULT_CHARSET, &pCompareText);
-
- Left = 0; Right = ItemCount - 1;
- do {
- index = (Left + Right) / 2;
- if ( ExternSort ) {
- data.operation = XmOP_COMPARE;
- data.item = Items[index];
- data.result = 1;
- XtCallCallbacks((Widget) w, XmNsortingCallback, (XtPointer) &data);
- Result = data.result;
- } else {
- XmStringGetLtoR(Items[index], XmSTRING_DEFAULT_CHARSET, &pItemText);
- Result = strcmp(pCompareText, pItemText);
- XtFree(pItemText);
- }
- if ( Result < 0 ) Right = index - 1;
- else if ( Result > 0 ) Left = index + 1;
- } while ( (Result != 0) && (Left <= Right) );
-
- /*
- * Nach Gebrauch wieder alles aufraeumen (bei einer externen Sortierung
- * muss das das Programm uebernehmen!)
- */
- if ( ExternSort ) {
- data.operation = XmOP_DONE;
- XtCallCallbacks((Widget) w, XmNsortingCallback, (XtPointer) &data);
- } else
- XtFree(pCompareText);
-
- if ( Result < 0 )
- return index + 1; /* Beachte, dass Indizes mit 1 beginnen! */
- else
- return index + 2; /* Beachte, dass Indizes mit 1 beginnen! */
-} /* FindSortedItemPos */
-
-/* --------------------------------------------------------------------
- * Kontrolliere, ob es sich ueberhaupt um eine Combo-Box (bzw. einen
- * hypothetischen Nachkommen) handelt -- ansonsten mecker kraeftig
- * herum!
- * Ergebnis:
- * True, falls wir hier ein falsches Widget untergejubelt bekommen!
- */
-static Boolean CheckComboBox(Widget w, char *pFuncName)
-{
- char buff[256];
- char *pWName;
-
-#if (XmVersion >= 2000)
- return False; /* temporary workaround */
-#else
- if ( XmIsComboBox(w) ) return False;
- pWName = XrmQuarkToString(w->core.xrm_name);
- sprintf(buff,
-"Warning: %s called on widget named %s beeing \
-not a descendant of class XmComboBox!",
- pFuncName, pWName);
- XtWarning(buff);
- return True;
-#endif
-} /* CheckComboBox */
-
-/* --------------------------------------------------------------------
- * Saemtliche Interface-Routinen zur Combo-Box
- */
-/* Zunaechst alles fuer die Listbox */
-#define ListBox (((XmComboBoxWidget) w)->combobox.ListCtrl)
-#define EditBox (((XmComboBoxWidget) w)->combobox.EditCtrl)
-#define ComboBox ((XmComboBoxWidget) w)
-
-/* !!!
- * So angepasst, dass bei doppelt auftretenden Eintraegen, der
- * alte Eintrag weiterhin markiert bleibt. Diese Massnahme soll
- * eigentlich nur verhindern, dass zufaellig zwei Eintraege
- * markiert sind, falls nach der Anwahl eines Eintrages ein zweiter
- * gleichlautender Eintrag hinzugefuegt wurde.
- * Was hier die reine Lehre (oder war das die Leere?) anbetrifft:
- * in einer Combo-Box sollten sich sowieso nie gleichlautende
- * Eintraege befinden, da sie dort unsinnig sind und den Benutzer
- * nur verwirren...
- */
-void XmComboBoxAddItem(Widget w, XmString item, int pos)
-{
- int OldIndex = XmComboBoxGetSelectedPos(w);
-
- if ( CheckComboBox(w, "XmComboBoxAddItem") ) return;
- if ( ComboBox->combobox.Sorted )
- pos = FindSortedItemPos(ComboBox, item);
- XmListAddItem(ListBox, item, pos);
- if ( OldIndex != XmComboBoxGetSelectedPos(w) )
- /* Hier SetSelectionPos() statt XmComboBoxSelectPos(),
- * da der Text nicht in das Eingabefeld uebertragen werden
- * soll!
- */
- SetSelectionPos(ComboBox, OldIndex, False);
-} /* XmComboBoxAddItem */
-/* !!!
- * Hier gilt das bereits oben gesagte (siehe XmComboBoxAddItem).
- * Bei sortierten Listboxen wird die Sortierung beim Gebrauch dieser
- * Funktion zerstoert!
- */
-void XmComboBoxAddItems(Widget w, XmString *items, int item_count, int pos)
-{
- int OldIndex = XmComboBoxGetSelectedPos(w);
-
- if ( CheckComboBox(w, "XmComboBoxAddItems") ) return;
- XmListAddItems(ListBox, items, item_count, pos);
- if ( OldIndex != XmComboBoxGetSelectedPos(w) )
- /* Siehe Anmerkung in XmComboBoxAddItem */
- SetSelectionPos(ComboBox, OldIndex, False);
-} /* XmComboBoxAddItems */
-
-void XmComboBoxAddItemUnselected(Widget w, XmString item, int pos)
-{ XmListAddItemUnselected(ListBox, item, pos); }
-
-/* !!!
- * Da bei den folgenden Routinen jeweils ein oder mehrere Eintraege
- * geloescht oder veraendert werden, muss gegebenefalls das Eingabe-
- * feld bei nicht editierbaren Combo-Boxen auf Vordermann gebracht
- * werden.
- */
-void XmComboBoxDeleteItem(Widget w, XmString item)
-{
- int Index = XmListItemPos(ListBox, item);
-
- if ( CheckComboBox(w, "XmComboBoxDeleteItem") ) return;
- if ( Index ) XmComboBoxDeletePos(w, Index);
-} /* XmComboBoxDeleteItem */
-
-void XmComboBoxDeleteItems(Widget w, XmString *items, int item_count)
-{
- int i;
-
- if ( CheckComboBox(w, "XmComboBoxDeleteItems") ) return;
- for ( i = 0; i < item_count; i++ )
- XmListDeleteItem(w, items[i]);
-} /* XmComboBoxDeleteItems */
-
-void XmComboBoxDeletePos(Widget w, int pos)
-{
- int OldIndex = XmComboBoxGetSelectedPos(w);
-
- if ( CheckComboBox(w, "XmComboBoxDeletePos") ) return;
- XmListDeletePos(ListBox, pos);
- if ( pos == OldIndex ) UpdateComboBox(ComboBox, pos, True);
-} /* XmComboBoxDeletePos */
-
-void XmComboBoxDeleteItemsPos(Widget w, int item_count, int pos)
-{
- int i;
-
- if ( CheckComboBox(w, "XmComboBoxDeleteItemsPos") ) return;
- for ( i = 0; i < item_count; i++ )
- XmComboBoxDeletePos(w, pos++);
-} /* XmComboBoxDeleteItemsPos */
-
-void XmComboBoxDeleteAllItems(Widget w)
-{
- if ( CheckComboBox(w, "XmComboBoxAllDeleteItems") ) return;
- XmListDeleteAllItems(ListBox);
- UpdateComboBox(ComboBox, 0, True);
-} /* XmComboBoxDeleteAllItems */
-
-/* !!!
- * Werden Eintraege ausgetauscht, so heisst es fuer uns, auch hierbei
- * auf der Hut zu sein.
- */
-void XmComboBoxReplaceItems(Widget w, XmString *old_items, int item_count, XmString *new_items)
-{
- if ( CheckComboBox(w, "XmComboBoxReplaceItems") ) return;
- XmListReplaceItems(ListBox, old_items, item_count, new_items);
- UpdateComboBox(ComboBox, XmComboBoxGetSelectedPos(w), False);
-} /* XmComboBoxReplaceItems */
-
-void XmComboBoxReplaceItemsPos(Widget w, XmString *new_items, int item_count, int position)
-{
- int OldIndex = XmComboBoxGetSelectedPos(w);
-
- if ( CheckComboBox(w, "XmComboBoxReplaceItemsPos") ) return;
- XmListReplaceItemsPos(ListBox, new_items, item_count, position);
- if ( (OldIndex >= position) && (OldIndex < position + item_count) )
- UpdateComboBox(ComboBox, OldIndex, False);
-} /* XmComboBoxReplaceItemsPos */
-
-Boolean XmComboBoxItemExists(Widget w, XmString item)
-{
- if ( CheckComboBox(w, "XmComboBoxItemExists") ) return False;
- return XmListItemExists(ListBox, item);
-} /* XmComboBoxItemExists */
-
-int XmComboBoxItemPos(Widget w, XmString item)
-{
- if ( CheckComboBox(w, "XmComboBoxItemPos") ) return 0;
- return XmListItemPos(ListBox, item);
-} /* XmComboBoxItemPos */
-
-Boolean XmComboBoxGetMatchPos(Widget w, XmString item, int **pos_list, int *pos_count)
-{
- if ( CheckComboBox(w, "XmComboBoxGetMatchPos") ) return False;
- return XmListGetMatchPos(ListBox, item, pos_list, pos_count);
-} /* XmComboBoxGetMatchPos */
-
-/* !!!
- * Sobald ein anderer Eintrag in der Listbox ausgewaehlt werden soll,
- * muessen wir hier helfend eingreifen.
- */
-void XmComboBoxSelectPos(Widget w, int pos, Boolean notify)
-{
- int index;
-
- if ( CheckComboBox(w, "XmComboBoxSelectPos") ) return;
- index = SetSelectionPos(ComboBox, pos, notify);
- if ( index ) TransferToEditCtrl(ComboBox, index, False);
-} /* XmComboBoxSelectPos */
-
-/* !!!
- * dto. analog zu XmComboBoxSelectPos, nur statt des Index wird der
- * Eintragstext angegeben, um einen Eintrag in der Listbox zu
- * markieren.
- */
-void XmComboBoxSelectItem(Widget w, XmString item, Boolean notify)
-{
- int index;
-
- if ( CheckComboBox(w, "XmComboBoxSelectItem") ) return;
- XmListSelectItem(ListBox, item, notify);
- index = SetSelectionPos(ComboBox, XmComboBoxGetSelectedPos(w), False);
- if ( index ) TransferToEditCtrl(ComboBox, index, False);
-} /* XmComboBoxSelectItem */
-
-/* !!!
- * Geaendert gegenueber dem ListBox-Pendant! Da in einer Combo-Box die
- * Liste nur maximal einen ausgewaehlten Eintrag besitzt, macht die
- * 'alte' Funktionalitaet von XmListGetSelectedPos ziemlich wenig Sinn.
- * Die neue Routine liefert statt dessen direkt den Index des aus-
- * gewaehlten Eintrages oder 0 zurueck.
- */
-int XmComboBoxGetSelectedPos(Widget w)
-{
- int *SelectionList, SelectionCount, SelectionIndex;
-
- if ( CheckComboBox(w, "XmComboBoxGetSelectedPos") ) return 0;
- if ( XmListGetSelectedPos(ListBox,
- &SelectionList, &SelectionCount) ) {
- SelectionIndex = *SelectionList;
- XtFree((char *)SelectionList);
- } else SelectionIndex = 0;
- return SelectionIndex;
-} /* XmComboBoxGetSelectedPos */
-
-
-
-void XmComboBoxClearSelection(Widget w, Time time)
-{
- XmTextFieldClearSelection(EditBox, time);
-} /* XmComboBoxClearSelection */
-
-Boolean XmComboBoxCopy(Widget w, Time time)
-{
- return XmTextFieldCopy(EditBox, time);
-} /* XmComboBoxCopy */
-
-Boolean XmComboBoxCut(Widget w, Time time)
-{
- return XmTextFieldCut(EditBox, time);
-} /* XmComboBoxCut */
-
-XmTextPosition XmComboBoxGetInsertionPosition(Widget w)
-{
- return XmTextFieldGetInsertionPosition(EditBox);
-} /* XmComboBoxGetInsertionPosition */
-
-XmTextPosition XmComboBoxGetLastPosition(Widget w)
-{
- return XmTextFieldGetLastPosition(EditBox);
-} /* XmComboBoxGetLastPosition */
-
-int XmComboBoxGetMaxLength(Widget w)
-{
- return XmTextFieldGetMaxLength(EditBox);
-} /* XmComboBoxGetMaxLength */
-
-char * XmComboBoxGetSelection(Widget w)
-{
- return XmTextFieldGetSelection(EditBox);
-} /* XmComboBoxGetSelection */
-
-Boolean XmComboBoxGetSelectionPosition(Widget w, XmTextPosition *left,
- XmTextPosition *right)
-{
- return XmTextFieldGetSelectionPosition(EditBox, left, right);
-} /* XmComboBoxGetSelectionPosition */
-
-char * XmComboBoxGetString(Widget w)
-{
- return XmTextFieldGetString(EditBox);
-} /* XmComboBoxGetString */
-
-void XmComboBoxInsert(Widget w, XmTextPosition position, char *value)
-{
- XmTextFieldInsert(EditBox, position, value);
-} /* XmComboBoxInsert */
-
-Boolean XmComboBoxPaste(Widget w)
-{
- return XmTextFieldPaste(EditBox);
-} /* XmComboBoxPaste */
-
-Boolean XmComboBoxRemove(Widget w)
-{
- return XmTextFieldRemove(EditBox);
-} /* XmComboBoxRemove */
-
-void XmComboBoxReplace(Widget w, XmTextPosition from_pos,
- XmTextPosition to_pos, char *value)
-{
- XmTextFieldReplace(EditBox, from_pos, to_pos, value);
-} /* XmComboBoxReplace */
-
-void XmComboBoxSetAddMode(Widget w, Boolean state)
-{
- XmTextFieldSetAddMode(EditBox, state);
-} /* XmComboBoxSetAddMode */
-
-void XmComboBoxSetHighlight(Widget w, XmTextPosition left,
- XmTextPosition right, XmHighlightMode mode)
-{
- XmTextFieldSetHighlight(EditBox, left, right, mode);
-} /* XmComboBoxSetHighlight */
-
-void XmComboBoxSetInsertionPosition(Widget w, XmTextPosition position)
-{
- XmTextFieldSetInsertionPosition(EditBox, position);
-} /* XmComboBoxSetInsertionPosition */
-
-void XmComboBoxSetMaxLength(Widget w, int max_length)
-{
- XmTextFieldSetMaxLength(EditBox, max_length);
-} /* XmComboBoxSetMaxLength */
-
-void XmComboBoxSetSelection(Widget w, XmTextPosition first,
- XmTextPosition last, Time time)
-{
- XmTextFieldSetSelection(EditBox, first, last, time);
-} /* XmComboBoxSetSelection */
-
-void XmComboBoxSetString(Widget w, char *value)
-{
-/* Liebe OSF...ihr ^&*#%$*&)*(@$(*^(*&%# habt doch einen ziemlich gemeinen
- * Fehler in XmTextFieldSetString() drin... wenn man einen leeren String
- * (also "") angiebt, gibt's nur noch Aerger, wenn man spaeter wieder an
- * den Inhalt des Eingabefeldes heranwill.
- */
- if ( (value == NULL) || (*value == 0) )
- XtVaSetValues(w, XmNvalue, "", NULL);
- else
- XmTextFieldSetString(EditBox, value);
-} /* XmComboBoxSetString */
-
-void XmComboBoxShowPosition(Widget w, XmTextPosition position)
-{
- XmTextFieldShowPosition(EditBox, position);
-} /* XmComboBoxShowPosition */
-
-/*
- * Loescht einen evtl. noch ausgewaehlten Eintrag in einer Combo Box,
- * wenn diese eine SelectionPolicy von XmSINGLE_SELECT hat.
- */
-void XmComboBoxClearItemSelection(Widget w)
-{
- int index;
-
- if ( CheckComboBox(w, "XmComboBoxClearItemSelection") ) return;
-
- /*
- * Wenn bereits kein Eintrag markiert ist, dann loeschen wir nur noch
- * eben das Eingabefeld.
- */
- index = XmComboBoxGetSelectedPos(w);
- if ( index == 0 ) {
- XmComboBoxSetString(w, "");
- } else {
- /*
- * Ansonsten aktuellen Eintrag entsorgen (wie bei der Methode wipe-out)
- */
- TransferToEditCtrl(ComboBox, 0, True);
- CallSelectionCBL(ComboBox, NULL);
- }
-} /* XmComboBoxClearItemSelection */
-
-/* Die Drop-Down-Liste ein oder ausklappen */
-void XmComboBoxShowList(Widget w)
-{
- if ( CheckComboBox(w, "XmComboBoxShowList") ) return;
- ShowHideDropDownList((XmComboBoxWidget) w, NULL, False);
-} /* XmComboBoxShowList */
-
-void XmComboBoxHideList(Widget w)
-{
- if ( CheckComboBox(w, "XmComboBoxHideList") ) return;
- ShowHideDropDownList((XmComboBoxWidget) w, NULL, True);
-} /* XmComboBoxShowList */
-
-/*
- * Naja, ich komm' ja doch nicht um diese olle Funktion herum...
- */
-Widget XmCreateComboBox(Widget parent, String name, ArgList arglist,
- Cardinal argcount)
-{
- return XtCreateWidget(name, xmComboBoxWidgetClass, parent,
- arglist, argcount);
-} /* XmCreateComboBox */
-
-/* Ende von ComboBox.c */
-
-#endif /* XmVersion < 2000 */
diff --git a/src/motif/xmcombo/xmcombo.h b/src/motif/xmcombo/xmcombo.h
deleted file mode 100644
index 38540d7744..0000000000
--- a/src/motif/xmcombo/xmcombo.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * ComboBox.h - Das schon lange schmerzlich vermisste Combo-Box-
- * Widget -- nun endlich auf fuer Motif!
- *
- * Letzte Modifikation: 04.10.1995 Revisionsstand: 1.32a
- *
- * (c) 1993, 1994 Harald Albrecht
- * Institut fuer Geometrie und Praktische Mathematik
- * RWTH Aachen, Germany
- * albrecht@igpm.rwth-aachen.de
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program (see the file COPYING for more details);
- * if not, write to the Free Software Foundation, Inc., 675 Mass Ave,
- * Cambridge, MA 02139, USA.
- *
- */
-#ifndef __ComboBoxWidget_h
-#define __ComboBoxWidget_h
-
-#include
-
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
-#ifdef XmNselectionCallback
-#undef XmNselectionCallback
-#endif
-
-#define XmNselectionCallback "selectionCallback"
-#define XmCSelectionCallback "SelectionCallback"
-#define XmNunselectionCallback "unselectionCallback"
-#define XmCUnselectionCallback "UnselectionCallback"
-#define XmNdropDownCallback "dropDownCallback"
-#define XmCDropDownCallback "DropDownCallback"
-
-#define XmNdropDownCursor "dropDownCursor"
-#define XmCDropDownCursor "DropDownCursor"
-
-/* ICH GLAUB' ES JA EINFACH NICHT! DIESE @#$!%^ BEI DER OSF HABEN
- * DOCH TATSAECHLICH VERGESSEN, DASS DIE EINTRAEGE IN DER LISTBOX
- * VIELLEICHT AUCH SORTIERT SEIN SOLLEN -- MUSS MAN DENN ALLES
- * SELBST MACHEN?!
- */
-#define XmNsorted "sorted"
-#define XmCSorted "Sorted"
-#define XmNsortingCallback "sortingCallback"
-#define XmCSortingCallback "SortingCallback"
-
-#define XmNstaticList "staticList"
-#define XmCStaticList "StaticList"
-
-#define XmNsquareArrow "squareArrow"
-#define XmCSquareArrow "SquareArrow"
-#define XmNarrowSpacingOn "arrowSpacingOn"
-#define XmCArrowSpacingOn "ArrowSpacingOn"
-
-/*
- * Wie verhaeltsich die Liste, wenn der Focus verloren geht, sobald
- * der Mauszeiger aus dem Dialog herausbewegt wird?
- */
-#define XmNpersistentDropDown "persistentDropDown"
-#define XmCPersistentDropDown "PersistentDropDown"
-#define XmNtwmHandlingOn "twmHandlingOn"
-#define XmCTwmHandlingOn "TwmHandlingOn"
-/*
- * alles fuer das Label...
- */
-#define XmNshowLabel "showLabel"
-#define XmCShowLabel "ShowLabel"
-#define XmNdropDownOffset "dropDownOffset"
-#define XmCDropDownOffset "DropDownOffset"
-
-#define XmNlabelMarginBottom "labelMarginBottom"
-#define XmCLabelMarginBottom "LabelMarginBottom"
-#define XmNlabelMarginHeight "labelMarginHeight"
-#define XmCLabelMarginHeight "LabelMarginHeight"
-#define XmNlabelMarginLeft "labelMarginLeft"
-#define XmCLabelMarginLeft "LabelMarginLeft"
-#define XmNlabelMarginRight "labelMarginRight"
-#define XmCLabelMarginRight "LabelMarginRight"
-#define XmNlabelMarginTop "labelMarginTop"
-#define XmCLabelMarginTop "LabelMarginTop"
-#define XmNlabelMarginWidth "labelMarginWidth"
-#define XmCLabelMarginWidth "LabelMarginWidth"
-
-/* Callback reasons: (part. predefined)
- *
- * XmCR_SINGLE_SELECT user selected item in the list
- */
-
-typedef struct {
- int reason; /* Grund */
- XEvent *event; /* Ausloesender Event */
- XmString value; /* Ausgewaehlter Eintrag */
- int index; /* Index dieses Eintrages */
-} XmComboBoxSelectionCallbackStruct,XmComboBoxDefaultActionCallbackStruct;
-
-typedef struct {
- int reason;
- XEvent *event;
- Boolean doit;
- Position currInsert, newInsert;
- Position startPos, endPos;
- XmTextBlock text;
-} XmComboBoxTextVerifyCallbackStruct, *XmComboBoxTextVerifyPtr;
-
-/* Callback reasons: new
- *
- * XmCR_SHOW_LIST list is dropping down
- * XmCR_HIDE_LIST list is getting hidden
- *
- * XmCR_UNSELECT unselecting item from list or osfDelete
- */
-#define XmCR_SHOW_LIST 4200 /* ten times "42", that should */
-#define XmCR_HIDE_LIST 4201 /* explain everything of live... */
-#define XmCR_UNSELECT 4202
-typedef struct {
- int reason; /* Grund */
- XEvent *event; /* Ausloesender Event */
-} XmComboBoxDropDownCallbackStruct, XmComboBoxUnselectionCallbackStruct;
-
-#define XmCR_SORTING 4203
-#define XmOP_INIT 1
-#define XmOP_DONE 2
-#define XmOP_COMPARE 3
-typedef struct {
- int reason;
- XEvent *event; /* IMMER NULL!! */
- int operation;
- void *item_internal;
- XmString item;
- int result;
-} XmComboBoxSortingCallbackStruct, *XmComboBoxSortingPtr;
-
-/* Alle Funktionen, um auf die Liste der Combo-Box zuzugreifen.
- * Bitte immer diese Funktionen dazu benutzen und nicht direkt
- * auf das entsprechende Widget in der Combo-Box zugreifen!
- * Aus diesem Grunde sind auch nicht alle Funktionen einer Listbox
- * verfuegbar, da sich einige Funktionen mit der Verwaltung der
- * Combo-Box beissen wuerden.
- */
-extern void XmComboBoxAddItem(Widget w, XmString item, int pos);
-extern void XmComboBoxAddItems(Widget w, XmString *items, int item_count, int pos);
-extern void XmComboBoxAddItemUnselected(Widget w, XmString item, int pos);
-extern void XmComboBoxDeleteItem(Widget w, XmString item);
-extern void XmComboBoxDeleteItems(Widget w, XmString *items, int item_count);
-extern void XmComboBoxDeletePos(Widget w, int pos);
-extern void XmComboBoxDeleteItemsPos(Widget w, int item_count, int pos);
-extern void XmComboBoxDeleteAllItems(Widget w);
-extern void XmComboBoxReplaceItems(Widget w, XmString *old_items, int item_count, XmString *new_items);
-extern void XmComboBoxReplaceItemsPos(Widget w, XmString *new_items, int item_count, int position);
-extern Boolean XmComboBoxItemExists(Widget w, XmString item);
-extern int XmComboBoxItemPos(Widget w, XmString item);
-extern Boolean XmComboBoxGetMatchPos(Widget w, XmString item, int **pos_list, int *pos_count);
-extern void XmComboBoxSelectPos(Widget w, int pos, Boolean notify);
-extern void XmComboBoxSelectItem(Widget w, XmString item, Boolean notify);
-/* Etwas anders als bei der Listbox, da es sowieso nur einen ausge-
- * waehlten Eintrag in der Listbox geben kann!
- * Liefert Index des ausgewaehlten Eintrages oder 0.
- */
-extern int XmComboBoxGetSelectedPos(Widget w);
-extern void XmComboBoxClearItemSelection(Widget w);
-/*
- * Nun alle Funktionen, die auf das Eingabefeld zugreifen...
- * Auch hier gilt wieder, es gibt 'was auf die Finger, wenn jemand
- * versucht, direkt auf das Eingabefeld direkt zuzugreifen!
- */
-extern void XmComboBoxClearSelection(Widget w, Time time);
-extern Boolean XmComboBoxCopy(Widget w, Time time);
-extern Boolean XmComboBoxCut(Widget w, Time time);
-extern XmTextPosition XmComboBoxGetInsertionPosition(Widget w);
-extern XmTextPosition XmComboBoxGetLastPosition(Widget w);
-extern int XmComboBoxGetMaxLength(Widget w);
-extern char * XmComboBoxGetSelection(Widget w);
-extern Boolean XmComboBoxGetSelectionPosition(Widget w, XmTextPosition *left,
- XmTextPosition *right);
-extern char * XmComboBoxGetString(Widget w);
-extern void XmComboBoxInsert(Widget w, XmTextPosition position, char *value);
-extern Boolean XmComboBoxPaste(Widget w);
-extern Boolean XmComboBoxRemove(Widget w);
-extern void XmComboBoxReplace(Widget w, XmTextPosition from_pos,
- XmTextPosition to_pos, char *value);
-extern void XmComboBoxSetAddMode(Widget w, Boolean state);
-extern void XmComboBoxSetHighlight(Widget w, XmTextPosition left,
- XmTextPosition right, XmHighlightMode mode);
-extern void XmComboBoxSetInsertionPosition(Widget w, XmTextPosition position);
-extern void XmComboBoxSetMaxLength(Widget w, int max_length);
-extern void XmComboBoxSetSelection(Widget w, XmTextPosition first,
- XmTextPosition last, Time time);
-extern void XmComboBoxSetString(Widget w, char *value);
-extern void XmComboBoxShowPosition(Widget w, XmTextPosition position);
-
-extern WidgetClass xmComboBoxWidgetClass; /* Die Klasse hoechstselbst */
-
-#ifndef XmIsComboBox
-#define XmIsComboBox(w) XtIsSubclass(w, xmComboBoxWidgetClass)
-#endif /* XmIsComboBox */
-
-typedef struct _XmComboBoxClassRec *XmComboBoxWidgetClass;
-typedef struct _XmComboBoxRec *XmComboBoxWidget;
-
-extern Widget XmCreateComboBox(Widget parent, String name, ArgList arglist,
- Cardinal argcount);
-
-/* PLEASE do not use this functions if you really not need to do so !!! */
-extern Widget XmComboBoxGetEditWidget(Widget w);
-extern Widget XmComboBoxGetListWidget(Widget w);
-extern Widget XmComboBoxGetLabelWidget(Widget w);
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
-
-#endif /* __ComboBoxWidget_h */
-/* Ende von ComboBox.h */
diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 517ed56e32..70ea272e9d 100644
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -31,7 +31,7 @@
#include "wx/fontenum.h"
#include "wx/accel.h"
-#if defined (__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
+#if defined (__WXGTK__) || defined(__WXX11__)
#define wxHAVE_PRIMARY_SELECTION 1
#else
#define wxHAVE_PRIMARY_SELECTION 0
diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index d2d510efba..b73f091d8a 100644
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/unix/fontutil.cpp
-// Purpose: Font helper functions for wxX11, wxGTK, wxMotif
+// Purpose: Font helper functions for wxX11, wxGTK
// Author: Vadim Zeitlin
// Modified by:
// Created: 05.11.99
diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index 6c64fc7f7f..ee94197383 100644
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -72,7 +72,7 @@
#include
#define GetDisplay() GDK_DISPLAY()
#define GetXWindow(wxwin) GDK_WINDOW_XWINDOW((wxwin)->m_widget->window)
-#elif defined(__WXX11__) || defined(__WXMOTIF__)
+#elif defined(__WXX11__)
#include "wx/x11/privx.h"
#define GetDisplay() ((Display*)wxGlobalDisplay())
#define GetXWindow(wxwin) ((Window)(wxwin)->GetHandle())
diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 5aec2f3689..72f3b7e428 100644
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -8,7 +8,7 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__WXX11__) || defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXX11__) || defined(__WXGTK__)
// for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@ -2761,4 +2761,4 @@ wxDoLaunchDefaultBrowser(const wxLaunchBrowserParams& params)
return false;
}
-#endif // __WXX11__ || __WXGTK__ || __WXMOTIF__
+#endif // __WXX11__ || __WXGTK__
diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 63ba5bc0b7..7a90cfb967 100644
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -676,7 +676,7 @@ bool wxApp::HandlePropertyChange(WXEvent *WXUNUSED(event))
void wxApp::WakeUpIdle()
{
- // TODO: use wxMotif implementation?
+ // TODO:
// Wake up the idle handler processor, even if it is in another thread...
}
diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index 64c931482c..b5706a1ae0 100644
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -100,23 +100,14 @@ bool wxGLCanvas::Create(wxWindow *parent,
unsigned long wxGLCanvas::GetXWindow() const
{
- return (unsigned long)
-#ifdef __WXMOTIF__
- GetClientXWindow();
-#else
- GetClientAreaWindow();
-#endif
+ return (unsigned long)GetClientAreaWindow();
}
int wxGLCanvas::GetColourIndex(const wxColour& col_)
{
wxColour& col = const_cast(col_);
-#ifdef __WXMOTIF__
- col.AllocColour(GetXDisplay());
-#else
col.CalcPixel(wxTheApp->GetMainColormap(wxGetDisplay()));
-#endif
return col.GetPixel();
}
diff --git a/src/x11/utils.cpp b/src/x11/utils.cpp
index c1788e30da..eb1e2e6e4b 100644
--- a/src/x11/utils.cpp
+++ b/src/x11/utils.cpp
@@ -151,7 +151,7 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
}
-// Configurable display in wxX11 and wxMotif
+// Configurable display in wxX11
static Display *gs_currentDisplay = NULL;
static wxString gs_displayName;
diff --git a/src/x11/utilsx.cpp b/src/x11/utilsx.cpp
index 335078fb05..c43cd750cf 100644
--- a/src/x11/utilsx.cpp
+++ b/src/x11/utilsx.cpp
@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/x11/utilsx.cpp
-// Purpose: Private functions common to X11 and Motif ports
+// Purpose: Private functions for X11
// Author: Mattia Barbon
// Modified by:
// Created: 05/04/03
diff --git a/src/xrc/xh_tglbtn.cpp b/src/xrc/xh_tglbtn.cpp
index 5387092d24..b6d0ccf113 100644
--- a/src/xrc/xh_tglbtn.cpp
+++ b/src/xrc/xh_tglbtn.cpp
@@ -13,7 +13,7 @@
#if wxUSE_XRC && wxUSE_TOGGLEBTN
-# if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !(defined(__WXGTK__) && !defined(__WXGTK20__))
+# if !defined(__WXUNIVERSAL__) && !(defined(__WXGTK__) && !defined(__WXGTK20__))
# define wxHAVE_BITMAPS_IN_BUTTON 1
# endif
diff --git a/tests/image/image.cpp b/tests/image/image.cpp
index 00ac928a03..80db358f7c 100644
--- a/tests/image/image.cpp
+++ b/tests/image/image.cpp
@@ -1474,7 +1474,7 @@ void ImageTestCase::ScaleCompare()
void ImageTestCase::CreateBitmapFromCursor()
{
-#if !defined __WXOSX_IPHONE__ && !defined __WXDFB__ && !defined __WXMOTIF__ && !defined __WXX11__
+#if !defined __WXOSX_IPHONE__ && !defined __WXDFB__ && !defined __WXX11__
wxImage image("image/wx.png");
wxCursor cursor(image);
diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index f34bf67e08..516c644a60 100644
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -46,10 +46,6 @@ hvApp::hvApp()
bool hvApp::OnInit()
{
-#ifdef __WXMOTIF__
- delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
-#endif
-
wxArtProvider::Push(new AlternateArtProvider);
int istyle = wxHF_DEFAULT_STYLE;
@@ -209,10 +205,6 @@ bool hvApp::OnInit()
m_helpController->AddBook(fileName);
}
-#ifdef __WXMOTIF__
- delete wxLog::SetActiveTarget(new wxLogGui);
-#endif
-
m_helpController->DisplayContents();
return true;
@@ -303,7 +295,7 @@ if ( id == artId ) return wxBitmap(xpmRc##_xpm);
// wxIcon ctor. This depends on the platform:
#if defined(__WXUNIVERSAL__)
#define CREATE_STD_ICON(iconId, xpmRc) return wxNullBitmap;
-#elif defined(__WXGTK__) || defined(__WXMOTIF__)
+#elif defined(__WXGTK__)
#define CREATE_STD_ICON(iconId, xpmRc) return wxBitmap(xpmRc##_xpm);
#else
#define CREATE_STD_ICON(iconId, xpmRc) \
diff --git a/wxwin.m4 b/wxwin.m4
index 5a0265ea92..67d89b8ad4 100644
--- a/wxwin.m4
+++ b/wxwin.m4
@@ -573,7 +573,7 @@ dnl WX_STANDARD_OPTIONS([options-to-add])
dnl
dnl Adds to the configure script one or more of the following options:
dnl --enable-[debug|unicode|shared|wxshared|wxdebug]
-dnl --with-[gtk|msw|motif|x11|mac|dfb]
+dnl --with-[gtk|msw|x11|mac|dfb]
dnl --with-wxversion
dnl Then checks for their presence and eventually set the DEBUG, UNICODE, SHARED,
dnl PORT, WX_SHARED, WX_DEBUG, variables to one of the "yes", "no", "auto" values.
@@ -616,11 +616,11 @@ AC_DEFUN([WX_STANDARD_OPTIONS],
dnl PORT must be one of the allowed values
if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a "$TOOLKIT" != "gtk3" -a \
- "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
+ "$TOOLKIT" != "msw" -a \
"$TOOLKIT" != "osx_carbon" -a "$TOOLKIT" != "osx_cocoa" -a \
"$TOOLKIT" != "dfb" -a "$TOOLKIT" != "x11" -a "$TOOLKIT" != "base"; then
AC_MSG_ERROR([
- Unrecognized option value (allowed values: auto, gtk1, gtk2, gtk3, msw, motif, osx_carbon, osx_cocoa, dfb, x11, base)
+ Unrecognized option value (allowed values: auto, gtk1, gtk2, gtk3, msw, osx_carbon, osx_cocoa, dfb, x11, base)
])
fi
@@ -875,7 +875,6 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
WX_GTKPORT3=$(expr "$WX_SELECTEDCONFIG" : ".*gtk3.*")
WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*")
- WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*")
WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
WX_OSXCARBONPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_carbon.*")
WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*")
@@ -887,7 +886,6 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
if test "$WX_GTKPORT3" != "0"; then WX_PORT="gtk3"; fi
if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi
- if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi
if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
if test "$WX_OSXCARBONPORT" != "0"; then WX_PORT="osx_carbon"; fi
if test "$WX_X11PORT" != "0"; then WX_PORT="x11"; fi