moved wxCollapsiblePane files to adv library

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

diff --git a/Makefile.in b/Makefile.in
index d7c6d59b7e4f99dace111cad434ccf8a8684c957..12afbb7996a141c952f26d7ead0c9e1f672304a5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1999,7 +1999,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR =  \
        wx/gtk/combobox.h \
        wx/gtk/control.h \
        wx/gtk/clrpicker.h \
-       wx/gtk/collpane.h \
        wx/gtk/dialog.h \
        wx/gtk/dirdlg.h \
        wx/gtk/filedlg.h \
@@ -2604,7 +2603,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_HDR =  \
        wx/unix/sound.h \
        wx/unix/taskbarx11.h \
        wx/generic/animate.h \
-       wx/gtk/animate.h
+       wx/gtk/animate.h \
+       wx/gtk/collpane.h
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_HDR)
 COND_TOOLKIT_MAC_ADVANCED_PLATFORM_HDR =  \
        wx/generic/animate.h \
@@ -2642,6 +2642,7 @@ COND_WXUNIV_0_ADVANCED_HDR =  \
        wx/animdecod.h \
        wx/bmpcbox.h \
        wx/calctrl.h \
+       wx/collpane.h \
        wx/dataview.h \
        wx/dateevt.h \
        wx/dcbuffer.h \
@@ -2649,6 +2650,7 @@ COND_WXUNIV_0_ADVANCED_HDR =  \
        wx/generic/aboutdlgg.h \
        wx/generic/bmpcbox.h \
        wx/generic/calctrl.h \
+       wx/generic/collpaneg.h \
        wx/generic/datectrl.h \
        wx/generic/dataview.h \
        wx/generic/grid.h \
@@ -2683,6 +2685,7 @@ COND_WXUNIV_1_ADVANCED_HDR =  \
        wx/animdecod.h \
        wx/bmpcbox.h \
        wx/calctrl.h \
+       wx/collpane.h \
        wx/dataview.h \
        wx/dateevt.h \
        wx/dcbuffer.h \
@@ -2690,6 +2693,7 @@ COND_WXUNIV_1_ADVANCED_HDR =  \
        wx/generic/aboutdlgg.h \
        wx/generic/bmpcbox.h \
        wx/generic/calctrl.h \
+       wx/generic/collpaneg.h \
        wx/generic/datectrl.h \
        wx/generic/dataview.h \
        wx/generic/grid.h \
@@ -2782,7 +2786,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/checklst.h \
        wx/choicdlg.h \
        wx/choice.h \
-       wx/collpane.h \
        wx/cmndata.h \
        wx/combo.h \
        wx/combobox.h \
@@ -3484,7 +3487,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
        $(__LOWLEVEL_SRC_OBJECTS_1) \
        monodll_accel.o \
-       monodll_collpaneg.o \
        monodll_colrdlgg.o \
        monodll_dirdlgg.o \
        monodll_fdrepdlg.o \
@@ -4077,7 +4079,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS =  \
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS =  \
        monodll_accel.o \
-       monodll_collpaneg.o \
        monodll_colrdlgg.o \
        monodll_dirdlgg.o \
        monodll_fdrepdlg.o \
@@ -4096,7 +4097,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS =  \
        monodll_checklst.o \
        monodll_choice.o \
        monodll_colordlg.o \
-       monodll_collpane.o \
        monodll_combobox.o \
        monodll_control.o \
        monodll_clrpicker.o \
@@ -4209,7 +4209,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
        monodll_toplevel.o \
        monodll_window.o \
        monodll_caret.o \
-       monodll_collpaneg.o \
        monodll_fdrepdlg.o \
        monodll_fontdlgg.o \
        monodll_listctrl.o \
@@ -4284,7 +4283,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
        monodll_tabg.o
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
-       monodll_collpaneg.o \
        monodll_statusbr.o \
        monodll_prntdlgg.o \
        monodll_accel.o \
@@ -4336,7 +4334,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS)
 COND_TOOLKIT_PM___GUI_SRC_OBJECTS =  \
        monodll_caret.o \
-       monodll_collpaneg.o \
        monodll_colrdlgg.o \
        monodll_dirdlgg.o \
        monodll_fdrepdlg.o \
@@ -4417,7 +4414,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS =  \
        monodll_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS)
 COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
-       monodll_collpaneg.o \
        monodll_statusbr.o \
        monodll_prntdlgg.o \
        monodll_accel.o \
@@ -4781,6 +4777,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS =  \
        monodll_aboutdlgg.o \
        monodll_bmpcboxg.o \
        monodll_calctrl.o \
+       monodll_collpaneg.o \
        monodll_datavgen.o \
        monodll_datectlg.o \
        monodll_grid.o \
@@ -4804,6 +4801,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS =  \
        monodll_aboutdlgg.o \
        monodll_bmpcboxg.o \
        monodll_calctrl.o \
+       monodll_collpaneg.o \
        monodll_datavgen.o \
        monodll_datectlg.o \
        monodll_grid.o \
@@ -5233,7 +5231,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
        $(__LOWLEVEL_SRC_OBJECTS_3) \
        monolib_accel.o \
-       monolib_collpaneg.o \
        monolib_colrdlgg.o \
        monolib_dirdlgg.o \
        monolib_fdrepdlg.o \
@@ -5827,7 +5824,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 =  \
        monolib_accel.o \
-       monolib_collpaneg.o \
        monolib_colrdlgg.o \
        monolib_dirdlgg.o \
        monolib_fdrepdlg.o \
@@ -5846,7 +5842,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 =  \
        monolib_checklst.o \
        monolib_choice.o \
        monolib_colordlg.o \
-       monolib_collpane.o \
        monolib_combobox.o \
        monolib_control.o \
        monolib_clrpicker.o \
@@ -5959,7 +5954,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
        monolib_toplevel.o \
        monolib_window.o \
        monolib_caret.o \
-       monolib_collpaneg.o \
        monolib_fdrepdlg.o \
        monolib_fontdlgg.o \
        monolib_listctrl.o \
@@ -6034,7 +6028,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \
        monolib_tabg.o
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
-       monolib_collpaneg.o \
        monolib_statusbr.o \
        monolib_prntdlgg.o \
        monolib_accel.o \
@@ -6086,7 +6079,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 =  \
        monolib_caret.o \
-       monolib_collpaneg.o \
        monolib_colrdlgg.o \
        monolib_dirdlgg.o \
        monolib_fdrepdlg.o \
@@ -6167,7 +6159,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 =  \
        monolib_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
-       monolib_collpaneg.o \
        monolib_statusbr.o \
        monolib_prntdlgg.o \
        monolib_accel.o \
@@ -6532,6 +6523,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 =  \
        monolib_aboutdlgg.o \
        monolib_bmpcboxg.o \
        monolib_calctrl.o \
+       monolib_collpaneg.o \
        monolib_datavgen.o \
        monolib_datectlg.o \
        monolib_grid.o \
@@ -6555,6 +6547,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 =  \
        monolib_aboutdlgg.o \
        monolib_bmpcboxg.o \
        monolib_calctrl.o \
+       monolib_collpaneg.o \
        monolib_datavgen.o \
        monolib_datectlg.o \
        monolib_grid.o \
@@ -7195,7 +7188,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
        $(__LOWLEVEL_SRC_OBJECTS_5) \
        coredll_accel.o \
-       coredll_collpaneg.o \
        coredll_colrdlgg.o \
        coredll_dirdlgg.o \
        coredll_fdrepdlg.o \
@@ -7789,7 +7781,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 =  \
        coredll_accel.o \
-       coredll_collpaneg.o \
        coredll_colrdlgg.o \
        coredll_dirdlgg.o \
        coredll_fdrepdlg.o \
@@ -7808,7 +7799,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 =  \
        coredll_checklst.o \
        coredll_choice.o \
        coredll_colordlg.o \
-       coredll_collpane.o \
        coredll_combobox.o \
        coredll_control.o \
        coredll_clrpicker.o \
@@ -7921,7 +7911,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
        coredll_toplevel.o \
        coredll_window.o \
        coredll_caret.o \
-       coredll_collpaneg.o \
        coredll_fdrepdlg.o \
        coredll_fontdlgg.o \
        coredll_listctrl.o \
@@ -7996,7 +7985,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \
        coredll_tabg.o
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
-       coredll_collpaneg.o \
        coredll_statusbr.o \
        coredll_prntdlgg.o \
        coredll_accel.o \
@@ -8048,7 +8036,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 =  \
        coredll_caret.o \
-       coredll_collpaneg.o \
        coredll_colrdlgg.o \
        coredll_dirdlgg.o \
        coredll_fdrepdlg.o \
@@ -8129,7 +8116,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 =  \
        coredll_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
-       coredll_collpaneg.o \
        coredll_statusbr.o \
        coredll_prntdlgg.o \
        coredll_accel.o \
@@ -8629,7 +8615,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
        $(__LOWLEVEL_SRC_OBJECTS_7) \
        corelib_accel.o \
-       corelib_collpaneg.o \
        corelib_colrdlgg.o \
        corelib_dirdlgg.o \
        corelib_fdrepdlg.o \
@@ -9223,7 +9208,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 =  \
        corelib_accel.o \
-       corelib_collpaneg.o \
        corelib_colrdlgg.o \
        corelib_dirdlgg.o \
        corelib_fdrepdlg.o \
@@ -9242,7 +9226,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 =  \
        corelib_checklst.o \
        corelib_choice.o \
        corelib_colordlg.o \
-       corelib_collpane.o \
        corelib_combobox.o \
        corelib_control.o \
        corelib_clrpicker.o \
@@ -9355,7 +9338,6 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
        corelib_toplevel.o \
        corelib_window.o \
        corelib_caret.o \
-       corelib_collpaneg.o \
        corelib_fdrepdlg.o \
        corelib_fontdlgg.o \
        corelib_listctrl.o \
@@ -9430,7 +9412,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \
        corelib_tabg.o
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
-       corelib_collpaneg.o \
        corelib_statusbr.o \
        corelib_prntdlgg.o \
        corelib_accel.o \
@@ -9482,7 +9463,6 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 =  \
        corelib_caret.o \
-       corelib_collpaneg.o \
        corelib_colrdlgg.o \
        corelib_dirdlgg.o \
        corelib_fdrepdlg.o \
@@ -9563,7 +9543,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 =  \
        corelib_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
-       corelib_collpaneg.o \
        corelib_statusbr.o \
        corelib_prntdlgg.o \
        corelib_accel.o \
@@ -9974,6 +9953,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 =  \
        advdll_aboutdlgg.o \
        advdll_bmpcboxg.o \
        advdll_calctrl.o \
+       advdll_collpaneg.o \
        advdll_datavgen.o \
        advdll_datectlg.o \
        advdll_grid.o \
@@ -9997,6 +9977,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 =  \
        advdll_aboutdlgg.o \
        advdll_bmpcboxg.o \
        advdll_calctrl.o \
+       advdll_collpaneg.o \
        advdll_datavgen.o \
        advdll_datectlg.o \
        advdll_grid.o \
@@ -10035,6 +10016,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 =  \
        advlib_aboutdlgg.o \
        advlib_bmpcboxg.o \
        advlib_calctrl.o \
+       advlib_collpaneg.o \
        advlib_datavgen.o \
        advlib_datectlg.o \
        advlib_grid.o \
@@ -10058,6 +10040,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
        advlib_aboutdlgg.o \
        advlib_bmpcboxg.o \
        advlib_calctrl.o \
+       advlib_collpaneg.o \
        advlib_datavgen.o \
        advlib_datectlg.o \
        advlib_grid.o \
@@ -10736,8 +10719,9 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS =  \
        monodll_animateg.o \
        monodll_aboutdlg.o \
        monodll_animate.o \
-       monodll_taskbar.o \
+       monodll_collpane.o \
        monodll_dataview.o \
+       monodll_taskbar.o \
        monodll_eggtrayicon.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS)
 COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS =  \
@@ -10806,8 +10790,9 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
        monolib_animateg.o \
        monolib_aboutdlg.o \
        monolib_animate.o \
-       monolib_taskbar.o \
+       monolib_collpane.o \
        monolib_dataview.o \
+       monolib_taskbar.o \
        monolib_eggtrayicon.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_0)
 COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
@@ -10879,8 +10864,9 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
        advdll_animateg.o \
        advdll_aboutdlg.o \
        advdll_animate.o \
-       advdll_taskbar.o \
+       advdll_collpane.o \
        advdll_dataview.o \
+       advdll_taskbar.o \
        advdll_eggtrayicon.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_8)
 COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
@@ -10946,8 +10932,9 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
        advlib_animateg.o \
        advlib_aboutdlg.o \
        advlib_animate.o \
-       advlib_taskbar.o \
+       advlib_collpane.o \
        advlib_dataview.o \
+       advlib_taskbar.o \
        advlib_eggtrayicon.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_9)
 COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
@@ -12389,9 +12376,6 @@ monodll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONODLL_ODEP)
 monodll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
 
-monodll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
-
 monodll_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
 
@@ -14429,24 +14413,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/os2/accel.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_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
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
 
@@ -15950,6 +15916,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp
 
+@COND_USE_GUI_1@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
 @COND_USE_GUI_1@monodll_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
 
@@ -16112,6 +16081,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_animate.o: $(srcdir)/src/gtk/animate.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
 
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
 
@@ -16463,9 +16435,6 @@ monolib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP)
 monolib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
 
-monolib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
-
 monolib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
 
@@ -18503,24 +18472,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/os2/accel.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_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
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
 
@@ -20024,6 +19975,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp
 
+@COND_USE_GUI_1@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
 @COND_USE_GUI_1@monolib_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
 
@@ -20186,6 +20140,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_animate.o: $(srcdir)/src/gtk/animate.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
 
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
 
@@ -21512,9 +21469,6 @@ coredll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(COREDLL_ODEP)
 coredll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
 
-coredll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
-
 coredll_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
 
@@ -22943,24 +22897,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/os2/accel.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_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
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
 
@@ -24443,9 +24379,6 @@ corelib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(CORELIB_ODEP)
 corelib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
 
-corelib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
-
 corelib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
 
@@ -25874,24 +25807,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/os2/accel.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
 
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_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
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
-
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
 
@@ -27368,6 +27283,9 @@ advdll_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(ADVDLL_ODEP)
 advdll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(ADVDLL_ODEP)
        $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp
 
+advdll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(ADVDLL_ODEP)
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
 advdll_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(ADVDLL_ODEP)
        $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
 
@@ -27557,6 +27475,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_animate.o: $(srcdir)/src/gtk/animate.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
 
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
 
@@ -27590,6 +27511,9 @@ advlib_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(ADVLIB_ODEP)
 advlib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(ADVLIB_ODEP)
        $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp
 
+advlib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(ADVLIB_ODEP)
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
 advlib_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(ADVLIB_ODEP)
        $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
 
@@ -27779,6 +27703,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_animate.o: $(srcdir)/src/gtk/animate.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
 
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
+
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
 

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index cc19d88950665cb19be381ebbb73184bcff02ba2..206635e2e3f83ffb4be2fc4900b96fc49ebdbf15 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1333,7 +1333,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_helpwin.obj \
        $(OBJS)\monodll_automtn.obj \
        $(OBJS)\monodll_uuid.obj \
-       $(OBJS)\monodll_collpaneg.obj \
        $(OBJS)\monodll_statusbr.obj \
        $(OBJS)\monodll_prntdlgg.obj \
        $(OBJS)\monodll_accel.obj \
@@ -1551,7 +1550,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_automtn.obj \
        $(OBJS)\monodll_uuid.obj \
        $(OBJS)\monodll_accel.obj \
-       $(OBJS)\monodll_collpaneg.obj \
        $(OBJS)\monodll_colrdlgg.obj \
        $(OBJS)\monodll_dirdlgg.obj \
        $(OBJS)\monodll_fdrepdlg.obj \
@@ -1725,6 +1723,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_aboutdlgg.obj \
        $(OBJS)\monodll_bmpcboxg.obj \
        $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_collpaneg.obj \
        $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \
        $(OBJS)\monodll_grid.obj \
@@ -1754,6 +1753,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_aboutdlgg.obj \
        $(OBJS)\monodll_bmpcboxg.obj \
        $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_collpaneg.obj \
        $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \
        $(OBJS)\monodll_grid.obj \
@@ -1936,7 +1936,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_helpwin.obj \
        $(OBJS)\monolib_automtn.obj \
        $(OBJS)\monolib_uuid.obj \
-       $(OBJS)\monolib_collpaneg.obj \
        $(OBJS)\monolib_statusbr.obj \
        $(OBJS)\monolib_prntdlgg.obj \
        $(OBJS)\monolib_accel.obj \
@@ -2154,7 +2153,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_automtn.obj \
        $(OBJS)\monolib_uuid.obj \
        $(OBJS)\monolib_accel.obj \
-       $(OBJS)\monolib_collpaneg.obj \
        $(OBJS)\monolib_colrdlgg.obj \
        $(OBJS)\monolib_dirdlgg.obj \
        $(OBJS)\monolib_fdrepdlg.obj \
@@ -2328,6 +2326,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_aboutdlgg.obj \
        $(OBJS)\monolib_bmpcboxg.obj \
        $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_collpaneg.obj \
        $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \
        $(OBJS)\monolib_grid.obj \
@@ -2357,6 +2356,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_aboutdlgg.obj \
        $(OBJS)\monolib_bmpcboxg.obj \
        $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_collpaneg.obj \
        $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \
        $(OBJS)\monolib_grid.obj \
@@ -2450,7 +2450,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_helpwin.obj \
        $(OBJS)\coredll_automtn.obj \
        $(OBJS)\coredll_uuid.obj \
-       $(OBJS)\coredll_collpaneg.obj \
        $(OBJS)\coredll_statusbr.obj \
        $(OBJS)\coredll_prntdlgg.obj \
        $(OBJS)\coredll_accel.obj \
@@ -2668,7 +2667,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_automtn.obj \
        $(OBJS)\coredll_uuid.obj \
        $(OBJS)\coredll_accel.obj \
-       $(OBJS)\coredll_collpaneg.obj \
        $(OBJS)\coredll_colrdlgg.obj \
        $(OBJS)\coredll_dirdlgg.obj \
        $(OBJS)\coredll_fdrepdlg.obj \
@@ -2891,7 +2889,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_helpwin.obj \
        $(OBJS)\corelib_automtn.obj \
        $(OBJS)\corelib_uuid.obj \
-       $(OBJS)\corelib_collpaneg.obj \
        $(OBJS)\corelib_statusbr.obj \
        $(OBJS)\corelib_prntdlgg.obj \
        $(OBJS)\corelib_accel.obj \
@@ -3109,7 +3106,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_automtn.obj \
        $(OBJS)\corelib_uuid.obj \
        $(OBJS)\corelib_accel.obj \
-       $(OBJS)\corelib_collpaneg.obj \
        $(OBJS)\corelib_colrdlgg.obj \
        $(OBJS)\corelib_dirdlgg.obj \
        $(OBJS)\corelib_fdrepdlg.obj \
@@ -3287,6 +3283,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_aboutdlgg.obj \
        $(OBJS)\advdll_bmpcboxg.obj \
        $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_collpaneg.obj \
        $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \
        $(OBJS)\advdll_grid.obj \
@@ -3316,6 +3313,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_aboutdlgg.obj \
        $(OBJS)\advdll_bmpcboxg.obj \
        $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_collpaneg.obj \
        $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \
        $(OBJS)\advdll_grid.obj \
@@ -3348,6 +3346,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_aboutdlgg.obj \
        $(OBJS)\advlib_bmpcboxg.obj \
        $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_collpaneg.obj \
        $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \
        $(OBJS)\advlib_grid.obj \
@@ -3377,6 +3376,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_aboutdlgg.obj \
        $(OBJS)\advlib_bmpcboxg.obj \
        $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_collpaneg.obj \
        $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \
        $(OBJS)\advlib_grid.obj \
@@ -5435,11 +5435,6 @@ $(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6295,6 +6290,11 @@ $(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_datavgen.obj: ..\..\src\generic\datavgen.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -7380,11 +7380,6 @@ $(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -8240,6 +8235,11 @@ $(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_datavgen.obj: ..\..\src\generic\datavgen.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -9340,11 +9340,6 @@ $(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -10590,11 +10585,6 @@ $(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -11449,6 +11439,9 @@ $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
        $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
 
+$(OBJS)\advdll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
+
 $(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp
        $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
 
@@ -11530,6 +11523,9 @@ $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
        $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
 
+$(OBJS)\advlib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
+
 $(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp
        $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
 

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index ffc750657d281d485bc66d620fed0bd7939c2951..38874e4e7b8a71bf23461bb7513fda144dcc12f9 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1343,7 +1343,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_helpwin.o \
        $(OBJS)\monodll_automtn.o \
        $(OBJS)\monodll_uuid.o \
-       $(OBJS)\monodll_collpaneg.o \
        $(OBJS)\monodll_statusbr.o \
        $(OBJS)\monodll_prntdlgg.o \
        $(OBJS)\monodll_accel.o \
@@ -1563,7 +1562,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_automtn.o \
        $(OBJS)\monodll_uuid.o \
        $(OBJS)\monodll_accel.o \
-       $(OBJS)\monodll_collpaneg.o \
        $(OBJS)\monodll_colrdlgg.o \
        $(OBJS)\monodll_dirdlgg.o \
        $(OBJS)\monodll_fdrepdlg.o \
@@ -1738,6 +1736,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_aboutdlgg.o \
        $(OBJS)\monodll_bmpcboxg.o \
        $(OBJS)\monodll_calctrl.o \
+       $(OBJS)\monodll_collpaneg.o \
        $(OBJS)\monodll_datavgen.o \
        $(OBJS)\monodll_datectlg.o \
        $(OBJS)\monodll_grid.o \
@@ -1767,6 +1766,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_aboutdlgg.o \
        $(OBJS)\monodll_bmpcboxg.o \
        $(OBJS)\monodll_calctrl.o \
+       $(OBJS)\monodll_collpaneg.o \
        $(OBJS)\monodll_datavgen.o \
        $(OBJS)\monodll_datectlg.o \
        $(OBJS)\monodll_grid.o \
@@ -1952,7 +1952,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_helpwin.o \
        $(OBJS)\monolib_automtn.o \
        $(OBJS)\monolib_uuid.o \
-       $(OBJS)\monolib_collpaneg.o \
        $(OBJS)\monolib_statusbr.o \
        $(OBJS)\monolib_prntdlgg.o \
        $(OBJS)\monolib_accel.o \
@@ -2172,7 +2171,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_automtn.o \
        $(OBJS)\monolib_uuid.o \
        $(OBJS)\monolib_accel.o \
-       $(OBJS)\monolib_collpaneg.o \
        $(OBJS)\monolib_colrdlgg.o \
        $(OBJS)\monolib_dirdlgg.o \
        $(OBJS)\monolib_fdrepdlg.o \
@@ -2347,6 +2345,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_aboutdlgg.o \
        $(OBJS)\monolib_bmpcboxg.o \
        $(OBJS)\monolib_calctrl.o \
+       $(OBJS)\monolib_collpaneg.o \
        $(OBJS)\monolib_datavgen.o \
        $(OBJS)\monolib_datectlg.o \
        $(OBJS)\monolib_grid.o \
@@ -2376,6 +2375,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_aboutdlgg.o \
        $(OBJS)\monolib_bmpcboxg.o \
        $(OBJS)\monolib_calctrl.o \
+       $(OBJS)\monolib_collpaneg.o \
        $(OBJS)\monolib_datavgen.o \
        $(OBJS)\monolib_datectlg.o \
        $(OBJS)\monolib_grid.o \
@@ -2482,7 +2482,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_helpwin.o \
        $(OBJS)\coredll_automtn.o \
        $(OBJS)\coredll_uuid.o \
-       $(OBJS)\coredll_collpaneg.o \
        $(OBJS)\coredll_statusbr.o \
        $(OBJS)\coredll_prntdlgg.o \
        $(OBJS)\coredll_accel.o \
@@ -2702,7 +2701,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_automtn.o \
        $(OBJS)\coredll_uuid.o \
        $(OBJS)\coredll_accel.o \
-       $(OBJS)\coredll_collpaneg.o \
        $(OBJS)\coredll_colrdlgg.o \
        $(OBJS)\coredll_dirdlgg.o \
        $(OBJS)\coredll_fdrepdlg.o \
@@ -2931,7 +2929,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_helpwin.o \
        $(OBJS)\corelib_automtn.o \
        $(OBJS)\corelib_uuid.o \
-       $(OBJS)\corelib_collpaneg.o \
        $(OBJS)\corelib_statusbr.o \
        $(OBJS)\corelib_prntdlgg.o \
        $(OBJS)\corelib_accel.o \
@@ -3151,7 +3148,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_automtn.o \
        $(OBJS)\corelib_uuid.o \
        $(OBJS)\corelib_accel.o \
-       $(OBJS)\corelib_collpaneg.o \
        $(OBJS)\corelib_colrdlgg.o \
        $(OBJS)\corelib_dirdlgg.o \
        $(OBJS)\corelib_fdrepdlg.o \
@@ -3334,6 +3330,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_aboutdlgg.o \
        $(OBJS)\advdll_bmpcboxg.o \
        $(OBJS)\advdll_calctrl.o \
+       $(OBJS)\advdll_collpaneg.o \
        $(OBJS)\advdll_datavgen.o \
        $(OBJS)\advdll_datectlg.o \
        $(OBJS)\advdll_grid.o \
@@ -3363,6 +3360,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_aboutdlgg.o \
        $(OBJS)\advdll_bmpcboxg.o \
        $(OBJS)\advdll_calctrl.o \
+       $(OBJS)\advdll_collpaneg.o \
        $(OBJS)\advdll_datavgen.o \
        $(OBJS)\advdll_datectlg.o \
        $(OBJS)\advdll_grid.o \
@@ -3399,6 +3397,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_aboutdlgg.o \
        $(OBJS)\advlib_bmpcboxg.o \
        $(OBJS)\advlib_calctrl.o \
+       $(OBJS)\advlib_collpaneg.o \
        $(OBJS)\advlib_datavgen.o \
        $(OBJS)\advlib_datectlg.o \
        $(OBJS)\advlib_grid.o \
@@ -3428,6 +3427,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_aboutdlgg.o \
        $(OBJS)\advlib_bmpcboxg.o \
        $(OBJS)\advlib_calctrl.o \
+       $(OBJS)\advlib_collpaneg.o \
        $(OBJS)\advlib_datavgen.o \
        $(OBJS)\advlib_datectlg.o \
        $(OBJS)\advlib_grid.o \
@@ -5552,11 +5552,6 @@ $(OBJS)\monodll_uuid.o: ../../src/msw/ole/uuid.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_collpaneg.o: ../../src/generic/collpaneg.cpp
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 $(OBJS)\monodll_statusbr.o: ../../src/generic/statusbr.cpp
@@ -6512,6 +6507,11 @@ $(OBJS)\monodll_calctrl.o: ../../src/generic/calctrl.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_collpaneg.o: ../../src/generic/collpaneg.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_datavgen.o: ../../src/generic/datavgen.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -7597,11 +7597,6 @@ $(OBJS)\monolib_uuid.o: ../../src/msw/ole/uuid.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_collpaneg.o: ../../src/generic/collpaneg.cpp
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 $(OBJS)\monolib_statusbr.o: ../../src/generic/statusbr.cpp
@@ -8557,6 +8552,11 @@ $(OBJS)\monolib_calctrl.o: ../../src/generic/calctrl.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_collpaneg.o: ../../src/generic/collpaneg.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_datavgen.o: ../../src/generic/datavgen.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -9657,11 +9657,6 @@ $(OBJS)\coredll_uuid.o: ../../src/msw/ole/uuid.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_collpaneg.o: ../../src/generic/collpaneg.cpp
-       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 $(OBJS)\coredll_statusbr.o: ../../src/generic/statusbr.cpp
@@ -11007,11 +11002,6 @@ $(OBJS)\corelib_uuid.o: ../../src/msw/ole/uuid.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_collpaneg.o: ../../src/generic/collpaneg.cpp
-       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 ifeq ($(WXUNIV),0)
 $(OBJS)\corelib_statusbr.o: ../../src/generic/statusbr.cpp
@@ -11966,6 +11956,9 @@ $(OBJS)\advdll_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp
 $(OBJS)\advdll_calctrl.o: ../../src/generic/calctrl.cpp
        $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\advdll_collpaneg.o: ../../src/generic/collpaneg.cpp
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advdll_datavgen.o: ../../src/generic/datavgen.cpp
        $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -12047,6 +12040,9 @@ $(OBJS)\advlib_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp
 $(OBJS)\advlib_calctrl.o: ../../src/generic/calctrl.cpp
        $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\advlib_collpaneg.o: ../../src/generic/collpaneg.cpp
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advlib_datavgen.o: ../../src/generic/datavgen.cpp
        $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index da788fe1f48462780dc69fb8b593200285a652a2..5d56f82c9b6e537b7d26b3c26bd083052ea8506d 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1500,7 +1500,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_helpwin.obj \
        $(OBJS)\monodll_automtn.obj \
        $(OBJS)\monodll_uuid.obj \
-       $(OBJS)\monodll_collpaneg.obj \
        $(OBJS)\monodll_statusbr.obj \
        $(OBJS)\monodll_prntdlgg.obj \
        $(OBJS)\monodll_accel.obj \
@@ -1718,7 +1717,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_automtn.obj \
        $(OBJS)\monodll_uuid.obj \
        $(OBJS)\monodll_accel.obj \
-       $(OBJS)\monodll_collpaneg.obj \
        $(OBJS)\monodll_colrdlgg.obj \
        $(OBJS)\monodll_dirdlgg.obj \
        $(OBJS)\monodll_fdrepdlg.obj \
@@ -1892,6 +1890,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_aboutdlgg.obj \
        $(OBJS)\monodll_bmpcboxg.obj \
        $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_collpaneg.obj \
        $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \
        $(OBJS)\monodll_grid.obj \
@@ -1921,6 +1920,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_aboutdlgg.obj \
        $(OBJS)\monodll_bmpcboxg.obj \
        $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_collpaneg.obj \
        $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \
        $(OBJS)\monodll_grid.obj \
@@ -2109,7 +2109,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_helpwin.obj \
        $(OBJS)\monolib_automtn.obj \
        $(OBJS)\monolib_uuid.obj \
-       $(OBJS)\monolib_collpaneg.obj \
        $(OBJS)\monolib_statusbr.obj \
        $(OBJS)\monolib_prntdlgg.obj \
        $(OBJS)\monolib_accel.obj \
@@ -2327,7 +2326,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_automtn.obj \
        $(OBJS)\monolib_uuid.obj \
        $(OBJS)\monolib_accel.obj \
-       $(OBJS)\monolib_collpaneg.obj \
        $(OBJS)\monolib_colrdlgg.obj \
        $(OBJS)\monolib_dirdlgg.obj \
        $(OBJS)\monolib_fdrepdlg.obj \
@@ -2501,6 +2499,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_aboutdlgg.obj \
        $(OBJS)\monolib_bmpcboxg.obj \
        $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_collpaneg.obj \
        $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \
        $(OBJS)\monolib_grid.obj \
@@ -2530,6 +2529,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_aboutdlgg.obj \
        $(OBJS)\monolib_bmpcboxg.obj \
        $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_collpaneg.obj \
        $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \
        $(OBJS)\monolib_grid.obj \
@@ -2653,7 +2653,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_helpwin.obj \
        $(OBJS)\coredll_automtn.obj \
        $(OBJS)\coredll_uuid.obj \
-       $(OBJS)\coredll_collpaneg.obj \
        $(OBJS)\coredll_statusbr.obj \
        $(OBJS)\coredll_prntdlgg.obj \
        $(OBJS)\coredll_accel.obj \
@@ -2871,7 +2870,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_automtn.obj \
        $(OBJS)\coredll_uuid.obj \
        $(OBJS)\coredll_accel.obj \
-       $(OBJS)\coredll_collpaneg.obj \
        $(OBJS)\coredll_colrdlgg.obj \
        $(OBJS)\coredll_dirdlgg.obj \
        $(OBJS)\coredll_fdrepdlg.obj \
@@ -3100,7 +3098,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_helpwin.obj \
        $(OBJS)\corelib_automtn.obj \
        $(OBJS)\corelib_uuid.obj \
-       $(OBJS)\corelib_collpaneg.obj \
        $(OBJS)\corelib_statusbr.obj \
        $(OBJS)\corelib_prntdlgg.obj \
        $(OBJS)\corelib_accel.obj \
@@ -3318,7 +3315,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_automtn.obj \
        $(OBJS)\corelib_uuid.obj \
        $(OBJS)\corelib_accel.obj \
-       $(OBJS)\corelib_collpaneg.obj \
        $(OBJS)\corelib_colrdlgg.obj \
        $(OBJS)\corelib_dirdlgg.obj \
        $(OBJS)\corelib_fdrepdlg.obj \
@@ -3502,6 +3498,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_aboutdlgg.obj \
        $(OBJS)\advdll_bmpcboxg.obj \
        $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_collpaneg.obj \
        $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \
        $(OBJS)\advdll_grid.obj \
@@ -3531,6 +3528,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_aboutdlgg.obj \
        $(OBJS)\advdll_bmpcboxg.obj \
        $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_collpaneg.obj \
        $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \
        $(OBJS)\advdll_grid.obj \
@@ -3569,6 +3567,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_aboutdlgg.obj \
        $(OBJS)\advlib_bmpcboxg.obj \
        $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_collpaneg.obj \
        $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \
        $(OBJS)\advlib_grid.obj \
@@ -3598,6 +3597,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_aboutdlgg.obj \
        $(OBJS)\advlib_bmpcboxg.obj \
        $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_collpaneg.obj \
        $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \
        $(OBJS)\advlib_grid.obj \
@@ -5768,11 +5768,6 @@ $(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6628,6 +6623,11 @@ $(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_datavgen.obj: ..\..\src\generic\datavgen.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -7713,11 +7713,6 @@ $(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -8573,6 +8568,11 @@ $(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_datavgen.obj: ..\..\src\generic\datavgen.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -9673,11 +9673,6 @@ $(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -10923,11 +10918,6 @@ $(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -11782,6 +11772,9 @@ $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 $(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
+$(OBJS)\advdll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
+
 $(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
 
@@ -11863,6 +11856,9 @@ $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 $(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 
+$(OBJS)\advlib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
+
 $(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
 

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index d9af6c6db2019fe55d7cd36bcd3db8e3cf78937d..3989565f077e7cc3ffa6c4990c7ff35f17059f88 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -255,7 +255,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_helpwin.obj &
        $(OBJS)\monodll_automtn.obj &
        $(OBJS)\monodll_uuid.obj &
-       $(OBJS)\monodll_collpaneg.obj &
        $(OBJS)\monodll_statusbr.obj &
        $(OBJS)\monodll_prntdlgg.obj &
        $(OBJS)\monodll_accel.obj &
@@ -475,7 +474,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_automtn.obj &
        $(OBJS)\monodll_uuid.obj &
        $(OBJS)\monodll_accel.obj &
-       $(OBJS)\monodll_collpaneg.obj &
        $(OBJS)\monodll_colrdlgg.obj &
        $(OBJS)\monodll_dirdlgg.obj &
        $(OBJS)\monodll_fdrepdlg.obj &
@@ -651,6 +649,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_aboutdlgg.obj &
        $(OBJS)\monodll_bmpcboxg.obj &
        $(OBJS)\monodll_calctrl.obj &
+       $(OBJS)\monodll_collpaneg.obj &
        $(OBJS)\monodll_datavgen.obj &
        $(OBJS)\monodll_datectlg.obj &
        $(OBJS)\monodll_grid.obj &
@@ -680,6 +679,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_aboutdlgg.obj &
        $(OBJS)\monodll_bmpcboxg.obj &
        $(OBJS)\monodll_calctrl.obj &
+       $(OBJS)\monodll_collpaneg.obj &
        $(OBJS)\monodll_datavgen.obj &
        $(OBJS)\monodll_datectlg.obj &
        $(OBJS)\monodll_grid.obj &
@@ -868,7 +868,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_helpwin.obj &
        $(OBJS)\monolib_automtn.obj &
        $(OBJS)\monolib_uuid.obj &
-       $(OBJS)\monolib_collpaneg.obj &
        $(OBJS)\monolib_statusbr.obj &
        $(OBJS)\monolib_prntdlgg.obj &
        $(OBJS)\monolib_accel.obj &
@@ -1088,7 +1087,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_automtn.obj &
        $(OBJS)\monolib_uuid.obj &
        $(OBJS)\monolib_accel.obj &
-       $(OBJS)\monolib_collpaneg.obj &
        $(OBJS)\monolib_colrdlgg.obj &
        $(OBJS)\monolib_dirdlgg.obj &
        $(OBJS)\monolib_fdrepdlg.obj &
@@ -1264,6 +1262,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_aboutdlgg.obj &
        $(OBJS)\monolib_bmpcboxg.obj &
        $(OBJS)\monolib_calctrl.obj &
+       $(OBJS)\monolib_collpaneg.obj &
        $(OBJS)\monolib_datavgen.obj &
        $(OBJS)\monolib_datectlg.obj &
        $(OBJS)\monolib_grid.obj &
@@ -1293,6 +1292,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_aboutdlgg.obj &
        $(OBJS)\monolib_bmpcboxg.obj &
        $(OBJS)\monolib_calctrl.obj &
+       $(OBJS)\monolib_collpaneg.obj &
        $(OBJS)\monolib_datavgen.obj &
        $(OBJS)\monolib_datectlg.obj &
        $(OBJS)\monolib_grid.obj &
@@ -1405,7 +1405,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_helpwin.obj &
        $(OBJS)\coredll_automtn.obj &
        $(OBJS)\coredll_uuid.obj &
-       $(OBJS)\coredll_collpaneg.obj &
        $(OBJS)\coredll_statusbr.obj &
        $(OBJS)\coredll_prntdlgg.obj &
        $(OBJS)\coredll_accel.obj &
@@ -1625,7 +1624,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_automtn.obj &
        $(OBJS)\coredll_uuid.obj &
        $(OBJS)\coredll_accel.obj &
-       $(OBJS)\coredll_collpaneg.obj &
        $(OBJS)\coredll_colrdlgg.obj &
        $(OBJS)\coredll_dirdlgg.obj &
        $(OBJS)\coredll_fdrepdlg.obj &
@@ -1856,7 +1854,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_helpwin.obj &
        $(OBJS)\corelib_automtn.obj &
        $(OBJS)\corelib_uuid.obj &
-       $(OBJS)\corelib_collpaneg.obj &
        $(OBJS)\corelib_statusbr.obj &
        $(OBJS)\corelib_prntdlgg.obj &
        $(OBJS)\corelib_accel.obj &
@@ -2076,7 +2073,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_automtn.obj &
        $(OBJS)\corelib_uuid.obj &
        $(OBJS)\corelib_accel.obj &
-       $(OBJS)\corelib_collpaneg.obj &
        $(OBJS)\corelib_colrdlgg.obj &
        $(OBJS)\corelib_dirdlgg.obj &
        $(OBJS)\corelib_fdrepdlg.obj &
@@ -2261,6 +2257,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\advdll_aboutdlgg.obj &
        $(OBJS)\advdll_bmpcboxg.obj &
        $(OBJS)\advdll_calctrl.obj &
+       $(OBJS)\advdll_collpaneg.obj &
        $(OBJS)\advdll_datavgen.obj &
        $(OBJS)\advdll_datectlg.obj &
        $(OBJS)\advdll_grid.obj &
@@ -2290,6 +2287,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\advdll_aboutdlgg.obj &
        $(OBJS)\advdll_bmpcboxg.obj &
        $(OBJS)\advdll_calctrl.obj &
+       $(OBJS)\advdll_collpaneg.obj &
        $(OBJS)\advdll_datavgen.obj &
        $(OBJS)\advdll_datectlg.obj &
        $(OBJS)\advdll_grid.obj &
@@ -2328,6 +2326,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\advlib_aboutdlgg.obj &
        $(OBJS)\advlib_bmpcboxg.obj &
        $(OBJS)\advlib_calctrl.obj &
+       $(OBJS)\advlib_collpaneg.obj &
        $(OBJS)\advlib_datavgen.obj &
        $(OBJS)\advlib_datectlg.obj &
        $(OBJS)\advlib_grid.obj &
@@ -2357,6 +2356,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\advlib_aboutdlgg.obj &
        $(OBJS)\advlib_bmpcboxg.obj &
        $(OBJS)\advlib_calctrl.obj &
+       $(OBJS)\advlib_collpaneg.obj &
        $(OBJS)\advlib_datavgen.obj &
        $(OBJS)\advlib_datectlg.obj &
        $(OBJS)\advlib_grid.obj &
@@ -5780,11 +5780,6 @@ $(OBJS)\monodll_uuid.obj :  .AUTODEPEND ..\..\src\msw\ole\uuid.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 $(OBJS)\monodll_statusbr.obj :  .AUTODEPEND ..\..\src\generic\statusbr.cpp
@@ -6740,6 +6735,11 @@ $(OBJS)\monodll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monodll_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_datavgen.obj :  .AUTODEPEND ..\..\src\generic\datavgen.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7825,11 +7825,6 @@ $(OBJS)\monolib_uuid.obj :  .AUTODEPEND ..\..\src\msw\ole\uuid.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 $(OBJS)\monolib_statusbr.obj :  .AUTODEPEND ..\..\src\generic\statusbr.cpp
@@ -8785,6 +8780,11 @@ $(OBJS)\monolib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_datavgen.obj :  .AUTODEPEND ..\..\src\generic\datavgen.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -9885,11 +9885,6 @@ $(OBJS)\coredll_uuid.obj :  .AUTODEPEND ..\..\src\msw\ole\uuid.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 $(OBJS)\coredll_statusbr.obj :  .AUTODEPEND ..\..\src\generic\statusbr.cpp
@@ -11235,11 +11230,6 @@ $(OBJS)\corelib_uuid.obj :  .AUTODEPEND ..\..\src\msw\ole\uuid.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 !ifeq WXUNIV 0
 $(OBJS)\corelib_statusbr.obj :  .AUTODEPEND ..\..\src\generic\statusbr.cpp
@@ -12194,6 +12184,9 @@ $(OBJS)\advdll_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
 $(OBJS)\advdll_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
+$(OBJS)\advdll_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_datavgen.obj :  .AUTODEPEND ..\..\src\generic\datavgen.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
@@ -12275,6 +12268,9 @@ $(OBJS)\advlib_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
 $(OBJS)\advlib_calctrl.obj :  .AUTODEPEND ..\..\src\generic\calctrl.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
+$(OBJS)\advlib_collpaneg.obj :  .AUTODEPEND ..\..\src\generic\collpaneg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_datavgen.obj :  .AUTODEPEND ..\..\src\generic\datavgen.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 

diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp
index edde9b64f58c6e20924fc2b4c6ee83a94e06cff4..4a29fd621474d5d4c49f05ceeecade99030cf8f9 100644 (file)
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -636,6 +636,10 @@ SOURCE=..\..\src\generic\calctrl.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\generic\collpaneg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\datavgen.cpp
 # End Source File
 # Begin Source File
@@ -1157,6 +1161,10 @@ SOURCE=..\..\include\wx\generic\calctrl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\collpaneg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\dataview.h
 # End Source File
 # Begin Source File
@@ -1225,6 +1233,10 @@ SOURCE=..\..\include\wx\calctrl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\collpane.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\dataview.h
 # End Source File
 # Begin Source File

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index ece2dcd2635fccf02a387775758bf519104a9fee..63cb5f87b68471eaeab16d7a529745eef05a70a0 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -4082,10 +4082,6 @@ SOURCE=..\..\src\generic\clrpickerg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\collpaneg.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\generic\colrdlgg.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
@@ -8201,6 +8197,10 @@ SOURCE=..\..\include\wx\generic\clrpickerg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\collpaneg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\colpaneg.h
 # End Source File
 # Begin Source File

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index afc9a5644d87e575c2bf7094128073e5cb34c73a..d77988ba6c2eaff575093a68d304d2cae19a17bf 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -4203,6 +4203,10 @@ SOURCE=..\include\wx\generic\clrpickerg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\generic\collpaneg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\generic\colpaneg.h
 # End Source File
 # Begin Source File