fixed test failures under wxMSW when using our wxVsnprintf implementation (remains...

[wxWidgets.git] / build / msw / makefile.bcc

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index ec5ee4426e733e62b01232846b3c9bb24d77897c..e59b671e15daa6d593655b2cb1e929e8c9c4b488 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -919,8 +919,7 @@ MEDIADLL_OBJECTS =  \
        $(OBJS)\mediadll_mediactrlcmn.obj \
        $(OBJS)\mediadll_mediactrl_am.obj \
        $(OBJS)\mediadll_mediactrl_wmp10.obj \
-       $(OBJS)\mediadll_mediactrl_qt.obj \
-       $(OBJS)\mediadll_activex.obj
+       $(OBJS)\mediadll_mediactrl_qt.obj
 MEDIALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -934,8 +933,7 @@ MEDIALIB_OBJECTS =  \
        $(OBJS)\medialib_mediactrlcmn.obj \
        $(OBJS)\medialib_mediactrl_am.obj \
        $(OBJS)\medialib_mediactrl_wmp10.obj \
-       $(OBJS)\medialib_mediactrl_qt.obj \
-       $(OBJS)\medialib_activex.obj
+       $(OBJS)\medialib_mediactrl_qt.obj
 HTMLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1075,6 +1073,7 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_clrpicker.obj \
        $(OBJS)\xrcdll_xh_collpane.obj \
        $(OBJS)\xrcdll_xh_combo.obj \
+       $(OBJS)\xrcdll_xh_comboctrl.obj \
        $(OBJS)\xrcdll_xh_datectrl.obj \
        $(OBJS)\xrcdll_xh_dirpicker.obj \
        $(OBJS)\xrcdll_xh_dlg.obj \
@@ -1143,6 +1142,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_clrpicker.obj \
        $(OBJS)\xrclib_xh_collpane.obj \
        $(OBJS)\xrclib_xh_combo.obj \
+       $(OBJS)\xrclib_xh_comboctrl.obj \
        $(OBJS)\xrclib_xh_datectrl.obj \
        $(OBJS)\xrclib_xh_dirpicker.obj \
        $(OBJS)\xrclib_xh_dlg.obj \
@@ -1411,7 +1411,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_mediactrl_am.obj \
        $(OBJS)\monodll_mediactrl_wmp10.obj \
        $(OBJS)\monodll_mediactrl_qt.obj \
-       $(OBJS)\monodll_activex.obj \
        $(OBJS)\monodll_helpbest.obj \
        $(OBJS)\monodll_helpctrl.obj \
        $(OBJS)\monodll_helpdata.obj \
@@ -1451,6 +1450,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_clrpicker.obj \
        $(OBJS)\monodll_xh_collpane.obj \
        $(OBJS)\monodll_xh_combo.obj \
+       $(OBJS)\monodll_xh_comboctrl.obj \
        $(OBJS)\monodll_xh_datectrl.obj \
        $(OBJS)\monodll_xh_dirpicker.obj \
        $(OBJS)\monodll_xh_dlg.obj \
@@ -1608,6 +1608,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_nativewin.obj \
        $(OBJS)\monodll_notebook.obj \
        $(OBJS)\monodll_access.obj \
+       $(OBJS)\monodll_activex.obj \
        $(OBJS)\monodll_ownerdrw.obj \
        $(OBJS)\monodll_radiobox.obj \
        $(OBJS)\monodll_radiobut.obj \
@@ -1703,6 +1704,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_nbkbase.obj \
        $(OBJS)\monodll_overlaycmn.obj \
        $(OBJS)\monodll_paper.obj \
+       $(OBJS)\monodll_persist.obj \
        $(OBJS)\monodll_pickerbase.obj \
        $(OBJS)\monodll_popupcmn.obj \
        $(OBJS)\monodll_prntbase.obj \
@@ -1713,6 +1715,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_rgncmn.obj \
        $(OBJS)\monodll_settcmn.obj \
        $(OBJS)\monodll_sizer.obj \
+       $(OBJS)\monodll_spinctrlcmn.obj \
        $(OBJS)\monodll_srchcmn.obj \
        $(OBJS)\monodll_statbar.obj \
        $(OBJS)\monodll_stattextcmn.obj \
@@ -1940,6 +1943,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_nbkbase.obj \
        $(OBJS)\monodll_overlaycmn.obj \
        $(OBJS)\monodll_paper.obj \
+       $(OBJS)\monodll_persist.obj \
        $(OBJS)\monodll_pickerbase.obj \
        $(OBJS)\monodll_popupcmn.obj \
        $(OBJS)\monodll_prntbase.obj \
@@ -1950,6 +1954,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_rgncmn.obj \
        $(OBJS)\monodll_settcmn.obj \
        $(OBJS)\monodll_sizer.obj \
+       $(OBJS)\monodll_spinctrlcmn.obj \
        $(OBJS)\monodll_srchcmn.obj \
        $(OBJS)\monodll_statbar.obj \
        $(OBJS)\monodll_stattextcmn.obj \
@@ -2026,12 +2031,12 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_tipdlg.obj \
        $(OBJS)\monodll_wizard.obj \
        $(OBJS)\monodll_taskbarcmn.obj \
-       $(OBJS)\monodll_animateg.obj \
        $(OBJS)\monodll_aboutdlg.obj \
        $(OBJS)\monodll_notifmsg.obj \
        $(OBJS)\monodll_sound.obj \
        $(OBJS)\monodll_taskbar.obj \
        $(OBJS)\monodll_joystick.obj \
+       $(OBJS)\monodll_animateg.obj \
        $(OBJS)\monodll_bmpcbox.obj \
        $(OBJS)\monodll_calctrl.obj \
        $(OBJS)\monodll_datecontrols.obj \
@@ -2065,7 +2070,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_tipdlg.obj \
        $(OBJS)\monodll_wizard.obj \
        $(OBJS)\monodll_taskbarcmn.obj \
-       $(OBJS)\monodll_animateg.obj \
        $(OBJS)\monodll_aboutdlg.obj \
        $(OBJS)\monodll_notifmsg.obj \
        $(OBJS)\monodll_sound.obj \
@@ -2088,7 +2092,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_mediactrl_am.obj \
        $(OBJS)\monolib_mediactrl_wmp10.obj \
        $(OBJS)\monolib_mediactrl_qt.obj \
-       $(OBJS)\monolib_activex.obj \
        $(OBJS)\monolib_helpbest.obj \
        $(OBJS)\monolib_helpctrl.obj \
        $(OBJS)\monolib_helpdata.obj \
@@ -2128,6 +2131,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_clrpicker.obj \
        $(OBJS)\monolib_xh_collpane.obj \
        $(OBJS)\monolib_xh_combo.obj \
+       $(OBJS)\monolib_xh_comboctrl.obj \
        $(OBJS)\monolib_xh_datectrl.obj \
        $(OBJS)\monolib_xh_dirpicker.obj \
        $(OBJS)\monolib_xh_dlg.obj \
@@ -2285,6 +2289,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_nativewin.obj \
        $(OBJS)\monolib_notebook.obj \
        $(OBJS)\monolib_access.obj \
+       $(OBJS)\monolib_activex.obj \
        $(OBJS)\monolib_ownerdrw.obj \
        $(OBJS)\monolib_radiobox.obj \
        $(OBJS)\monolib_radiobut.obj \
@@ -2380,6 +2385,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_nbkbase.obj \
        $(OBJS)\monolib_overlaycmn.obj \
        $(OBJS)\monolib_paper.obj \
+       $(OBJS)\monolib_persist.obj \
        $(OBJS)\monolib_pickerbase.obj \
        $(OBJS)\monolib_popupcmn.obj \
        $(OBJS)\monolib_prntbase.obj \
@@ -2390,6 +2396,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_rgncmn.obj \
        $(OBJS)\monolib_settcmn.obj \
        $(OBJS)\monolib_sizer.obj \
+       $(OBJS)\monolib_spinctrlcmn.obj \
        $(OBJS)\monolib_srchcmn.obj \
        $(OBJS)\monolib_statbar.obj \
        $(OBJS)\monolib_stattextcmn.obj \
@@ -2617,6 +2624,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_nbkbase.obj \
        $(OBJS)\monolib_overlaycmn.obj \
        $(OBJS)\monolib_paper.obj \
+       $(OBJS)\monolib_persist.obj \
        $(OBJS)\monolib_pickerbase.obj \
        $(OBJS)\monolib_popupcmn.obj \
        $(OBJS)\monolib_prntbase.obj \
@@ -2627,6 +2635,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_rgncmn.obj \
        $(OBJS)\monolib_settcmn.obj \
        $(OBJS)\monolib_sizer.obj \
+       $(OBJS)\monolib_spinctrlcmn.obj \
        $(OBJS)\monolib_srchcmn.obj \
        $(OBJS)\monolib_statbar.obj \
        $(OBJS)\monolib_stattextcmn.obj \
@@ -2703,12 +2712,12 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_tipdlg.obj \
        $(OBJS)\monolib_wizard.obj \
        $(OBJS)\monolib_taskbarcmn.obj \
-       $(OBJS)\monolib_animateg.obj \
        $(OBJS)\monolib_aboutdlg.obj \
        $(OBJS)\monolib_notifmsg.obj \
        $(OBJS)\monolib_sound.obj \
        $(OBJS)\monolib_taskbar.obj \
        $(OBJS)\monolib_joystick.obj \
+       $(OBJS)\monolib_animateg.obj \
        $(OBJS)\monolib_bmpcbox.obj \
        $(OBJS)\monolib_calctrl.obj \
        $(OBJS)\monolib_datecontrols.obj \
@@ -2742,7 +2751,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_tipdlg.obj \
        $(OBJS)\monolib_wizard.obj \
        $(OBJS)\monolib_taskbarcmn.obj \
-       $(OBJS)\monolib_animateg.obj \
        $(OBJS)\monolib_aboutdlg.obj \
        $(OBJS)\monolib_notifmsg.obj \
        $(OBJS)\monolib_sound.obj \
@@ -2867,6 +2875,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_nativewin.obj \
        $(OBJS)\coredll_notebook.obj \
        $(OBJS)\coredll_access.obj \
+       $(OBJS)\coredll_activex.obj \
        $(OBJS)\coredll_ownerdrw.obj \
        $(OBJS)\coredll_radiobox.obj \
        $(OBJS)\coredll_radiobut.obj \
@@ -2962,6 +2971,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_nbkbase.obj \
        $(OBJS)\coredll_overlaycmn.obj \
        $(OBJS)\coredll_paper.obj \
+       $(OBJS)\coredll_persist.obj \
        $(OBJS)\coredll_pickerbase.obj \
        $(OBJS)\coredll_popupcmn.obj \
        $(OBJS)\coredll_prntbase.obj \
@@ -2972,6 +2982,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_rgncmn.obj \
        $(OBJS)\coredll_settcmn.obj \
        $(OBJS)\coredll_sizer.obj \
+       $(OBJS)\coredll_spinctrlcmn.obj \
        $(OBJS)\coredll_srchcmn.obj \
        $(OBJS)\coredll_statbar.obj \
        $(OBJS)\coredll_stattextcmn.obj \
@@ -3199,6 +3210,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_nbkbase.obj \
        $(OBJS)\coredll_overlaycmn.obj \
        $(OBJS)\coredll_paper.obj \
+       $(OBJS)\coredll_persist.obj \
        $(OBJS)\coredll_pickerbase.obj \
        $(OBJS)\coredll_popupcmn.obj \
        $(OBJS)\coredll_prntbase.obj \
@@ -3209,6 +3221,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_rgncmn.obj \
        $(OBJS)\coredll_settcmn.obj \
        $(OBJS)\coredll_sizer.obj \
+       $(OBJS)\coredll_spinctrlcmn.obj \
        $(OBJS)\coredll_srchcmn.obj \
        $(OBJS)\coredll_statbar.obj \
        $(OBJS)\coredll_stattextcmn.obj \
@@ -3346,6 +3359,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_nativewin.obj \
        $(OBJS)\corelib_notebook.obj \
        $(OBJS)\corelib_access.obj \
+       $(OBJS)\corelib_activex.obj \
        $(OBJS)\corelib_ownerdrw.obj \
        $(OBJS)\corelib_radiobox.obj \
        $(OBJS)\corelib_radiobut.obj \
@@ -3441,6 +3455,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_nbkbase.obj \
        $(OBJS)\corelib_overlaycmn.obj \
        $(OBJS)\corelib_paper.obj \
+       $(OBJS)\corelib_persist.obj \
        $(OBJS)\corelib_pickerbase.obj \
        $(OBJS)\corelib_popupcmn.obj \
        $(OBJS)\corelib_prntbase.obj \
@@ -3451,6 +3466,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_rgncmn.obj \
        $(OBJS)\corelib_settcmn.obj \
        $(OBJS)\corelib_sizer.obj \
+       $(OBJS)\corelib_spinctrlcmn.obj \
        $(OBJS)\corelib_srchcmn.obj \
        $(OBJS)\corelib_statbar.obj \
        $(OBJS)\corelib_stattextcmn.obj \
@@ -3678,6 +3694,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_nbkbase.obj \
        $(OBJS)\corelib_overlaycmn.obj \
        $(OBJS)\corelib_paper.obj \
+       $(OBJS)\corelib_persist.obj \
        $(OBJS)\corelib_pickerbase.obj \
        $(OBJS)\corelib_popupcmn.obj \
        $(OBJS)\corelib_prntbase.obj \
@@ -3688,6 +3705,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_rgncmn.obj \
        $(OBJS)\corelib_settcmn.obj \
        $(OBJS)\corelib_sizer.obj \
+       $(OBJS)\corelib_spinctrlcmn.obj \
        $(OBJS)\corelib_srchcmn.obj \
        $(OBJS)\corelib_statbar.obj \
        $(OBJS)\corelib_stattextcmn.obj \
@@ -3774,12 +3792,12 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_tipdlg.obj \
        $(OBJS)\advdll_wizard.obj \
        $(OBJS)\advdll_taskbarcmn.obj \
-       $(OBJS)\advdll_animateg.obj \
        $(OBJS)\advdll_aboutdlg.obj \
        $(OBJS)\advdll_notifmsg.obj \
        $(OBJS)\advdll_sound.obj \
        $(OBJS)\advdll_taskbar.obj \
        $(OBJS)\advdll_joystick.obj \
+       $(OBJS)\advdll_animateg.obj \
        $(OBJS)\advdll_bmpcbox.obj \
        $(OBJS)\advdll_calctrl.obj \
        $(OBJS)\advdll_datecontrols.obj \
@@ -3813,7 +3831,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_tipdlg.obj \
        $(OBJS)\advdll_wizard.obj \
        $(OBJS)\advdll_taskbarcmn.obj \
-       $(OBJS)\advdll_animateg.obj \
        $(OBJS)\advdll_aboutdlg.obj \
        $(OBJS)\advdll_notifmsg.obj \
        $(OBJS)\advdll_sound.obj \
@@ -3853,12 +3870,12 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_tipdlg.obj \
        $(OBJS)\advlib_wizard.obj \
        $(OBJS)\advlib_taskbarcmn.obj \
-       $(OBJS)\advlib_animateg.obj \
        $(OBJS)\advlib_aboutdlg.obj \
        $(OBJS)\advlib_notifmsg.obj \
        $(OBJS)\advlib_sound.obj \
        $(OBJS)\advlib_taskbar.obj \
        $(OBJS)\advlib_joystick.obj \
+       $(OBJS)\advlib_animateg.obj \
        $(OBJS)\advlib_bmpcbox.obj \
        $(OBJS)\advlib_calctrl.obj \
        $(OBJS)\advlib_datecontrols.obj \
@@ -3892,7 +3909,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_tipdlg.obj \
        $(OBJS)\advlib_wizard.obj \
        $(OBJS)\advlib_taskbarcmn.obj \
-       $(OBJS)\advlib_animateg.obj \
        $(OBJS)\advlib_aboutdlg.obj \
        $(OBJS)\advlib_notifmsg.obj \
        $(OBJS)\advlib_sound.obj \
@@ -5767,6 +5783,9 @@ $(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
+$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+
 $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
@@ -5872,9 +5891,6 @@ $(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 $(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
 
-$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp
 
@@ -5992,6 +6008,9 @@ $(OBJS)\monodll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 
+$(OBJS)\monodll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+
 $(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 
@@ -7131,6 +7150,11 @@ $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
@@ -7181,6 +7205,11 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp
@@ -7546,16 +7575,6 @@ $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
@@ -7581,6 +7600,11 @@ $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+
 $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_58) $(__DEBUG_DEFINE_p_57) $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57) $(__UNICODE_DEFINE_p_58) $(__MSLU_DEFINE_p_57) $(__GFXCTX_DEFINE_p_57) -i$(SETUPHDIR) -i..\..\include -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG)  -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_BASE=1 -dWXMAKINGDLL -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS ..\..\src\msw\version.rc
 
@@ -7977,6 +8001,9 @@ $(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
+$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+
 $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
@@ -8082,9 +8109,6 @@ $(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 $(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
 
-$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp
 
@@ -8202,6 +8226,9 @@ $(OBJS)\monolib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 
+$(OBJS)\monolib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+
 $(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 
@@ -9341,6 +9368,11 @@ $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
@@ -9391,6 +9423,11 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp
@@ -9756,16 +9793,6 @@ $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
@@ -9791,6 +9818,11 @@ $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+
 $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
@@ -10571,6 +10603,9 @@ $(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
+$(OBJS)\coredll_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+
 $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
@@ -11572,6 +11607,11 @@ $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
@@ -11622,6 +11662,11 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp
@@ -11932,6 +11977,9 @@ $(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
+$(OBJS)\corelib_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+
 $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
@@ -12933,6 +12981,11 @@ $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
@@ -12983,6 +13036,11 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp
@@ -13314,14 +13372,6 @@ $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
 $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
        $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
 
-$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-
-!if "$(WXUNIV)" == "1"
-$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
 $(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
        $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
 
@@ -13337,6 +13387,9 @@ $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
 $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
        $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
 
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+
 $(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
@@ -13430,14 +13483,6 @@ $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
 $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
        $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
 
-$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-
-!if "$(WXUNIV)" == "1"
-$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
 $(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
        $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
 
@@ -13453,6 +13498,9 @@ $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
 $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
        $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
 
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+
 $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
@@ -13471,9 +13519,6 @@ $(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 $(OBJS)\mediadll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
        $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
 
-$(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\medialib_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
@@ -13489,9 +13534,6 @@ $(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 $(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
        $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
 
-$(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp
 
@@ -13732,6 +13774,9 @@ $(OBJS)\xrcdll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 
+$(OBJS)\xrcdll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+
 $(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
 
@@ -13909,6 +13954,9 @@ $(OBJS)\xrclib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
 $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
        $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
 
+$(OBJS)\xrclib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+
 $(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
        $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp