moved wxWave, wxJoystick and wxTaskBarIcon to wxAdvanced

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index cd1a3fc255295d7ce46a0df7bd8ad8a751957994..a5371865326833c57f71e43e707c01235b13e00a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -66,7 +66,8 @@ ADVDLL_OBJECTS =  \
        advdll_sashwin.o \
        advdll_splash.o \
        advdll_tipdlg.o \
-       advdll_wizard.o
+       advdll_wizard.o \
+       $(__ADVANCED_PLATFORM_SRC_OBJECTS_2)
 ADVLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
        $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
@@ -83,7 +84,8 @@ ADVLIB_OBJECTS =  \
        advlib_sashwin.o \
        advlib_splash.o \
        advlib_tipdlg.o \
-       advlib_wizard.o
+       advlib_wizard.o \
+       $(__ADVANCED_PLATFORM_SRC_OBJECTS_3)
 ALL_HEADERS =  \
        wx/app.h \
        wx/apptrait.h \
@@ -203,11 +205,15 @@ ALL_HEADERS =  \
        wx/generic/splash.h \
        wx/generic/wizard.h \
        wx/grid.h \
+       wx/joystick.h \
        wx/laywin.h \
        wx/sashwin.h \
        wx/splash.h \
+       wx/taskbar.h \
        wx/tipdlg.h \
+       wx/wave.h \
        wx/wizard.h \
+       $(ADVANCED_PLATFORM_HDR) \
        wx/html/forcelnk.h \
        wx/html/helpctrl.h \
        wx/html/helpdata.h \
@@ -818,6 +824,18 @@ XMLLIB_OBJECTS =  \
 
 ### Conditionally set variables: ###
 
+@COND_TOOLKIT_GTK@ADVANCED_PLATFORM_HDR = \
+@COND_TOOLKIT_GTK@     wx/unix/joystick.h wx/unix/taskbarx11.h wx/unix/wave.h
+@COND_TOOLKIT_MAC@ADVANCED_PLATFORM_HDR = \
+@COND_TOOLKIT_MAC@     wx/mac/joystick.h wx/mac/wave.h
+@COND_TOOLKIT_MOTIF@ADVANCED_PLATFORM_HDR = \
+@COND_TOOLKIT_MOTIF@   wx/unix/joystick.h wx/unix/taskbarx11.h wx/unix/wave.h
+@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_HDR = \
+@COND_TOOLKIT_MSW@     wx/msw/joystick.h wx/msw/taskbar.h wx/msw/wave.h
+@COND_TOOLKIT_OS2@ADVANCED_PLATFORM_HDR = \
+@COND_TOOLKIT_OS2@     wx/os2/joystick.h wx/os2/wave.h
+@COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \
+@COND_TOOLKIT_X11@     wx/unix/joystick.h wx/unix/taskbarx11.h wx/unix/wave.h
 COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS =  \
        wx/bmpbuttn.h \
        wx/brush.h \
@@ -943,7 +961,6 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS =  \
        wx/imagpnm.h \
        wx/imagtiff.h \
        wx/imagxpm.h \
-       wx/joystick.h \
        wx/listbase.h \
        wx/listctrl.h \
        wx/matrix.h \
@@ -970,7 +987,6 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS =  \
        wx/statline.h \
        wx/tab.h \
        wx/tabctrl.h \
-       wx/taskbar.h \
        wx/tbarbase.h \
        wx/tbarsmpl.h \
        wx/tglbtn.h \
@@ -983,7 +999,6 @@ COND_USE_GUI_1_WXUNIV_0_ALL_GUI_HEADERS =  \
        wx/vlbox.h \
        wx/vms_x_fix.h \
        wx/vscroll.h \
-       wx/wave.h \
        wx/xpmdecod.h \
        wx/xpmhand.h \
        $(LOWLEVEL_HDR) \
@@ -1114,7 +1129,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS =  \
        wx/imagpnm.h \
        wx/imagtiff.h \
        wx/imagxpm.h \
-       wx/joystick.h \
        wx/listbase.h \
        wx/listctrl.h \
        wx/matrix.h \
@@ -1141,7 +1155,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS =  \
        wx/statline.h \
        wx/tab.h \
        wx/tabctrl.h \
-       wx/taskbar.h \
        wx/tbarbase.h \
        wx/tbarsmpl.h \
        wx/tglbtn.h \
@@ -1154,7 +1167,6 @@ COND_USE_GUI_1_WXUNIV_1_ALL_GUI_HEADERS =  \
        wx/vlbox.h \
        wx/vms_x_fix.h \
        wx/vscroll.h \
-       wx/wave.h \
        wx/xpmdecod.h \
        wx/xpmhand.h \
        $(LOWLEVEL_HDR) \
@@ -1320,7 +1332,6 @@ COND_TOOLKIT_GTK_GUI_HDR =  \
        wx/gtk/gauge.h \
        wx/gtk/gdiobj.h \
        wx/gtk/icon.h \
-       wx/gtk/joystick.h \
        wx/gtk/listbox.h \
        wx/gtk/mdi.h \
        wx/gtk/menu.h \
@@ -1349,7 +1360,6 @@ COND_TOOLKIT_GTK_GUI_HDR =  \
        wx/gtk/tooltip.h \
        wx/gtk/toplevel.h \
        wx/gtk/treectrl.h \
-       wx/gtk/wave.h \
        wx/gtk/win_gtk.h \
        wx/gtk/window.h
 @COND_TOOLKIT_GTK@GUI_HDR = $(COND_TOOLKIT_GTK_GUI_HDR)
@@ -1392,7 +1402,6 @@ COND_TOOLKIT_MAC_GUI_HDR =  \
        wx/mac/helpxxxx.h \
        wx/mac/icon.h \
        wx/mac/imaglist.h \
-       wx/mac/joystick.h \
        wx/mac/listbox.h \
        wx/mac/listctrl.h \
        wx/mac/macnotfy.h \
@@ -1432,7 +1441,6 @@ COND_TOOLKIT_MAC_GUI_HDR =  \
        wx/mac/toplevel.h \
        wx/mac/treectrl.h \
        wx/mac/uma.h \
-       wx/mac/wave.h \
        wx/mac/window.h \
        wx/generic/caret.h \
        wx/generic/fdrepdlg.h \
@@ -1549,7 +1557,6 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
        wx/msw/icon.h \
        wx/msw/imaglist.h \
        wx/msw/iniconf.h \
-       wx/msw/joystick.h \
        wx/msw/listbox.h \
        wx/msw/listctrl.h \
        wx/msw/mdi.h \
@@ -1593,7 +1600,6 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
        wx/msw/statline.h \
        wx/msw/stattext.h \
        wx/msw/tabctrl.h \
-       wx/msw/taskbar.h \
        wx/msw/tbar95.h \
        wx/msw/tbarmsw.h \
        wx/msw/textctrl.h \
@@ -1602,7 +1608,6 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
        wx/msw/tooltip.h \
        wx/msw/toplevel.h \
        wx/msw/treectrl.h \
-       wx/msw/wave.h \
        wx/msw/window.h \
        wx/msw/gnuwin32/winresrc.h \
        wx/msw/wx.manifest \
@@ -1679,7 +1684,6 @@ COND_TOOLKIT_OS2_GUI_HDR =  \
        wx/os2/helpwin.h \
        wx/os2/icon.h \
        wx/os2/iniconf.h \
-       wx/os2/joystick.h \
        wx/os2/listbox.h \
        wx/os2/menu.h \
        wx/os2/menuitem.h \
@@ -1712,7 +1716,6 @@ COND_TOOLKIT_OS2_GUI_HDR =  \
        wx/os2/toolbar.h \
        wx/os2/tooltip.h \
        wx/os2/toplevel.h \
-       wx/os2/wave.h \
        wx/os2/window.h
 @COND_TOOLKIT_OS2@GUI_HDR = $(COND_TOOLKIT_OS2_GUI_HDR)
 @COND_TOOLKIT_COCOA@LOWLEVEL_HDR = 
@@ -1720,7 +1723,6 @@ COND_TOOLKIT_GTK_LOWLEVEL_HDR =  \
        wx/generic/caret.h \
        wx/generic/printps.h \
        wx/unix/fontutil.h \
-       wx/unix/taskbarx11.h \
        wx/unix/utilsx11.h \
        wx/generic/paletteg.h
 @COND_TOOLKIT_GTK@LOWLEVEL_HDR = $(COND_TOOLKIT_GTK_LOWLEVEL_HDR)
@@ -1754,7 +1756,6 @@ COND_TOOLKIT_MOTIF_LOWLEVEL_HDR =  \
        wx/generic/caret.h \
        wx/generic/printps.h \
        wx/unix/fontutil.h \
-       wx/unix/taskbarx11.h \
        wx/unix/utilsx11.h
 @COND_TOOLKIT_MOTIF@LOWLEVEL_HDR = $(COND_TOOLKIT_MOTIF_LOWLEVEL_HDR)
 @COND_TOOLKIT_MSW@LOWLEVEL_HDR = 
@@ -1763,7 +1764,6 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
        wx/generic/caret.h \
        wx/generic/printps.h \
        wx/unix/fontutil.h \
-       wx/unix/taskbarx11.h \
        wx/unix/utilsx11.h \
        src/generic/timer.h \
        wx/x11/app.h \
@@ -1784,7 +1784,6 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
        wx/x11/font.h \
        wx/x11/gdiobj.h \
        wx/x11/icon.h \
-       wx/x11/joystick.h \
        wx/x11/minifram.h \
        wx/x11/palette.h \
        wx/x11/pen.h \
@@ -1822,6 +1821,88 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
+COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS =  \
+       monodll_taskbarcmn.o \
+       monodll_joystick.o \
+       monodll_taskbarx11.o \
+       monodll_wave.o
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS)
+@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS = \
+@COND_TOOLKIT_MAC@     monodll_joystick.o monodll_wave.o
+COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS =  \
+       monodll_taskbarcmn.o \
+       monodll_joystick.o \
+       monodll_taskbarx11.o \
+       monodll_wave.o
+@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS)
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS = \
+@COND_TOOLKIT_MSW@     monodll_taskbarcmn.o monodll_joystick.o \
+@COND_TOOLKIT_MSW@     monodll_taskbar.o monodll_wave.o
+@COND_TOOLKIT_OS2@__ADVANCED_PLATFORM_SRC_OBJECTS = \
+@COND_TOOLKIT_OS2@     monodll_joystick.o monodll_wave.o
+COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS =  \
+       monodll_taskbarcmn.o \
+       monodll_joystick.o \
+       monodll_taskbarx11.o \
+       monodll_wave.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS)
+COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
+       monolib_taskbarcmn.o \
+       monolib_joystick.o \
+       monolib_taskbarx11.o \
+       monolib_wave.o
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1)
+@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_MAC@     monolib_joystick.o monolib_wave.o
+COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
+       monolib_taskbarcmn.o \
+       monolib_joystick.o \
+       monolib_taskbarx11.o \
+       monolib_wave.o
+@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1)
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_MSW@     monolib_taskbarcmn.o monolib_joystick.o \
+@COND_TOOLKIT_MSW@     monolib_taskbar.o monolib_wave.o
+@COND_TOOLKIT_OS2@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_OS2@     monolib_joystick.o monolib_wave.o
+COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
+       monolib_taskbarcmn.o \
+       monolib_joystick.o \
+       monolib_taskbarx11.o \
+       monolib_wave.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1)
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_GTK@     advdll_taskbarcmn.o advdll_joystick.o \
+@COND_TOOLKIT_GTK@     advdll_taskbarx11.o advdll_wave.o
+@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_MAC@     advdll_joystick.o advdll_wave.o
+@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_MOTIF@   advdll_taskbarcmn.o advdll_joystick.o \
+@COND_TOOLKIT_MOTIF@   advdll_taskbarx11.o advdll_wave.o
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_MSW@     advdll_taskbarcmn.o advdll_joystick.o advdll_taskbar.o \
+@COND_TOOLKIT_MSW@     advdll_wave.o
+@COND_TOOLKIT_OS2@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_OS2@     advdll_joystick.o advdll_wave.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_X11@     advdll_taskbarcmn.o advdll_joystick.o \
+@COND_TOOLKIT_X11@     advdll_taskbarx11.o advdll_wave.o
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_GTK@     advlib_taskbarcmn.o advlib_joystick.o \
+@COND_TOOLKIT_GTK@     advlib_taskbarx11.o advlib_wave.o
+@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_MAC@     advlib_joystick.o advlib_wave.o
+@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_MOTIF@   advlib_taskbarcmn.o advlib_joystick.o \
+@COND_TOOLKIT_MOTIF@   advlib_taskbarx11.o advlib_wave.o
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_MSW@     advlib_taskbarcmn.o advlib_joystick.o advlib_taskbar.o \
+@COND_TOOLKIT_MSW@     advlib_wave.o
+@COND_TOOLKIT_OS2@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_OS2@     advlib_joystick.o advlib_wave.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_X11@     advlib_taskbarcmn.o advlib_joystick.o \
+@COND_TOOLKIT_X11@     advlib_taskbarx11.o advlib_wave.o
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@       = monodll_utilsunx.o
 @COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
@@ -3078,7 +3159,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS =  \
        monodll_fontdlg.o \
        monodll_frame.o \
        monodll_gauge.o \
-       monodll_joystick.o \
        monodll_listbox.o \
        monodll_mdi.o \
        monodll_menu.o \
@@ -3099,8 +3179,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS =  \
        monodll_tbargtk.o \
        monodll_textctrl.o \
        monodll_tglbtn.o \
-       monodll_utilsres.o \
-       monodll_wave.o
+       monodll_utilsres.o
 @COND_TOOLKIT_GTK@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK___GUI_SRC_OBJECTS)
 COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
        monodll_accel.o \
@@ -3138,7 +3217,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
        monodll_gauge.o \
        monodll_gdiobj.o \
        monodll_icon.o \
-       monodll_joystick.o \
        monodll_listbox.o \
        monodll_macnotfy.o \
        monodll_mdi.o \
@@ -3175,7 +3253,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
        monodll_tooltip.o \
        monodll_toplevel.o \
        monodll_uma.o \
-       monodll_wave.o \
        monodll_window.o \
        monodll_caret.o \
        monodll_fdrepdlg.o \
@@ -3339,7 +3416,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS =  \
        monodll_helpwin.o \
        monodll_icon.o \
        monodll_iniconf.o \
-       monodll_joystick.o \
        monodll_listbox.o \
        monodll_main.o \
        monodll_menu.o \
@@ -3372,7 +3448,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS =  \
        monodll_toolbar.o \
        monodll_tooltip.o \
        monodll_toplevel.o \
-       monodll_wave.o \
        monodll_window.o
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
@@ -3471,7 +3546,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 =  \
        monolib_fontdlg.o \
        monolib_frame.o \
        monolib_gauge.o \
-       monolib_joystick.o \
        monolib_listbox.o \
        monolib_mdi.o \
        monolib_menu.o \
@@ -3492,8 +3566,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 =  \
        monolib_tbargtk.o \
        monolib_textctrl.o \
        monolib_tglbtn.o \
-       monolib_utilsres.o \
-       monolib_wave.o
+       monolib_utilsres.o
 @COND_TOOLKIT_GTK@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
        monolib_accel.o \
@@ -3531,7 +3604,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
        monolib_gauge.o \
        monolib_gdiobj.o \
        monolib_icon.o \
-       monolib_joystick.o \
        monolib_listbox.o \
        monolib_macnotfy.o \
        monolib_mdi.o \
@@ -3568,7 +3640,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
        monolib_tooltip.o \
        monolib_toplevel.o \
        monolib_uma.o \
-       monolib_wave.o \
        monolib_window.o \
        monolib_caret.o \
        monolib_fdrepdlg.o \
@@ -3732,7 +3803,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 =  \
        monolib_helpwin.o \
        monolib_icon.o \
        monolib_iniconf.o \
-       monolib_joystick.o \
        monolib_listbox.o \
        monolib_main.o \
        monolib_menu.o \
@@ -3765,7 +3835,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1 =  \
        monolib_toolbar.o \
        monolib_tooltip.o \
        monolib_toplevel.o \
-       monolib_wave.o \
        monolib_window.o
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
@@ -3864,7 +3933,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 =  \
        coredll_fontdlg.o \
        coredll_frame.o \
        coredll_gauge.o \
-       coredll_joystick.o \
        coredll_listbox.o \
        coredll_mdi.o \
        coredll_menu.o \
@@ -3885,8 +3953,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 =  \
        coredll_tbargtk.o \
        coredll_textctrl.o \
        coredll_tglbtn.o \
-       coredll_utilsres.o \
-       coredll_wave.o
+       coredll_utilsres.o
 @COND_TOOLKIT_GTK@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
        coredll_accel.o \
@@ -3924,7 +3991,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
        coredll_gauge.o \
        coredll_gdiobj.o \
        coredll_icon.o \
-       coredll_joystick.o \
        coredll_listbox.o \
        coredll_macnotfy.o \
        coredll_mdi.o \
@@ -3961,7 +4027,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
        coredll_tooltip.o \
        coredll_toplevel.o \
        coredll_uma.o \
-       coredll_wave.o \
        coredll_window.o \
        coredll_caret.o \
        coredll_fdrepdlg.o \
@@ -4125,7 +4190,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 =  \
        coredll_helpwin.o \
        coredll_icon.o \
        coredll_iniconf.o \
-       coredll_joystick.o \
        coredll_listbox.o \
        coredll_main.o \
        coredll_menu.o \
@@ -4158,7 +4222,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2 =  \
        coredll_toolbar.o \
        coredll_tooltip.o \
        coredll_toplevel.o \
-       coredll_wave.o \
        coredll_window.o
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
@@ -4257,7 +4320,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 =  \
        corelib_fontdlg.o \
        corelib_frame.o \
        corelib_gauge.o \
-       corelib_joystick.o \
        corelib_listbox.o \
        corelib_mdi.o \
        corelib_menu.o \
@@ -4278,8 +4340,7 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 =  \
        corelib_tbargtk.o \
        corelib_textctrl.o \
        corelib_tglbtn.o \
-       corelib_utilsres.o \
-       corelib_wave.o
+       corelib_utilsres.o
 @COND_TOOLKIT_GTK@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
        corelib_accel.o \
@@ -4317,7 +4378,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
        corelib_gauge.o \
        corelib_gdiobj.o \
        corelib_icon.o \
-       corelib_joystick.o \
        corelib_listbox.o \
        corelib_macnotfy.o \
        corelib_mdi.o \
@@ -4354,7 +4414,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
        corelib_tooltip.o \
        corelib_toplevel.o \
        corelib_uma.o \
-       corelib_wave.o \
        corelib_window.o \
        corelib_caret.o \
        corelib_fdrepdlg.o \
@@ -4518,7 +4577,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 =  \
        corelib_helpwin.o \
        corelib_icon.o \
        corelib_iniconf.o \
-       corelib_joystick.o \
        corelib_listbox.o \
        corelib_main.o \
        corelib_menu.o \
@@ -4551,7 +4609,6 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 =  \
        corelib_toolbar.o \
        corelib_tooltip.o \
        corelib_toplevel.o \
-       corelib_wave.o \
        corelib_window.o
 @COND_TOOLKIT_OS2@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3)
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
@@ -4584,13 +4641,11 @@ COND_TOOLKIT_OS2___GUI_SRC_OBJECTS_3 =  \
 @COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS = 
 COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_taskbarcmn.o \
        monodll_caret.o \
        monodll_printps.o \
        monodll_dialup.o \
        monodll_fontenum.o \
        monodll_fontutil.o \
-       monodll_taskbarx11.o \
        monodll_utilsx11.o \
        monodll_paletteg.o \
        monodll_app.o \
@@ -4654,13 +4709,11 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
        monodll_window.o
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_taskbarcmn.o \
        monodll_caret.o \
        monodll_printps.o \
        monodll_dialup.o \
        monodll_fontenum.o \
        monodll_fontutil.o \
-       monodll_taskbarx11.o \
        monodll_utilsx11.o \
        monodll_bitmap.o \
        monodll_brush.o \
@@ -4669,7 +4722,6 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS =  \
        monodll_utilsx.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_taskbarcmn.o \
        monodll_app.o \
        monodll_bitmap.o \
        monodll_brush.o \
@@ -4697,7 +4749,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
        monodll_helpchm.o \
        monodll_helpwin.o \
        monodll_icon.o \
-       monodll_joystick.o \
        monodll_minifram.o \
        monodll_automtn.o \
        monodll_dataobj.o \
@@ -4711,24 +4762,20 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
        monodll_region.o \
        monodll_renderer.o \
        monodll_settings.o \
-       monodll_taskbar.o \
        monodll_timer.o \
        monodll_tooltip.o \
        monodll_toplevel.o \
        monodll_utilsgui.o \
        monodll_uxtheme.o \
-       monodll_wave.o \
        monodll_window.o
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS = 
 COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_taskbarcmn.o \
        monodll_caret.o \
        monodll_printps.o \
        monodll_dialup.o \
        monodll_fontenum.o \
        monodll_fontutil.o \
-       monodll_taskbarx11.o \
        monodll_utilsx11.o \
        monodll_timer.o \
        monodll_app.o \
@@ -4747,7 +4794,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
        monodll_font.o \
        monodll_gdiobj.o \
        monodll_icon.o \
-       monodll_joystick.o \
        monodll_main.o \
        monodll_minifram.o \
        monodll_nanox.o \
@@ -4764,13 +4810,11 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_0 = 
 COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 =  \
-       coredll_taskbarcmn.o \
        coredll_caret.o \
        coredll_printps.o \
        coredll_dialup.o \
        coredll_fontenum.o \
        coredll_fontutil.o \
-       coredll_taskbarx11.o \
        coredll_utilsx11.o \
        coredll_paletteg.o \
        coredll_app.o \
@@ -4834,13 +4878,11 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0 =  \
        coredll_window.o
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0 =  \
-       coredll_taskbarcmn.o \
        coredll_caret.o \
        coredll_printps.o \
        coredll_dialup.o \
        coredll_fontenum.o \
        coredll_fontutil.o \
-       coredll_taskbarx11.o \
        coredll_utilsx11.o \
        coredll_bitmap.o \
        coredll_brush.o \
@@ -4849,7 +4891,6 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0 =  \
        coredll_utilsx.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 =  \
-       coredll_taskbarcmn.o \
        coredll_app.o \
        coredll_bitmap.o \
        coredll_brush.o \
@@ -4877,7 +4918,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 =  \
        coredll_helpchm.o \
        coredll_helpwin.o \
        coredll_icon.o \
-       coredll_joystick.o \
        coredll_minifram.o \
        coredll_automtn.o \
        coredll_dataobj.o \
@@ -4891,24 +4931,20 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 =  \
        coredll_region.o \
        coredll_renderer.o \
        coredll_settings.o \
-       coredll_taskbar.o \
        coredll_timer.o \
        coredll_tooltip.o \
        coredll_toplevel.o \
        coredll_utilsgui.o \
        coredll_uxtheme.o \
-       coredll_wave.o \
        coredll_window.o
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0)
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_0 = 
 COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 =  \
-       coredll_taskbarcmn.o \
        coredll_caret.o \
        coredll_printps.o \
        coredll_dialup.o \
        coredll_fontenum.o \
        coredll_fontutil.o \
-       coredll_taskbarx11.o \
        coredll_utilsx11.o \
        coredll_timer.o \
        coredll_app.o \
@@ -4927,7 +4963,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 =  \
        coredll_font.o \
        coredll_gdiobj.o \
        coredll_icon.o \
-       coredll_joystick.o \
        coredll_main.o \
        coredll_minifram.o \
        coredll_nanox.o \
@@ -4944,13 +4979,11 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 =  \
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_8 = 
 COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 =  \
-       corelib_taskbarcmn.o \
        corelib_caret.o \
        corelib_printps.o \
        corelib_dialup.o \
        corelib_fontenum.o \
        corelib_fontutil.o \
-       corelib_taskbarx11.o \
        corelib_utilsx11.o \
        corelib_paletteg.o \
        corelib_app.o \
@@ -5014,13 +5047,11 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8 =  \
        corelib_window.o
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 =  \
-       corelib_taskbarcmn.o \
        corelib_caret.o \
        corelib_printps.o \
        corelib_dialup.o \
        corelib_fontenum.o \
        corelib_fontutil.o \
-       corelib_taskbarx11.o \
        corelib_utilsx11.o \
        corelib_bitmap.o \
        corelib_brush.o \
@@ -5029,7 +5060,6 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 =  \
        corelib_utilsx.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 =  \
-       corelib_taskbarcmn.o \
        corelib_app.o \
        corelib_bitmap.o \
        corelib_brush.o \
@@ -5057,7 +5087,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 =  \
        corelib_helpchm.o \
        corelib_helpwin.o \
        corelib_icon.o \
-       corelib_joystick.o \
        corelib_minifram.o \
        corelib_automtn.o \
        corelib_dataobj.o \
@@ -5071,24 +5100,20 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 =  \
        corelib_region.o \
        corelib_renderer.o \
        corelib_settings.o \
-       corelib_taskbar.o \
        corelib_timer.o \
        corelib_tooltip.o \
        corelib_toplevel.o \
        corelib_utilsgui.o \
        corelib_uxtheme.o \
-       corelib_wave.o \
        corelib_window.o
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8)
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_8 = 
 COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 =  \
-       corelib_taskbarcmn.o \
        corelib_caret.o \
        corelib_printps.o \
        corelib_dialup.o \
        corelib_fontenum.o \
        corelib_fontutil.o \
-       corelib_taskbarx11.o \
        corelib_utilsx11.o \
        corelib_timer.o \
        corelib_app.o \
@@ -5107,7 +5132,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 =  \
        corelib_font.o \
        corelib_gdiobj.o \
        corelib_icon.o \
-       corelib_joystick.o \
        corelib_main.o \
        corelib_minifram.o \
        corelib_nanox.o \
@@ -5124,13 +5148,11 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 =  \
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_9 = 
 COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 =  \
-       monolib_taskbarcmn.o \
        monolib_caret.o \
        monolib_printps.o \
        monolib_dialup.o \
        monolib_fontenum.o \
        monolib_fontutil.o \
-       monolib_taskbarx11.o \
        monolib_utilsx11.o \
        monolib_paletteg.o \
        monolib_app.o \
@@ -5194,13 +5216,11 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9 =  \
        monolib_window.o
 @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9)
 COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9 =  \
-       monolib_taskbarcmn.o \
        monolib_caret.o \
        monolib_printps.o \
        monolib_dialup.o \
        monolib_fontenum.o \
        monolib_fontutil.o \
-       monolib_taskbarx11.o \
        monolib_utilsx11.o \
        monolib_bitmap.o \
        monolib_brush.o \
@@ -5209,7 +5229,6 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9 =  \
        monolib_utilsx.o
 @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9)
 COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 =  \
-       monolib_taskbarcmn.o \
        monolib_app.o \
        monolib_bitmap.o \
        monolib_brush.o \
@@ -5237,7 +5256,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 =  \
        monolib_helpchm.o \
        monolib_helpwin.o \
        monolib_icon.o \
-       monolib_joystick.o \
        monolib_minifram.o \
        monolib_automtn.o \
        monolib_dataobj.o \
@@ -5251,24 +5269,20 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 =  \
        monolib_region.o \
        monolib_renderer.o \
        monolib_settings.o \
-       monolib_taskbar.o \
        monolib_timer.o \
        monolib_tooltip.o \
        monolib_toplevel.o \
        monolib_utilsgui.o \
        monolib_uxtheme.o \
-       monolib_wave.o \
        monolib_window.o
 @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9)
 @COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_9 = 
 COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 =  \
-       monolib_taskbarcmn.o \
        monolib_caret.o \
        monolib_printps.o \
        monolib_dialup.o \
        monolib_fontenum.o \
        monolib_fontutil.o \
-       monolib_taskbarx11.o \
        monolib_utilsx11.o \
        monolib_timer.o \
        monolib_app.o \
@@ -5287,7 +5301,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 =  \
        monolib_font.o \
        monolib_gdiobj.o \
        monolib_icon.o \
-       monolib_joystick.o \
        monolib_main.o \
        monolib_minifram.o \
        monolib_nanox.o \
@@ -5316,6 +5329,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
        monodll_splash.o \
        monodll_tipdlg.o \
        monodll_wizard.o \
+       $(__ADVANCED_PLATFORM_SRC_OBJECTS) \
        $(__HTML_SRC_PLATFORM_OBJECTS) \
        monodll_helpctrl.o \
        monodll_helpdata.o \
@@ -5353,6 +5367,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
        monolib_splash.o \
        monolib_tipdlg.o \
        monolib_wizard.o \
+       $(__ADVANCED_PLATFORM_SRC_OBJECTS_1) \
        $(__HTML_SRC_PLATFORM_OBJECTS_1) \
        monolib_helpctrl.o \
        monolib_helpdata.o \
@@ -5845,6 +5860,24 @@ advdll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp
 advdll_helpext.o: $(srcdir)/src/generic/helpext.cpp
        $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_MSW@advdll_joystick.o: $(srcdir)/src/msw/joystick.cpp
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC@advdll_joystick.o: $(srcdir)/src/mac/joystick.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_GTK@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp
+@COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_X11@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp
+@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_OS2@advdll_joystick.o: $(srcdir)/src/os2/joystick.cpp
+@COND_TOOLKIT_OS2@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
 advdll_laywin.o: $(srcdir)/src/generic/laywin.cpp
        $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
@@ -5854,9 +5887,51 @@ advdll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp
 advdll_splash.o: $(srcdir)/src/generic/splash.cpp
        $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
+advdll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_GTK@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
+@COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_X11@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
+@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_GTK@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
+@COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_X11@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
+@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
 advdll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp
        $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_OS2@advdll_wave.o: $(srcdir)/src/os2/wave.cpp
+@COND_TOOLKIT_OS2@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW@advdll_wave.o: $(srcdir)/src/msw/wave.cpp
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF@advdll_wave.o: $(srcdir)/src/unix/wave.cpp
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_GTK@advdll_wave.o: $(srcdir)/src/unix/wave.cpp
+@COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_X11@advdll_wave.o: $(srcdir)/src/unix/wave.cpp
+@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC@advdll_wave.o: $(srcdir)/src/mac/wave.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
+
 advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp
        $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $<
 
@@ -5886,6 +5961,24 @@ advlib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp
 advlib_helpext.o: $(srcdir)/src/generic/helpext.cpp
        $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_MSW@advlib_joystick.o: $(srcdir)/src/msw/joystick.cpp
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC@advlib_joystick.o: $(srcdir)/src/mac/joystick.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_GTK@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp
+@COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_X11@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp
+@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_OS2@advlib_joystick.o: $(srcdir)/src/os2/joystick.cpp
+@COND_TOOLKIT_OS2@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
 advlib_laywin.o: $(srcdir)/src/generic/laywin.cpp
        $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
@@ -5895,9 +5988,51 @@ advlib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp
 advlib_splash.o: $(srcdir)/src/generic/splash.cpp
        $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
+advlib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_GTK@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
+@COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_X11@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
+@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_GTK@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
+@COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_X11@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
+@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
 advlib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp
        $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_OS2@advlib_wave.o: $(srcdir)/src/os2/wave.cpp
+@COND_TOOLKIT_OS2@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MSW@advlib_wave.o: $(srcdir)/src/msw/wave.cpp
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF@advlib_wave.o: $(srcdir)/src/unix/wave.cpp
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_GTK@advlib_wave.o: $(srcdir)/src/unix/wave.cpp
+@COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_X11@advlib_wave.o: $(srcdir)/src/unix/wave.cpp
+@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC@advlib_wave.o: $(srcdir)/src/mac/wave.cpp
+@COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
+
 advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp
        $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $<
 
@@ -7593,21 +7728,6 @@ coredll_inpcons.o: $(srcdir)/src/univ/inpcons.cpp
 coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_joystick.o: $(srcdir)/src/msw/joystick.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_joystick.o: $(srcdir)/src/gtk/joystick.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_joystick.o: $(srcdir)/src/mac/joystick.cpp
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_joystick.o: $(srcdir)/src/x11/joystick.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_joystick.o: $(srcdir)/src/os2/joystick.cpp
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
 @COND_USE_GUI_1@coredll_layout.o: $(srcdir)/src/common/layout.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8304,30 +8424,6 @@ coredll_statlmac.o: $(srcdir)/src/mac/statlmac.cpp
 @COND_USE_GUI_1_WXUNIV_1@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_GTK_USE_GUI_1@coredll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_GTK_USE_GUI_1@coredll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
 coredll_tbar95.o: $(srcdir)/src/msw/tbar95.cpp
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8559,18 +8655,6 @@ coredll_volume.o: $(srcdir)/src/msw/volume.cpp
 @COND_USE_GUI_1@coredll_vscroll.o: $(srcdir)/src/generic/vscroll.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@coredll_wave.o: $(srcdir)/src/os2/wave.cpp
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_wave.o: $(srcdir)/src/msw/wave.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_wave.o: $(srcdir)/src/gtk/wave.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_wave.o: $(srcdir)/src/mac/wave.cpp
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
 coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -9698,21 +9782,6 @@ corelib_inpcons.o: $(srcdir)/src/univ/inpcons.cpp
 corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_joystick.o: $(srcdir)/src/msw/joystick.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_joystick.o: $(srcdir)/src/gtk/joystick.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_joystick.o: $(srcdir)/src/mac/joystick.cpp
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_joystick.o: $(srcdir)/src/x11/joystick.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_joystick.o: $(srcdir)/src/os2/joystick.cpp
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
 @COND_USE_GUI_1@corelib_layout.o: $(srcdir)/src/common/layout.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10409,30 +10478,6 @@ corelib_statlmac.o: $(srcdir)/src/mac/statlmac.cpp
 @COND_USE_GUI_1_WXUNIV_1@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_GTK_USE_GUI_1@corelib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_GTK_USE_GUI_1@corelib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
 corelib_tbar95.o: $(srcdir)/src/msw/tbar95.cpp
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10664,18 +10709,6 @@ corelib_volume.o: $(srcdir)/src/msw/volume.cpp
 @COND_USE_GUI_1@corelib_vscroll.o: $(srcdir)/src/generic/vscroll.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@corelib_wave.o: $(srcdir)/src/os2/wave.cpp
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_wave.o: $(srcdir)/src/msw/wave.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_wave.o: $(srcdir)/src/gtk/wave.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_wave.o: $(srcdir)/src/mac/wave.cpp
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
 corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -12339,17 +12372,20 @@ monodll_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/msw/joystick.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_joystick.o: $(srcdir)/src/gtk/joystick.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/mac/joystick.cpp
+@COND_TOOLKIT_MAC_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_joystick.o: $(srcdir)/src/mac/joystick.cpp
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/x11/joystick.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_joystick.o: $(srcdir)/src/os2/joystick.cpp
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_OS2_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/os2/joystick.cpp
+@COND_TOOLKIT_OS2_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_USE_GUI_1@monodll_layout.o: $(srcdir)/src/common/layout.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -13182,27 +13218,27 @@ monodll_sysopt.o: $(srcdir)/src/common/sysopt.cpp
 @COND_USE_GUI_1_WXUNIV_1@monodll_tabg.o: $(srcdir)/src/generic/tabg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+monodll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_GTK_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_GTK_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -13485,17 +13521,23 @@ monodll_volume.o: $(srcdir)/src/msw/volume.cpp
 @COND_USE_GUI_1@monodll_vscroll.o: $(srcdir)/src/generic/vscroll.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monodll_wave.o: $(srcdir)/src/os2/wave.cpp
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_OS2_USE_GUI_1@monodll_wave.o: $(srcdir)/src/os2/wave.cpp
+@COND_TOOLKIT_OS2_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_wave.o: $(srcdir)/src/msw/wave.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_wave.o: $(srcdir)/src/gtk/wave.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_wave.o: $(srcdir)/src/unix/wave.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_wave.o: $(srcdir)/src/mac/wave.cpp
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_GTK_USE_GUI_1@monodll_wave.o: $(srcdir)/src/unix/wave.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_wave.o: $(srcdir)/src/unix/wave.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1@monodll_wave.o: $(srcdir)/src/mac/wave.cpp
+@COND_TOOLKIT_MAC_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_wfstream.o: $(srcdir)/src/common/wfstream.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -14846,17 +14888,20 @@ monolib_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/msw/joystick.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_joystick.o: $(srcdir)/src/gtk/joystick.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/mac/joystick.cpp
+@COND_TOOLKIT_MAC_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_joystick.o: $(srcdir)/src/mac/joystick.cpp
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_GTK_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/x11/joystick.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_joystick.o: $(srcdir)/src/os2/joystick.cpp
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_OS2_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/os2/joystick.cpp
+@COND_TOOLKIT_OS2_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_USE_GUI_1@monolib_layout.o: $(srcdir)/src/common/layout.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -15689,27 +15734,27 @@ monolib_sysopt.o: $(srcdir)/src/common/sysopt.cpp
 @COND_USE_GUI_1_WXUNIV_1@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+monolib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_GTK_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_GTK_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -15992,17 +16037,23 @@ monolib_volume.o: $(srcdir)/src/msw/volume.cpp
 @COND_USE_GUI_1@monolib_vscroll.o: $(srcdir)/src/generic/vscroll.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@monolib_wave.o: $(srcdir)/src/os2/wave.cpp
-@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_OS2_USE_GUI_1@monolib_wave.o: $(srcdir)/src/os2/wave.cpp
+@COND_TOOLKIT_OS2_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_wave.o: $(srcdir)/src/msw/wave.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_wave.o: $(srcdir)/src/gtk/wave.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_wave.o: $(srcdir)/src/unix/wave.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_wave.o: $(srcdir)/src/mac/wave.cpp
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_GTK_USE_GUI_1@monolib_wave.o: $(srcdir)/src/unix/wave.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_wave.o: $(srcdir)/src/unix/wave.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MAC_USE_GUI_1@monolib_wave.o: $(srcdir)/src/mac/wave.cpp
+@COND_TOOLKIT_MAC_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_wfstream.o: $(srcdir)/src/common/wfstream.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<

diff --git a/aclocal.m4 b/aclocal.m4
index b92b74aa73f8efc09499514e59fbf9b114a5dc7d..c1d387e5fe4281fdfd42cc6cd270866f0dce769c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1147,12 +1147,15 @@ dnl ---------------------------------------------------------------------------
 AC_DEFUN(AC_BAKEFILE_SUFFIXES,
 [
     SO_SUFFIX="so"
+    SO_SUFFIX_MODULE="so"
     EXEEXT=""
     DLLPREFIX=lib
+    DLLPREFIX_MODULE=
     
     case "${host}" in
         *-hp-hpux* )
             SO_SUFFIX="sl"
+            SO_SUFFIX_MODULE="sl"
         ;;
         *-*-aix* )
             dnl quoting from
@@ -1161,9 +1164,11 @@ AC_DEFUN(AC_BAKEFILE_SUFFIXES,
             dnl     .a extension. This will explain why you can't link with an
             dnl     .so and why it works with the name changed to .a.
             SO_SUFFIX="a"
+            SO_SUFFIX_MODULE="a"
         ;;
         *-*-cygwin* | *-*-mingw32* )
             SO_SUFFIX="dll"
+            SO_SUFFIX_MODULE="dll"
             EXEEXT=".exe"
             DLLPREFIX=""
         ;;
@@ -1173,12 +1178,15 @@ AC_DEFUN(AC_BAKEFILE_SUFFIXES,
         ;;
         powerpc-*-darwin* )
             SO_SUFFIX="dylib"
+            SO_SUFFIX_MODULE="bundle"
         ;;
     esac
 
     AC_SUBST(SO_SUFFIX)
+    AC_SUBST(SO_SUFFIX_MODULE)
     AC_SUBST(EXEEXT)
     AC_SUBST(DLLPREFIX)
+    AC_SUBST(DLLPREFIX_MODULE)
 ])
 
 
@@ -1271,6 +1279,7 @@ AC_DEFUN(AC_BAKEFILE_SHARED_LD,
 verbose=0
 args=""
 objects=""
+linking_flag="-dynamiclib"
 
 while test \${#} -gt 0; do
     case \${1} in
@@ -1290,8 +1299,8 @@ while test \${#} -gt 0; do
         args="\${args} \${1}"
         ;;
 
-       -dynamiclib)
-        # skip these options
+       -dynamiclib|-bundle)
+        linking_flag="\${1}"
         ;;
 
        -*)
@@ -1329,9 +1338,9 @@ fi
 # Link the shared library from the single module created
 #
 if test \${verbose} = 1; then
-    echo "cc -dynamiclib master.\$\$.o \${args}"
+    echo "cc \${linking_flag} master.\$\$.o \${args}"
 fi
-c++ -dynamiclib master.\$\$.o \${args}
+c++ \${linking_flag} master.\$\$.o \${args}
 status=\$?
 if test \${status} != 0; then
     exit \${status}
@@ -1346,8 +1355,10 @@ exit 0
 EOF
         chmod +x shared-ld-sh
 
-        SHARED_LD_CC="`pwd`/shared-ld-sh -undefined suppress -flat_namespace -o"
+        SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -undefined suppress -flat_namespace -o"
+        SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -undefined suppress -flat_namespace -o"
         SHARED_LD_CXX="$SHARED_LD_CC"
+        SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
         PIC_FLAG="-dynamic -fPIC"
         dnl FIXME - what about C libs? Gilles says to use c++ because it doesn't
         dnl         matter for C projects and matters for C++ ones
@@ -1398,8 +1409,17 @@ EOF
         AC_MSG_ERROR(unknown system type $host.)
     esac
 
+    if test "x$SHARED_LD_MODULE_CC" = "x" ; then
+        SHARED_LD_MODULE_CC="$SHARED_LD_CC"
+    fi
+    if test "x$SHARED_LD_MODULE_CXX" = "x" ; then
+        SHARED_LD_MODULE_CC="$SHARED_LD_CXX"
+    fi
+
     AC_SUBST(SHARED_LD_CC)
     AC_SUBST(SHARED_LD_CXX)
+    AC_SUBST(SHARED_LD_MODULE_CC)
+    AC_SUBST(SHARED_LD_MODULE_CXX)
     AC_SUBST(PIC_FLAG)
 ])
 

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 94c2e9048474008353ac5c4d9c02d10b774bdc81..ca0cc34350a65486f23a029f42eeb2bd2cf12fbc 100644 (file)
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -478,3 +478,15 @@ dnl ### begin block COND_SHARED_0 ###
         COND_SHARED_0=""
     fi
     AC_SUBST(COND_SHARED_0)
+dnl ### begin block COND_TOOLKIT_MAC_USE_GUI_1 ###
+    COND_TOOLKIT_MAC_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_MAC_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1)
+dnl ### begin block COND_TOOLKIT_OS2_USE_GUI_1 ###
+    COND_TOOLKIT_OS2_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_OS2_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_OS2_USE_GUI_1)

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index f9a8f523834928a7f2546697de20f891f9367014..49e2960c6f8bb44b20bc4dc49dadb9a98e19341e 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -561,7 +561,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/imagpnm.h
     wx/imagtiff.h
     wx/imagxpm.h
-    wx/joystick.h
     wx/listbase.h
     wx/listctrl.h
     wx/matrix.h
@@ -588,7 +587,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/statline.h
     wx/tab.h
     wx/tabctrl.h
-    wx/taskbar.h
     wx/tbarbase.h
     wx/tbarsmpl.h
     wx/tglbtn.h
@@ -601,7 +599,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/vlbox.h
     wx/vms_x_fix.h
     wx/vscroll.h
-    wx/wave.h
     wx/xpmdecod.h
     wx/xpmhand.h
 </set>
@@ -612,20 +609,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="XWIN_LOWLEVEL_SRC" hints="files">
-    src/common/taskbarcmn.cpp
     src/generic/caret.cpp
     src/generic/printps.cpp
     src/unix/dialup.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
-    src/unix/taskbarx11.cpp
     src/unix/utilsx11.cpp
 </set>
 <set var="XWIN_LOWLEVEL_HDR" hints="files">
     wx/generic/caret.h
     wx/generic/printps.h
     wx/unix/fontutil.h
-    wx/unix/taskbarx11.h
     wx/unix/utilsx11.h
 </set>
 
@@ -697,7 +691,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/fontdlg.cpp
     src/gtk/frame.cpp
     src/gtk/gauge.cpp
-    src/gtk/joystick.cpp
     src/gtk/listbox.cpp
     src/gtk/mdi.cpp
     src/gtk/menu.cpp
@@ -719,7 +712,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/textctrl.cpp
     src/gtk/tglbtn.cpp
     src/gtk/utilsres.cpp
-    src/gtk/wave.cpp
 </set>
 <set var="GTK_HDR" hints="files">
     wx/generic/dirdlgg.h
@@ -757,7 +749,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/gauge.h
     wx/gtk/gdiobj.h
     wx/gtk/icon.h
-    wx/gtk/joystick.h
     wx/gtk/listbox.h
     wx/gtk/mdi.h
     wx/gtk/menu.h
@@ -786,7 +777,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/tooltip.h
     wx/gtk/toplevel.h
     wx/gtk/treectrl.h
-    wx/gtk/wave.h
     wx/gtk/win_gtk.h
     wx/gtk/window.h
 </set>
@@ -966,7 +956,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/x11/gdiobj.cpp
     <!-- src/x11/gsockx11.c FIXME -->
     src/x11/icon.cpp
-    src/x11/joystick.cpp
     src/x11/main.cpp
     src/x11/minifram.cpp
     src/x11/nanox.c
@@ -1002,7 +991,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/x11/font.h
     wx/x11/gdiobj.h
     wx/x11/icon.h
-    wx/x11/joystick.h
     wx/x11/minifram.h
     wx/x11/palette.h
     wx/x11/pen.h
@@ -1023,7 +1011,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="MSW_LOWLEVEL_SRC" hints="files">
-    src/common/taskbarcmn.cpp
     src/msw/app.cpp
     src/msw/bitmap.cpp
     src/msw/brush.cpp
@@ -1051,7 +1038,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/helpchm.cpp
     src/msw/helpwin.cpp
     src/msw/icon.cpp
-    src/msw/joystick.cpp
     src/msw/minifram.cpp
     src/msw/ole/automtn.cpp
     src/msw/ole/dataobj.cpp
@@ -1065,13 +1051,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/region.cpp
     src/msw/renderer.cpp
     src/msw/settings.cpp
-    src/msw/taskbar.cpp
     src/msw/timer.cpp
     src/msw/tooltip.cpp
     src/msw/toplevel.cpp
     src/msw/utilsgui.cpp
     src/msw/uxtheme.cpp
-    src/msw/wave.cpp
     src/msw/window.cpp
 </set>
 <set var="MSW_LOWLEVEL_HDR" hints="files">
@@ -1168,7 +1152,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/icon.h
     wx/msw/imaglist.h
     wx/msw/iniconf.h
-    wx/msw/joystick.h
     wx/msw/listbox.h
     wx/msw/listctrl.h
     wx/msw/mdi.h
@@ -1212,7 +1195,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/statline.h
     wx/msw/stattext.h
     wx/msw/tabctrl.h
-    wx/msw/taskbar.h
     wx/msw/tbar95.h
     wx/msw/tbarmsw.h
     wx/msw/textctrl.h
@@ -1221,7 +1203,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/tooltip.h
     wx/msw/toplevel.h
     wx/msw/treectrl.h
-    wx/msw/wave.h
     wx/msw/window.h
 
     <!-- Resources must be installed together with headers: -->
@@ -1375,7 +1356,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/helpwin.cpp
     src/os2/icon.cpp
     src/os2/iniconf.cpp
-    src/os2/joystick.cpp
     src/os2/listbox.cpp
     src/os2/main.cpp
     src/os2/menu.cpp
@@ -1408,7 +1388,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/toolbar.cpp
     src/os2/tooltip.cpp
     src/os2/toplevel.cpp
-    src/os2/wave.cpp
     src/os2/window.cpp
 </set>
 <set var="OS2_HDR" hints="files">
@@ -1448,7 +1427,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/helpwin.h
     wx/os2/icon.h
     wx/os2/iniconf.h
-    wx/os2/joystick.h
     wx/os2/listbox.h
     wx/os2/menu.h
     wx/os2/menuitem.h
@@ -1481,7 +1459,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/toolbar.h
     wx/os2/tooltip.h
     wx/os2/toplevel.h
-    wx/os2/wave.h
     wx/os2/window.h
 </set>
 
@@ -1531,7 +1508,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/gauge.cpp
     src/mac/gdiobj.cpp
     src/mac/icon.cpp
-    src/mac/joystick.cpp
     src/mac/listbox.cpp
     src/mac/macnotfy.cpp
     src/mac/mdi.cpp
@@ -1568,7 +1544,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/tooltip.cpp
     src/mac/toplevel.cpp
     src/mac/uma.cpp
-    src/mac/wave.cpp
     src/mac/window.cpp
     <!-- Generic implementations used by wxMac: -->
     src/generic/caret.cpp
@@ -1620,7 +1595,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/helpxxxx.h
     wx/mac/icon.h
     wx/mac/imaglist.h
-    wx/mac/joystick.h
     wx/mac/listbox.h
     wx/mac/listctrl.h
     wx/mac/macnotfy.h
@@ -1660,7 +1634,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/toplevel.h
     wx/mac/treectrl.h
     wx/mac/uma.h
-    wx/mac/wave.h
     wx/mac/window.h
     <!-- Generic implementations used by wxMac: -->
     wx/generic/caret.h
@@ -1941,12 +1914,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                               wxAdvanced                               -->
 <!-- ====================================================================== -->
 
-<set var="ADVANCED_MSW_SRC" hints="files">
-</set>
-
-<set var="ADVANCED_MSW_HDR" hints="files">
-</set>
-
 <set var="ADVANCED_CMN_SRC" hints="files">
     src/common/dbgrid.cpp
     src/generic/calctrl.cpp
@@ -1976,13 +1943,58 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/splash.h
     wx/generic/wizard.h
     wx/grid.h
+    wx/joystick.h
     wx/laywin.h
     wx/sashwin.h
     wx/splash.h
+    wx/taskbar.h
     wx/tipdlg.h
+    wx/wave.h
     wx/wizard.h
 </set>
 
+<set var="ADVANCED_MSW_SRC" hints="files">
+    src/common/taskbarcmn.cpp
+    src/msw/joystick.cpp
+    src/msw/taskbar.cpp
+    src/msw/wave.cpp
+</set>
+<set var="ADVANCED_MSW_HDR" hints="files">
+    wx/msw/joystick.h
+    wx/msw/taskbar.h
+    wx/msw/wave.h
+</set>
+
+<set var="ADVANCED_MAC_SRC" hints="files">
+    src/mac/joystick.cpp
+    src/mac/wave.cpp
+</set>
+<set var="ADVANCED_MAC_HDR" hints="files">
+    wx/mac/joystick.h
+    wx/mac/wave.h
+</set>
+
+<set var="ADVANCED_OS2_SRC" hints="files">
+    src/os2/joystick.cpp
+    src/os2/wave.cpp
+</set>
+<set var="ADVANCED_OS2_HDR" hints="files">
+    wx/os2/joystick.h
+    wx/os2/wave.h
+</set>
+
+<set var="ADVANCED_UNIX_SRC" hints="files">
+    src/common/taskbarcmn.cpp
+    src/unix/joystick.cpp
+    src/unix/taskbarx11.cpp
+    src/unix/wave.cpp
+</set>
+<set var="ADVANCED_UNIX_HDR" hints="files">
+    wx/unix/joystick.h
+    wx/unix/taskbarx11.h
+    wx/unix/wave.h
+</set>
+
 
 <!-- ====================================================================== -->
 <!--                               wxHTML                                   -->
@@ -2135,17 +2147,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(NET_CMN_SRC) $(NET_PLATFORM_SRC)
     </set>
 
-    
-    <!-- wxAdvanced files: -->
-    <set var="ADVANCED_PLATFORM_SRC" hints="files">
-        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC)</if>
-    </set>
-    <set var="ADVANCED_PLATFORM_HDR" hints="files">
-        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR)</if>
-    </set>
-    <set var="ADVANCED_SRC">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</set>
-    <set var="ADVANCED_HDR">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</set>
-
 
     <!-- GUI sources: -->
     
@@ -2195,6 +2196,27 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
         </if>
     </set>
+    
+    <!-- wxAdvanced files: -->
+    <set var="ADVANCED_PLATFORM_SRC" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC)</if>
+        <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='OS2'">$(ADVANCED_OS2_SRC)</if>
+    </set>
+    <set var="ADVANCED_PLATFORM_HDR" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR)</if>
+        <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_HDR)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='OS2'">$(ADVANCED_OS2_HDR)</if>
+    </set>
+    <set var="ADVANCED_SRC">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</set>
+    <set var="ADVANCED_HDR">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</set>
+
 
 
     <set var="ALL_GUI_HEADERS" hints="files">

diff --git a/configure b/configure
index ac87ff952223116addc1f5883432a4769822e74a..b3343c4483256edc55c896cd77f13ffad4a92d5e 100755 (executable)
--- a/configure
+++ b/configure
@@ -312,7 +312,7 @@ ac_includes_default="\
 #endif"
 
 ac_subdirs_all="$ac_subdirs_all src/expat"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX SO_SUFFIX_MODULE DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_OS2_USE_GUI_1 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -31485,19 +31485,9 @@ if test "$wxUSE_GUI" = "yes"; then
         { echo "$as_me:$LINENO: WARNING: Joystick not yet supported under Mac OS X... disabled" >&5
 echo "$as_me: WARNING: Joystick not yet supported under Mac OS X... disabled" >&2;}
         wxUSE_JOYSTICK=no
-     fi
-    if test "$TOOLKIT" = "MOTIF"; then
-        { echo "$as_me:$LINENO: WARNING: Joystick not yet supported under Motif... disabled" >&5
-echo "$as_me: WARNING: Joystick not yet supported under Motif... disabled" >&2;}
-        wxUSE_JOYSTICK=no
-     fi
-    if test "$TOOLKIT" = "X11"; then
-        { echo "$as_me:$LINENO: WARNING: Joystick not yet supported under X11... disabled" >&5
-echo "$as_me: WARNING: Joystick not yet supported under X11... disabled" >&2;}
-        wxUSE_JOYSTICK=no
      fi
 
-        if test "$TOOLKIT" != "MSW"; then
+         if test "$TOOLKIT" != "MSW"; then
         if test "$wxUSE_JOYSTICK" = "yes"; then
 
 for ac_header in linux/joystick.h
@@ -33113,7 +33103,8 @@ if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
 #define wxUSE_SYSTEM_OPTIONS 1
 _ACEOF
 
-if test "$TOOLKIT" = "MSW"; then
+if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
+        "$TOOLKIT" = "MOTIF"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
 fi
 
@@ -34194,18 +34185,23 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6
 
 
     SO_SUFFIX="so"
+    SO_SUFFIX_MODULE="so"
     EXEEXT=""
     DLLPREFIX=lib
+    DLLPREFIX_MODULE=
 
     case "${host}" in
         *-hp-hpux* )
             SO_SUFFIX="sl"
+            SO_SUFFIX_MODULE="sl"
         ;;
         *-*-aix* )
                                                                         SO_SUFFIX="a"
+            SO_SUFFIX_MODULE="a"
         ;;
         *-*-cygwin* | *-*-mingw32* )
             SO_SUFFIX="dll"
+            SO_SUFFIX_MODULE="dll"
             EXEEXT=".exe"
             DLLPREFIX=""
         ;;
@@ -34215,6 +34211,7 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6
         ;;
         powerpc-*-darwin* )
             SO_SUFFIX="dylib"
+            SO_SUFFIX_MODULE="bundle"
         ;;
     esac
 
@@ -34223,6 +34220,8 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6
 
 
 
+
+
         SHARED_LD_CC="\$(CC) -shared -o"
     SHARED_LD_CXX="\$(CXX) -shared -o"
 
@@ -34329,6 +34328,7 @@ echo "${ECHO_T}$bakefile_cv_prog_icc" >&6
 verbose=0
 args=""
 objects=""
+linking_flag="-dynamiclib"
 
 while test \${#} -gt 0; do
     case \${1} in
@@ -34348,8 +34348,8 @@ while test \${#} -gt 0; do
         args="\${args} \${1}"
         ;;
 
-       -dynamiclib)
-        # skip these options
+       -dynamiclib|-bundle)
+        linking_flag="\${1}"
         ;;
 
        -*)
@@ -34387,9 +34387,9 @@ fi
 # Link the shared library from the single module created
 #
 if test \${verbose} = 1; then
-    echo "cc -dynamiclib master.\$\$.o \${args}"
+    echo "cc \${linking_flag} master.\$\$.o \${args}"
 fi
-c++ -dynamiclib master.\$\$.o \${args}
+c++ \${linking_flag} master.\$\$.o \${args}
 status=\$?
 if test \${status} != 0; then
     exit \${status}
@@ -34404,8 +34404,10 @@ exit 0
 EOF
         chmod +x shared-ld-sh
 
-        SHARED_LD_CC="`pwd`/shared-ld-sh -undefined suppress -flat_namespace -o"
+        SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -undefined suppress -flat_namespace -o"
+        SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -undefined suppress -flat_namespace -o"
         SHARED_LD_CXX="$SHARED_LD_CC"
+        SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
         PIC_FLAG="-dynamic -fPIC"
                                       ;;
 
@@ -34480,6 +34482,15 @@ echo "$as_me: error: unknown system type $host." >&2;}
    { (exit 1); exit 1; }; }
     esac
 
+    if test "x$SHARED_LD_MODULE_CC" = "x" ; then
+        SHARED_LD_MODULE_CC="$SHARED_LD_CC"
+    fi
+    if test "x$SHARED_LD_MODULE_CXX" = "x" ; then
+        SHARED_LD_MODULE_CC="$SHARED_LD_CXX"
+    fi
+
+
+
 
 
 
@@ -35128,6 +35139,16 @@ fi
         COND_SHARED_0=""
     fi
 
+    COND_TOOLKIT_MAC_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_MAC_USE_GUI_1=""
+    fi
+
+    COND_TOOLKIT_OS2_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_OS2_USE_GUI_1=""
+    fi
+
 
 
 
@@ -36033,10 +36054,14 @@ s,@PLATFORM_MSDOS@,$PLATFORM_MSDOS,;t t
 s,@PLATFORM_MAC@,$PLATFORM_MAC,;t t
 s,@PLATFORM_MACOSX@,$PLATFORM_MACOSX,;t t
 s,@SO_SUFFIX@,$SO_SUFFIX,;t t
+s,@SO_SUFFIX_MODULE@,$SO_SUFFIX_MODULE,;t t
 s,@DLLPREFIX@,$DLLPREFIX,;t t
+s,@DLLPREFIX_MODULE@,$DLLPREFIX_MODULE,;t t
 s,@AIX_CXX_LD@,$AIX_CXX_LD,;t t
 s,@SHARED_LD_CC@,$SHARED_LD_CC,;t t
 s,@SHARED_LD_CXX@,$SHARED_LD_CXX,;t t
+s,@SHARED_LD_MODULE_CC@,$SHARED_LD_MODULE_CC,;t t
+s,@SHARED_LD_MODULE_CXX@,$SHARED_LD_MODULE_CXX,;t t
 s,@PIC_FLAG@,$PIC_FLAG,;t t
 s,@USE_SOVERSION@,$USE_SOVERSION,;t t
 s,@USE_SOVERLINUX@,$USE_SOVERLINUX,;t t
@@ -36124,6 +36149,8 @@ s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t
 s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t
 s,@COND_SHARED_1@,$COND_SHARED_1,;t t
 s,@COND_SHARED_0@,$COND_SHARED_0,;t t
+s,@COND_TOOLKIT_MAC_USE_GUI_1@,$COND_TOOLKIT_MAC_USE_GUI_1,;t t
+s,@COND_TOOLKIT_OS2_USE_GUI_1@,$COND_TOOLKIT_OS2_USE_GUI_1,;t t
 s,@LEX_STEM@,$LEX_STEM,;t t
 s,@PATH_IFS@,$PATH_IFS,;t t
 s,@WX_MAJOR_VERSION_NUMBER@,$WX_MAJOR_VERSION_NUMBER,;t t

diff --git a/configure.in b/configure.in
index f22e87cb7fc12ff67662f40af4451364f63780cf..739dd57f6ebbfea590f8e2333bb20cca3eda6919 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4618,16 +4618,8 @@ if test "$wxUSE_GUI" = "yes"; then
         AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled])
         wxUSE_JOYSTICK=no
      fi
-    if test "$TOOLKIT" = "MOTIF"; then
-        AC_MSG_WARN([Joystick not yet supported under Motif... disabled])
-        wxUSE_JOYSTICK=no
-     fi
-    if test "$TOOLKIT" = "X11"; then
-        AC_MSG_WARN([Joystick not yet supported under X11... disabled])
-        wxUSE_JOYSTICK=no
-     fi
-
-    dnl under MSW we always have joystick support
+    
+     dnl under MSW we always have joystick support
     if test "$TOOLKIT" != "MSW"; then
         if test "$wxUSE_JOYSTICK" = "yes"; then
             dnl joystick support is only for Linux 2.1.x or greater
@@ -5232,7 +5224,8 @@ fi
 
 if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
     AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
-if test "$TOOLKIT" = "MSW"; then
+if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
+        "$TOOLKIT" = "MOTIF"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
 fi
 

diff --git a/include/wx/msw/joystick.h b/include/wx/msw/joystick.h
index 18cad55c797c632f29ff00a7303612f795d39010..1f3bd5cb1f50a3fec0ac4db4dee9de3437da460c 100644 (file)
--- a/include/wx/msw/joystick.h
+++ b/include/wx/msw/joystick.h
@@ -18,7 +18,7 @@
 
 #include "wx/event.h"
 
-class WXDLLEXPORT wxJoystick: public wxObject
+class WXDLLIMPEXP_ADV wxJoystick: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxJoystick)
  public:

diff --git a/include/wx/msw/taskbar.h b/include/wx/msw/taskbar.h
index 24307451928ae7154a6534101c3a6f28046e8d9c..0f4fb67f1ecdeaae2822a8de13d8b88a7707457b 100644 (file)
--- a/include/wx/msw/taskbar.h
+++ b/include/wx/msw/taskbar.h
@@ -22,9 +22,10 @@
 
 class wxTaskBarIcon;
 
-WX_DECLARE_EXPORTED_LIST(wxTaskBarIcon, wxTaskBarIconList);
+WX_DECLARE_LIST_WITH_DECL(wxTaskBarIcon, wxTaskBarIconList,
+                          class WXDLLIMPEXP_ADV);
 
-class WXDLLEXPORT wxTaskBarIcon: public wxTaskBarIconBase
+class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase
 {
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
 public:

diff --git a/include/wx/msw/wave.h b/include/wx/msw/wave.h
index cd025e863a6480e38f955cf2d7f93e6798adce95..b8c248c6e8ef986b756a1d790e085de8c599fd1f 100644 (file)
--- a/include/wx/msw/wave.h
+++ b/include/wx/msw/wave.h
@@ -20,7 +20,7 @@
 
 #include "wx/object.h"
 
-class WXDLLEXPORT wxWave : public wxObject
+class WXDLLIMPEXP_ADV wxWave : public wxObject
 {
 public:
   wxWave();

diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index 1e5e4d81e9def984d8aebfa9fe1e81b13b0c58a6..69674549796952f23ea6b7b0afa89232cbcc9780 100644 (file)
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -11,7 +11,7 @@
 // wxTaskBarIconBase: define wxTaskBarIcon interface
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTaskBarIconBase : public wxEvtHandler
+class WXDLLIMPEXP_ADV wxTaskBarIconBase : public wxEvtHandler
 {
 public:
     wxTaskBarIconBase() { }
@@ -35,7 +35,7 @@ private:
 // wxTaskBarIcon events
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxTaskBarIconEvent : public wxEvent
+class WXDLLIMPEXP_ADV wxTaskBarIconEvent : public wxEvent
 {
 public:
     wxTaskBarIconEvent(wxEventType evtType, wxTaskBarIcon *tbIcon)
@@ -51,13 +51,13 @@ private:
 };
 
 BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EVENT_TYPE( wxEVT_TASKBAR_MOVE, 1550 )
-    DECLARE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DOWN, 1551 )
-    DECLARE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_UP, 1552 )
-    DECLARE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DOWN, 1553 )
-    DECLARE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_UP, 1554 )
-    DECLARE_EVENT_TYPE( wxEVT_TASKBAR_LEFT_DCLICK, 1555 )
-    DECLARE_EVENT_TYPE( wxEVT_TASKBAR_RIGHT_DCLICK, 1556 )
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_MOVE,1550)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_LEFT_DOWN,1551)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_LEFT_UP,1552)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_RIGHT_DOWN,1553)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_RIGHT_UP,1554)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_LEFT_DCLICK,1555)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV,wxEVT_TASKBAR_RIGHT_DCLICK,1556)
 END_DECLARE_EVENT_TYPES()
 
 #define EVT_TASKBAR_MOVE(fn)         DECLARE_EVENT_TABLE_ENTRY(wxEVT_TASKBAR_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) &fn, NULL),