ReadBig() should be defined in ANSI build too

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

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index d5a3c2bf914cad5fbcdcb6974d3c6aaad68690c1..65ae2f601aa4eacd85d45825c5eea2e7b780b8b1 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1716,7 +1716,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_dragimag.obj \
        $(OBJS)\monodll_filedlg.obj \
        $(OBJS)\monodll_frame.obj \
-       $(OBJS)\monodll_gauge95.obj \
+       $(OBJS)\monodll_gauge.obj \
        $(OBJS)\monodll_iniconf.obj \
        $(OBJS)\monodll_listbox.obj \
        $(OBJS)\monodll_listctrl.obj \
@@ -1733,16 +1733,16 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_radiobox.obj \
        $(OBJS)\monodll_radiobut.obj \
        $(OBJS)\monodll_scrolbar.obj \
-       $(OBJS)\monodll_slider95.obj \
+       $(OBJS)\monodll_slider.obj \
        $(OBJS)\monodll_spinbutt.obj \
        $(OBJS)\monodll_spinctrl.obj \
        $(OBJS)\monodll_statbmp.obj \
        $(OBJS)\monodll_statbox.obj \
-       $(OBJS)\monodll_statbr95.obj \
+       $(OBJS)\monodll_statusbar.obj \
        $(OBJS)\monodll_statline.obj \
        $(OBJS)\monodll_stattext.obj \
        $(OBJS)\monodll_tabctrl.obj \
-       $(OBJS)\monodll_tbar95.obj \
+       $(OBJS)\monodll_toolbar.obj \
        $(OBJS)\monodll_textctrl.obj \
        $(OBJS)\monodll_textentry.obj \
        $(OBJS)\monodll_tglbtn.obj \
@@ -1846,6 +1846,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_valtext.obj \
        $(OBJS)\monodll_wincmn.obj \
        $(OBJS)\monodll_windowid.obj \
+       $(OBJS)\monodll_wrapsizer.obj \
        $(OBJS)\monodll_xpmdecod.obj \
        $(OBJS)\monodll_busyinfo.obj \
        $(OBJS)\monodll_buttonbar.obj \
@@ -1946,7 +1947,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_checkbox.obj \
        $(OBJS)\monodll_checklst.obj \
        $(OBJS)\monodll_choice.obj \
-       $(OBJS)\monodll_colschem.obj \
        $(OBJS)\monodll_combobox.obj \
        $(OBJS)\monodll_control.obj \
        $(OBJS)\monodll_ctrlrend.obj \
@@ -1963,6 +1963,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_scrarrow.obj \
        $(OBJS)\monodll_scrolbar.obj \
        $(OBJS)\monodll_scrthumb.obj \
+       $(OBJS)\monodll_settingsuniv.obj \
        $(OBJS)\monodll_slider.obj \
        $(OBJS)\monodll_spinbutt.obj \
        $(OBJS)\monodll_statbmp.obj \
@@ -2077,6 +2078,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_valtext.obj \
        $(OBJS)\monodll_wincmn.obj \
        $(OBJS)\monodll_windowid.obj \
+       $(OBJS)\monodll_wrapsizer.obj \
        $(OBJS)\monodll_xpmdecod.obj \
        $(OBJS)\monodll_busyinfo.obj \
        $(OBJS)\monodll_buttonbar.obj \
@@ -2110,11 +2112,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_animatecmn.obj \
+       $(OBJS)\monodll_bmpcboxcmn.obj \
+       $(OBJS)\monodll_calctrlcmn.obj \
        $(OBJS)\monodll_datavcmn.obj \
        $(OBJS)\monodll_hyperlnkcmn.obj \
        $(OBJS)\monodll_aboutdlgg.obj \
        $(OBJS)\monodll_bmpcboxg.obj \
-       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_calctrlg.obj \
        $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \
        $(OBJS)\monodll_editlbox.obj \
@@ -2138,16 +2142,21 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_sound.obj \
        $(OBJS)\monodll_taskbar.obj \
        $(OBJS)\monodll_joystick.obj \
+       $(OBJS)\monodll_bmpcbox.obj \
+       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_datecontrols.obj \
        $(OBJS)\monodll_datectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_animatecmn.obj \
+       $(OBJS)\monodll_bmpcboxcmn.obj \
+       $(OBJS)\monodll_calctrlcmn.obj \
        $(OBJS)\monodll_datavcmn.obj \
        $(OBJS)\monodll_hyperlnkcmn.obj \
        $(OBJS)\monodll_aboutdlgg.obj \
        $(OBJS)\monodll_bmpcboxg.obj \
-       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_calctrlg.obj \
        $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \
        $(OBJS)\monodll_editlbox.obj \
@@ -2366,7 +2375,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_dragimag.obj \
        $(OBJS)\monolib_filedlg.obj \
        $(OBJS)\monolib_frame.obj \
-       $(OBJS)\monolib_gauge95.obj \
+       $(OBJS)\monolib_gauge.obj \
        $(OBJS)\monolib_iniconf.obj \
        $(OBJS)\monolib_listbox.obj \
        $(OBJS)\monolib_listctrl.obj \
@@ -2383,16 +2392,16 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_radiobox.obj \
        $(OBJS)\monolib_radiobut.obj \
        $(OBJS)\monolib_scrolbar.obj \
-       $(OBJS)\monolib_slider95.obj \
+       $(OBJS)\monolib_slider.obj \
        $(OBJS)\monolib_spinbutt.obj \
        $(OBJS)\monolib_spinctrl.obj \
        $(OBJS)\monolib_statbmp.obj \
        $(OBJS)\monolib_statbox.obj \
-       $(OBJS)\monolib_statbr95.obj \
+       $(OBJS)\monolib_statusbar.obj \
        $(OBJS)\monolib_statline.obj \
        $(OBJS)\monolib_stattext.obj \
        $(OBJS)\monolib_tabctrl.obj \
-       $(OBJS)\monolib_tbar95.obj \
+       $(OBJS)\monolib_toolbar.obj \
        $(OBJS)\monolib_textctrl.obj \
        $(OBJS)\monolib_textentry.obj \
        $(OBJS)\monolib_tglbtn.obj \
@@ -2496,6 +2505,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_valtext.obj \
        $(OBJS)\monolib_wincmn.obj \
        $(OBJS)\monolib_windowid.obj \
+       $(OBJS)\monolib_wrapsizer.obj \
        $(OBJS)\monolib_xpmdecod.obj \
        $(OBJS)\monolib_busyinfo.obj \
        $(OBJS)\monolib_buttonbar.obj \
@@ -2596,7 +2606,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_checkbox.obj \
        $(OBJS)\monolib_checklst.obj \
        $(OBJS)\monolib_choice.obj \
-       $(OBJS)\monolib_colschem.obj \
        $(OBJS)\monolib_combobox.obj \
        $(OBJS)\monolib_control.obj \
        $(OBJS)\monolib_ctrlrend.obj \
@@ -2613,6 +2622,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_scrarrow.obj \
        $(OBJS)\monolib_scrolbar.obj \
        $(OBJS)\monolib_scrthumb.obj \
+       $(OBJS)\monolib_settingsuniv.obj \
        $(OBJS)\monolib_slider.obj \
        $(OBJS)\monolib_spinbutt.obj \
        $(OBJS)\monolib_statbmp.obj \
@@ -2727,6 +2737,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_valtext.obj \
        $(OBJS)\monolib_wincmn.obj \
        $(OBJS)\monolib_windowid.obj \
+       $(OBJS)\monolib_wrapsizer.obj \
        $(OBJS)\monolib_xpmdecod.obj \
        $(OBJS)\monolib_busyinfo.obj \
        $(OBJS)\monolib_buttonbar.obj \
@@ -2760,11 +2771,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_animatecmn.obj \
+       $(OBJS)\monolib_bmpcboxcmn.obj \
+       $(OBJS)\monolib_calctrlcmn.obj \
        $(OBJS)\monolib_datavcmn.obj \
        $(OBJS)\monolib_hyperlnkcmn.obj \
        $(OBJS)\monolib_aboutdlgg.obj \
        $(OBJS)\monolib_bmpcboxg.obj \
-       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_calctrlg.obj \
        $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \
        $(OBJS)\monolib_editlbox.obj \
@@ -2788,16 +2801,21 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_sound.obj \
        $(OBJS)\monolib_taskbar.obj \
        $(OBJS)\monolib_joystick.obj \
+       $(OBJS)\monolib_bmpcbox.obj \
+       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_datecontrols.obj \
        $(OBJS)\monolib_datectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_animatecmn.obj \
+       $(OBJS)\monolib_bmpcboxcmn.obj \
+       $(OBJS)\monolib_calctrlcmn.obj \
        $(OBJS)\monolib_datavcmn.obj \
        $(OBJS)\monolib_hyperlnkcmn.obj \
        $(OBJS)\monolib_aboutdlgg.obj \
        $(OBJS)\monolib_bmpcboxg.obj \
-       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_calctrlg.obj \
        $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \
        $(OBJS)\monolib_editlbox.obj \
@@ -2955,7 +2973,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_dragimag.obj \
        $(OBJS)\coredll_filedlg.obj \
        $(OBJS)\coredll_frame.obj \
-       $(OBJS)\coredll_gauge95.obj \
+       $(OBJS)\coredll_gauge.obj \
        $(OBJS)\coredll_iniconf.obj \
        $(OBJS)\coredll_listbox.obj \
        $(OBJS)\coredll_listctrl.obj \
@@ -2972,16 +2990,16 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_radiobox.obj \
        $(OBJS)\coredll_radiobut.obj \
        $(OBJS)\coredll_scrolbar.obj \
-       $(OBJS)\coredll_slider95.obj \
+       $(OBJS)\coredll_slider.obj \
        $(OBJS)\coredll_spinbutt.obj \
        $(OBJS)\coredll_spinctrl.obj \
        $(OBJS)\coredll_statbmp.obj \
        $(OBJS)\coredll_statbox.obj \
-       $(OBJS)\coredll_statbr95.obj \
+       $(OBJS)\coredll_statusbar.obj \
        $(OBJS)\coredll_statline.obj \
        $(OBJS)\coredll_stattext.obj \
        $(OBJS)\coredll_tabctrl.obj \
-       $(OBJS)\coredll_tbar95.obj \
+       $(OBJS)\coredll_toolbar.obj \
        $(OBJS)\coredll_textctrl.obj \
        $(OBJS)\coredll_textentry.obj \
        $(OBJS)\coredll_tglbtn.obj \
@@ -3085,6 +3103,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \
        $(OBJS)\coredll_windowid.obj \
+       $(OBJS)\coredll_wrapsizer.obj \
        $(OBJS)\coredll_xpmdecod.obj \
        $(OBJS)\coredll_busyinfo.obj \
        $(OBJS)\coredll_buttonbar.obj \
@@ -3185,7 +3204,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_checkbox.obj \
        $(OBJS)\coredll_checklst.obj \
        $(OBJS)\coredll_choice.obj \
-       $(OBJS)\coredll_colschem.obj \
        $(OBJS)\coredll_combobox.obj \
        $(OBJS)\coredll_control.obj \
        $(OBJS)\coredll_ctrlrend.obj \
@@ -3202,6 +3220,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_scrarrow.obj \
        $(OBJS)\coredll_scrolbar.obj \
        $(OBJS)\coredll_scrthumb.obj \
+       $(OBJS)\coredll_settingsuniv.obj \
        $(OBJS)\coredll_slider.obj \
        $(OBJS)\coredll_spinbutt.obj \
        $(OBJS)\coredll_statbmp.obj \
@@ -3316,6 +3335,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_valtext.obj \
        $(OBJS)\coredll_wincmn.obj \
        $(OBJS)\coredll_windowid.obj \
+       $(OBJS)\coredll_wrapsizer.obj \
        $(OBJS)\coredll_xpmdecod.obj \
        $(OBJS)\coredll_busyinfo.obj \
        $(OBJS)\coredll_buttonbar.obj \
@@ -3426,7 +3446,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_dragimag.obj \
        $(OBJS)\corelib_filedlg.obj \
        $(OBJS)\corelib_frame.obj \
-       $(OBJS)\corelib_gauge95.obj \
+       $(OBJS)\corelib_gauge.obj \
        $(OBJS)\corelib_iniconf.obj \
        $(OBJS)\corelib_listbox.obj \
        $(OBJS)\corelib_listctrl.obj \
@@ -3443,16 +3463,16 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_radiobox.obj \
        $(OBJS)\corelib_radiobut.obj \
        $(OBJS)\corelib_scrolbar.obj \
-       $(OBJS)\corelib_slider95.obj \
+       $(OBJS)\corelib_slider.obj \
        $(OBJS)\corelib_spinbutt.obj \
        $(OBJS)\corelib_spinctrl.obj \
        $(OBJS)\corelib_statbmp.obj \
        $(OBJS)\corelib_statbox.obj \
-       $(OBJS)\corelib_statbr95.obj \
+       $(OBJS)\corelib_statusbar.obj \
        $(OBJS)\corelib_statline.obj \
        $(OBJS)\corelib_stattext.obj \
        $(OBJS)\corelib_tabctrl.obj \
-       $(OBJS)\corelib_tbar95.obj \
+       $(OBJS)\corelib_toolbar.obj \
        $(OBJS)\corelib_textctrl.obj \
        $(OBJS)\corelib_textentry.obj \
        $(OBJS)\corelib_tglbtn.obj \
@@ -3556,6 +3576,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \
        $(OBJS)\corelib_windowid.obj \
+       $(OBJS)\corelib_wrapsizer.obj \
        $(OBJS)\corelib_xpmdecod.obj \
        $(OBJS)\corelib_busyinfo.obj \
        $(OBJS)\corelib_buttonbar.obj \
@@ -3656,7 +3677,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_checkbox.obj \
        $(OBJS)\corelib_checklst.obj \
        $(OBJS)\corelib_choice.obj \
-       $(OBJS)\corelib_colschem.obj \
        $(OBJS)\corelib_combobox.obj \
        $(OBJS)\corelib_control.obj \
        $(OBJS)\corelib_ctrlrend.obj \
@@ -3673,6 +3693,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_scrarrow.obj \
        $(OBJS)\corelib_scrolbar.obj \
        $(OBJS)\corelib_scrthumb.obj \
+       $(OBJS)\corelib_settingsuniv.obj \
        $(OBJS)\corelib_slider.obj \
        $(OBJS)\corelib_spinbutt.obj \
        $(OBJS)\corelib_statbmp.obj \
@@ -3787,6 +3808,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_valtext.obj \
        $(OBJS)\corelib_wincmn.obj \
        $(OBJS)\corelib_windowid.obj \
+       $(OBJS)\corelib_wrapsizer.obj \
        $(OBJS)\corelib_xpmdecod.obj \
        $(OBJS)\corelib_busyinfo.obj \
        $(OBJS)\corelib_buttonbar.obj \
@@ -3836,11 +3858,13 @@ __RUNTIME_LIBS_208 = $(__THREADSFLAG)
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_animatecmn.obj \
+       $(OBJS)\advdll_bmpcboxcmn.obj \
+       $(OBJS)\advdll_calctrlcmn.obj \
        $(OBJS)\advdll_datavcmn.obj \
        $(OBJS)\advdll_hyperlnkcmn.obj \
        $(OBJS)\advdll_aboutdlgg.obj \
        $(OBJS)\advdll_bmpcboxg.obj \
-       $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_calctrlg.obj \
        $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \
        $(OBJS)\advdll_editlbox.obj \
@@ -3864,16 +3888,21 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_sound.obj \
        $(OBJS)\advdll_taskbar.obj \
        $(OBJS)\advdll_joystick.obj \
+       $(OBJS)\advdll_bmpcbox.obj \
+       $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_datecontrols.obj \
        $(OBJS)\advdll_datectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\advdll_animatecmn.obj \
+       $(OBJS)\advdll_bmpcboxcmn.obj \
+       $(OBJS)\advdll_calctrlcmn.obj \
        $(OBJS)\advdll_datavcmn.obj \
        $(OBJS)\advdll_hyperlnkcmn.obj \
        $(OBJS)\advdll_aboutdlgg.obj \
        $(OBJS)\advdll_bmpcboxg.obj \
-       $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_calctrlg.obj \
        $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \
        $(OBJS)\advdll_editlbox.obj \
@@ -3912,11 +3941,13 @@ __RUNTIME_LIBS_221 = $(__THREADSFLAG)
 !if "$(WXUNIV)" == "0"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_animatecmn.obj \
+       $(OBJS)\advlib_bmpcboxcmn.obj \
+       $(OBJS)\advlib_calctrlcmn.obj \
        $(OBJS)\advlib_datavcmn.obj \
        $(OBJS)\advlib_hyperlnkcmn.obj \
        $(OBJS)\advlib_aboutdlgg.obj \
        $(OBJS)\advlib_bmpcboxg.obj \
-       $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_calctrlg.obj \
        $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \
        $(OBJS)\advlib_editlbox.obj \
@@ -3940,16 +3971,21 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_sound.obj \
        $(OBJS)\advlib_taskbar.obj \
        $(OBJS)\advlib_joystick.obj \
+       $(OBJS)\advlib_bmpcbox.obj \
+       $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_datecontrols.obj \
        $(OBJS)\advlib_datectrl.obj
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\advlib_animatecmn.obj \
+       $(OBJS)\advlib_bmpcboxcmn.obj \
+       $(OBJS)\advlib_calctrlcmn.obj \
        $(OBJS)\advlib_datavcmn.obj \
        $(OBJS)\advlib_hyperlnkcmn.obj \
        $(OBJS)\advlib_aboutdlgg.obj \
        $(OBJS)\advlib_bmpcboxg.obj \
-       $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_calctrlg.obj \
        $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \
        $(OBJS)\advlib_editlbox.obj \
@@ -5874,9 +5910,6 @@ $(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp
 $(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\frame.cpp
 
-$(OBJS)\monodll_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
 $(OBJS)\monodll_iniconf.obj: ..\..\src\msw\iniconf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 
@@ -5904,21 +5937,15 @@ $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
 $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
-$(OBJS)\monodll_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
 $(OBJS)\monodll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 
-$(OBJS)\monodll_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\monodll_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 
 $(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
 
-$(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
 $(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
 
@@ -5949,18 +5976,12 @@ $(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
 $(OBJS)\monodll_tabg.obj: ..\..\src\generic\tabg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tabg.cpp
 
-$(OBJS)\monodll_colschem.obj: ..\..\src\univ\colschem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\colschem.cpp
-
 $(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
 
 $(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 
-$(OBJS)\monodll_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
 $(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
@@ -5973,8 +5994,8 @@ $(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
 $(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
-$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+$(OBJS)\monodll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
 
 $(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
@@ -5982,9 +6003,6 @@ $(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp
 $(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\theme.cpp
 
-$(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
 $(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 
@@ -6003,6 +6021,15 @@ $(OBJS)\monodll_mono.obj: ..\..\src\univ\themes\mono.cpp
 $(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
 
+$(OBJS)\monodll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+
+$(OBJS)\monodll_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+
+$(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+
 $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
 
@@ -6682,6 +6709,16 @@ $(OBJS)\monodll_dialog.obj: ..\..\src\univ\dialog.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -6752,6 +6789,16 @@ $(OBJS)\monodll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -6802,6 +6849,16 @@ $(OBJS)\monodll_stattext.obj: ..\..\src\univ\stattext.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monodll_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monodll_textctrl.obj: ..\..\src\msw\textctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -7322,6 +7379,11 @@ $(OBJS)\monodll_windowid.obj: ..\..\src\common\windowid.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\windowid.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
@@ -7472,6 +7534,16 @@ $(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp
@@ -7493,8 +7565,8 @@ $(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\calctrl.cpp
+$(OBJS)\monodll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -7983,9 +8055,6 @@ $(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp
 $(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\frame.cpp
 
-$(OBJS)\monolib_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
 $(OBJS)\monolib_iniconf.obj: ..\..\src\msw\iniconf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 
@@ -8013,21 +8082,15 @@ $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
 $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
-$(OBJS)\monolib_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
 $(OBJS)\monolib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 
-$(OBJS)\monolib_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\monolib_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 
 $(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
 
-$(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
 $(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
 
@@ -8058,18 +8121,12 @@ $(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
 $(OBJS)\monolib_tabg.obj: ..\..\src\generic\tabg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tabg.cpp
 
-$(OBJS)\monolib_colschem.obj: ..\..\src\univ\colschem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\colschem.cpp
-
 $(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
 
 $(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 
-$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
 $(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
@@ -8082,8 +8139,8 @@ $(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
 $(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
-$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp
+$(OBJS)\monolib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
 
 $(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
@@ -8091,9 +8148,6 @@ $(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp
 $(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\theme.cpp
 
-$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
 $(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 
@@ -8112,6 +8166,15 @@ $(OBJS)\monolib_mono.obj: ..\..\src\univ\themes\mono.cpp
 $(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
 
+$(OBJS)\monolib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+
+$(OBJS)\monolib_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+
+$(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+
 $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
 
@@ -8791,6 +8854,16 @@ $(OBJS)\monolib_dialog.obj: ..\..\src\univ\dialog.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -8861,6 +8934,16 @@ $(OBJS)\monolib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -8911,6 +8994,16 @@ $(OBJS)\monolib_stattext.obj: ..\..\src\univ\stattext.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\monolib_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\monolib_textctrl.obj: ..\..\src\msw\textctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -9431,6 +9524,11 @@ $(OBJS)\monolib_windowid.obj: ..\..\src\common\windowid.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\windowid.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
@@ -9581,6 +9679,16 @@ $(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp
@@ -9602,8 +9710,8 @@ $(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\calctrl.cpp
+$(OBJS)\monolib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
@@ -10476,9 +10584,6 @@ $(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp
 $(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\frame.cpp
 
-$(OBJS)\coredll_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
 $(OBJS)\coredll_iniconf.obj: ..\..\src\msw\iniconf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 
@@ -10506,21 +10611,15 @@ $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
 $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
-$(OBJS)\coredll_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
 $(OBJS)\coredll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 
-$(OBJS)\coredll_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\coredll_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 
 $(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
 
-$(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
 $(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
 
@@ -10551,18 +10650,12 @@ $(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
 $(OBJS)\coredll_tabg.obj: ..\..\src\generic\tabg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\tabg.cpp
 
-$(OBJS)\coredll_colschem.obj: ..\..\src\univ\colschem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\colschem.cpp
-
 $(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
 
 $(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 
-$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
 $(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
@@ -10575,8 +10668,8 @@ $(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
 $(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
-$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+$(OBJS)\coredll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
 
 $(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
@@ -10584,9 +10677,6 @@ $(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp
 $(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\theme.cpp
 
-$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
 $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 
@@ -10960,6 +11050,16 @@ $(OBJS)\coredll_dialog.obj: ..\..\src\univ\dialog.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -11030,6 +11130,16 @@ $(OBJS)\coredll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -11080,6 +11190,16 @@ $(OBJS)\coredll_stattext.obj: ..\..\src\univ\stattext.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\coredll_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\coredll_textctrl.obj: ..\..\src\msw\textctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -11600,6 +11720,11 @@ $(OBJS)\coredll_windowid.obj: ..\..\src\common\windowid.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\windowid.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
@@ -11790,9 +11915,6 @@ $(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp
 $(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\frame.cpp
 
-$(OBJS)\corelib_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge95.cpp
-
 $(OBJS)\corelib_iniconf.obj: ..\..\src\msw\iniconf.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
 
@@ -11820,21 +11942,15 @@ $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
 $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
-$(OBJS)\corelib_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider95.cpp
-
 $(OBJS)\corelib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
 
-$(OBJS)\corelib_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\corelib_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
 
 $(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
 
-$(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tbar95.cpp
-
 $(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
 
@@ -11865,18 +11981,12 @@ $(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
 $(OBJS)\corelib_tabg.obj: ..\..\src\generic\tabg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\tabg.cpp
 
-$(OBJS)\corelib_colschem.obj: ..\..\src\univ\colschem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\colschem.cpp
-
 $(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
 
 $(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
 
-$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
-
 $(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp
 
@@ -11889,8 +11999,8 @@ $(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
 $(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
 
-$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp
+$(OBJS)\corelib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
 
 $(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
@@ -11898,9 +12008,6 @@ $(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp
 $(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\theme.cpp
 
-$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
-
 $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp
 
@@ -12274,6 +12381,16 @@ $(OBJS)\corelib_dialog.obj: ..\..\src\univ\dialog.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
@@ -12344,6 +12461,16 @@ $(OBJS)\corelib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
@@ -12394,6 +12521,16 @@ $(OBJS)\corelib_stattext.obj: ..\..\src\univ\stattext.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
 !endif
 
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
+$(OBJS)\corelib_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
+$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
+!endif
+
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 $(OBJS)\corelib_textctrl.obj: ..\..\src\msw\textctrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
@@ -12914,6 +13051,11 @@ $(OBJS)\corelib_windowid.obj: ..\..\src\common\windowid.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\windowid.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
@@ -13065,12 +13207,27 @@ $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
 $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_ADV ..\..\src\msw\version.rc
 
+$(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+
+$(OBJS)\advdll_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+
+$(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+
 $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
 
 $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
 
+$(OBJS)\advdll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+
+$(OBJS)\advdll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
+
 $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp
 
@@ -13083,8 +13240,8 @@ $(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
 $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
 
-$(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\calctrl.cpp
+$(OBJS)\advdll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
 
 $(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp
@@ -13163,12 +13320,27 @@ $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
 $(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
+$(OBJS)\advlib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+
+$(OBJS)\advlib_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+
+$(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+
 $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
 
 $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
 
+$(OBJS)\advlib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+
+$(OBJS)\advlib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
+
 $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp
 
@@ -13181,8 +13353,8 @@ $(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
 $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
 
-$(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\calctrl.cpp
+$(OBJS)\advlib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
 
 $(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp