implement propert background style semantics for OS X

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

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 4da5672d5c3c0c81027d9b1de1c03a2e210e6cd6..5560dd63f6d7c88a2311905cd36ee2de671de570 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -319,6 +319,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_config.obj \
        $(OBJS)\monodll_convauto.obj \
        $(OBJS)\monodll_datetime.obj \
+       $(OBJS)\monodll_datetimefmt.obj \
        $(OBJS)\monodll_datstrm.obj \
        $(OBJS)\monodll_dircmn.obj \
        $(OBJS)\monodll_dynarray.obj \
@@ -358,6 +359,7 @@ MONODLL_OBJECTS =  \
        $(OBJS)\monodll_regex.obj \
        $(OBJS)\monodll_stdpbase.obj \
        $(OBJS)\monodll_sstream.obj \
+       $(OBJS)\monodll_stdstream.obj \
        $(OBJS)\monodll_stopwatch.obj \
        $(OBJS)\monodll_strconv.obj \
        $(OBJS)\monodll_stream.obj \
@@ -462,6 +464,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_config.obj \
        $(OBJS)\monolib_convauto.obj \
        $(OBJS)\monolib_datetime.obj \
+       $(OBJS)\monolib_datetimefmt.obj \
        $(OBJS)\monolib_datstrm.obj \
        $(OBJS)\monolib_dircmn.obj \
        $(OBJS)\monolib_dynarray.obj \
@@ -501,6 +504,7 @@ MONOLIB_OBJECTS =  \
        $(OBJS)\monolib_regex.obj \
        $(OBJS)\monolib_stdpbase.obj \
        $(OBJS)\monolib_sstream.obj \
+       $(OBJS)\monolib_stdstream.obj \
        $(OBJS)\monolib_stopwatch.obj \
        $(OBJS)\monolib_strconv.obj \
        $(OBJS)\monolib_stream.obj \
@@ -603,6 +607,7 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_config.obj \
        $(OBJS)\basedll_convauto.obj \
        $(OBJS)\basedll_datetime.obj \
+       $(OBJS)\basedll_datetimefmt.obj \
        $(OBJS)\basedll_datstrm.obj \
        $(OBJS)\basedll_dircmn.obj \
        $(OBJS)\basedll_dynarray.obj \
@@ -642,6 +647,7 @@ BASEDLL_OBJECTS =  \
        $(OBJS)\basedll_regex.obj \
        $(OBJS)\basedll_stdpbase.obj \
        $(OBJS)\basedll_sstream.obj \
+       $(OBJS)\basedll_stdstream.obj \
        $(OBJS)\basedll_stopwatch.obj \
        $(OBJS)\basedll_strconv.obj \
        $(OBJS)\basedll_stream.obj \
@@ -728,6 +734,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_config.obj \
        $(OBJS)\baselib_convauto.obj \
        $(OBJS)\baselib_datetime.obj \
+       $(OBJS)\baselib_datetimefmt.obj \
        $(OBJS)\baselib_datstrm.obj \
        $(OBJS)\baselib_dircmn.obj \
        $(OBJS)\baselib_dynarray.obj \
@@ -767,6 +774,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_regex.obj \
        $(OBJS)\baselib_stdpbase.obj \
        $(OBJS)\baselib_sstream.obj \
+       $(OBJS)\baselib_stdstream.obj \
        $(OBJS)\baselib_stopwatch.obj \
        $(OBJS)\baselib_strconv.obj \
        $(OBJS)\baselib_stream.obj \
@@ -1147,10 +1155,11 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_datectrl.obj \
        $(OBJS)\xrcdll_xh_dirpicker.obj \
        $(OBJS)\xrcdll_xh_dlg.obj \
-       $(OBJS)\xrcdll_xh_frame.obj \
-       $(OBJS)\xrcdll_xh_mdi.obj \
+       $(OBJS)\xrcdll_xh_editlbox.obj \
+       $(OBJS)\xrcdll_xh_filectrl.obj \
        $(OBJS)\xrcdll_xh_filepicker.obj \
        $(OBJS)\xrcdll_xh_fontpicker.obj \
+       $(OBJS)\xrcdll_xh_frame.obj \
        $(OBJS)\xrcdll_xh_gauge.obj \
        $(OBJS)\xrcdll_xh_gdctl.obj \
        $(OBJS)\xrcdll_xh_grid.obj \
@@ -1159,6 +1168,7 @@ XRCDLL_OBJECTS =  \
        $(OBJS)\xrcdll_xh_listb.obj \
        $(OBJS)\xrcdll_xh_listbk.obj \
        $(OBJS)\xrcdll_xh_listc.obj \
+       $(OBJS)\xrcdll_xh_mdi.obj \
        $(OBJS)\xrcdll_xh_menu.obj \
        $(OBJS)\xrcdll_xh_notbk.obj \
        $(OBJS)\xrcdll_xh_odcombo.obj \
@@ -1219,10 +1229,11 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_datectrl.obj \
        $(OBJS)\xrclib_xh_dirpicker.obj \
        $(OBJS)\xrclib_xh_dlg.obj \
-       $(OBJS)\xrclib_xh_frame.obj \
-       $(OBJS)\xrclib_xh_mdi.obj \
+       $(OBJS)\xrclib_xh_editlbox.obj \
+       $(OBJS)\xrclib_xh_filectrl.obj \
        $(OBJS)\xrclib_xh_filepicker.obj \
        $(OBJS)\xrclib_xh_fontpicker.obj \
+       $(OBJS)\xrclib_xh_frame.obj \
        $(OBJS)\xrclib_xh_gauge.obj \
        $(OBJS)\xrclib_xh_gdctl.obj \
        $(OBJS)\xrclib_xh_grid.obj \
@@ -1231,6 +1242,7 @@ XRCLIB_OBJECTS =  \
        $(OBJS)\xrclib_xh_listb.obj \
        $(OBJS)\xrclib_xh_listbk.obj \
        $(OBJS)\xrclib_xh_listc.obj \
+       $(OBJS)\xrclib_xh_mdi.obj \
        $(OBJS)\xrclib_xh_menu.obj \
        $(OBJS)\xrclib_xh_notbk.obj \
        $(OBJS)\xrclib_xh_odcombo.obj \
@@ -1634,10 +1646,11 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_datectrl.obj \
        $(OBJS)\monodll_xh_dirpicker.obj \
        $(OBJS)\monodll_xh_dlg.obj \
-       $(OBJS)\monodll_xh_frame.obj \
-       $(OBJS)\monodll_xh_mdi.obj \
+       $(OBJS)\monodll_xh_editlbox.obj \
+       $(OBJS)\monodll_xh_filectrl.obj \
        $(OBJS)\monodll_xh_filepicker.obj \
        $(OBJS)\monodll_xh_fontpicker.obj \
+       $(OBJS)\monodll_xh_frame.obj \
        $(OBJS)\monodll_xh_gauge.obj \
        $(OBJS)\monodll_xh_gdctl.obj \
        $(OBJS)\monodll_xh_grid.obj \
@@ -1646,6 +1659,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_xh_listb.obj \
        $(OBJS)\monodll_xh_listbk.obj \
        $(OBJS)\monodll_xh_listc.obj \
+       $(OBJS)\monodll_xh_mdi.obj \
        $(OBJS)\monodll_xh_menu.obj \
        $(OBJS)\monodll_xh_notbk.obj \
        $(OBJS)\monodll_xh_odcombo.obj \
@@ -1705,6 +1719,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_activex.obj \
        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \
@@ -1788,7 +1803,6 @@ ____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 \
@@ -1881,9 +1895,11 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_listctrlcmn.obj \
        $(OBJS)\monodll_matrix.obj \
        $(OBJS)\monodll_menucmn.obj \
+       $(OBJS)\monodll_mousemanager.obj \
        $(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 \
@@ -1945,6 +1961,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_activex.obj \
        $(OBJS)\monodll_app.obj \
        $(OBJS)\monodll_bitmap.obj \
        $(OBJS)\monodll_brush.obj \
@@ -2119,9 +2136,11 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_listctrlcmn.obj \
        $(OBJS)\monodll_matrix.obj \
        $(OBJS)\monodll_menucmn.obj \
+       $(OBJS)\monodll_mousemanager.obj \
        $(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 \
@@ -2209,12 +2228,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 \
@@ -2248,7 +2267,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 \
@@ -2320,10 +2338,11 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_datectrl.obj \
        $(OBJS)\monolib_xh_dirpicker.obj \
        $(OBJS)\monolib_xh_dlg.obj \
-       $(OBJS)\monolib_xh_frame.obj \
-       $(OBJS)\monolib_xh_mdi.obj \
+       $(OBJS)\monolib_xh_editlbox.obj \
+       $(OBJS)\monolib_xh_filectrl.obj \
        $(OBJS)\monolib_xh_filepicker.obj \
        $(OBJS)\monolib_xh_fontpicker.obj \
+       $(OBJS)\monolib_xh_frame.obj \
        $(OBJS)\monolib_xh_gauge.obj \
        $(OBJS)\monolib_xh_gdctl.obj \
        $(OBJS)\monolib_xh_grid.obj \
@@ -2332,6 +2351,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_xh_listb.obj \
        $(OBJS)\monolib_xh_listbk.obj \
        $(OBJS)\monolib_xh_listc.obj \
+       $(OBJS)\monolib_xh_mdi.obj \
        $(OBJS)\monolib_xh_menu.obj \
        $(OBJS)\monolib_xh_notbk.obj \
        $(OBJS)\monolib_xh_odcombo.obj \
@@ -2391,6 +2411,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_activex.obj \
        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \
@@ -2474,7 +2495,6 @@ ____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 \
@@ -2567,9 +2587,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_listctrlcmn.obj \
        $(OBJS)\monolib_matrix.obj \
        $(OBJS)\monolib_menucmn.obj \
+       $(OBJS)\monolib_mousemanager.obj \
        $(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 \
@@ -2631,6 +2653,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_activex.obj \
        $(OBJS)\monolib_app.obj \
        $(OBJS)\monolib_bitmap.obj \
        $(OBJS)\monolib_brush.obj \
@@ -2805,9 +2828,11 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_listctrlcmn.obj \
        $(OBJS)\monolib_matrix.obj \
        $(OBJS)\monolib_menucmn.obj \
+       $(OBJS)\monolib_mousemanager.obj \
        $(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 \
@@ -2895,12 +2920,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 \
@@ -2934,7 +2959,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 \
@@ -3006,6 +3030,7 @@ __RUNTIME_LIBS_181 = $(__THREADSFLAG)
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_activex.obj \
        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \
@@ -3089,7 +3114,6 @@ ____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 \
@@ -3182,9 +3206,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_listctrlcmn.obj \
        $(OBJS)\coredll_matrix.obj \
        $(OBJS)\coredll_menucmn.obj \
+       $(OBJS)\coredll_mousemanager.obj \
        $(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 \
@@ -3246,6 +3272,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_activex.obj \
        $(OBJS)\coredll_app.obj \
        $(OBJS)\coredll_bitmap.obj \
        $(OBJS)\coredll_brush.obj \
@@ -3420,9 +3447,11 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_listctrlcmn.obj \
        $(OBJS)\coredll_matrix.obj \
        $(OBJS)\coredll_menucmn.obj \
+       $(OBJS)\coredll_mousemanager.obj \
        $(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 \
@@ -3494,6 +3523,7 @@ __RUNTIME_LIBS_194 = $(__THREADSFLAG)
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_activex.obj \
        $(OBJS)\corelib_app.obj \
        $(OBJS)\corelib_bitmap.obj \
        $(OBJS)\corelib_brush.obj \
@@ -3577,7 +3607,6 @@ ____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 \
@@ -3670,9 +3699,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_listctrlcmn.obj \
        $(OBJS)\corelib_matrix.obj \
        $(OBJS)\corelib_menucmn.obj \
+       $(OBJS)\corelib_mousemanager.obj \
        $(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 \
@@ -3734,6 +3765,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
 ____CORE_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_activex.obj \
        $(OBJS)\corelib_app.obj \
        $(OBJS)\corelib_bitmap.obj \
        $(OBJS)\corelib_brush.obj \
@@ -3908,9 +3940,11 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_listctrlcmn.obj \
        $(OBJS)\corelib_matrix.obj \
        $(OBJS)\corelib_menucmn.obj \
+       $(OBJS)\corelib_mousemanager.obj \
        $(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 \
@@ -4014,12 +4048,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 \
@@ -4053,7 +4087,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 \
@@ -4099,12 +4132,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 \
@@ -4138,7 +4171,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 \
@@ -5768,6 +5800,9 @@ $(OBJS)\monodll_convauto.obj: ..\..\src\common\convauto.cpp
 $(OBJS)\monodll_datetime.obj: ..\..\src\common\datetime.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datetime.cpp
 
+$(OBJS)\monodll_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datetimefmt.cpp
+
 $(OBJS)\monodll_datstrm.obj: ..\..\src\common\datstrm.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datstrm.cpp
 
@@ -5885,6 +5920,9 @@ $(OBJS)\monodll_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 $(OBJS)\monodll_sstream.obj: ..\..\src\common\sstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sstream.cpp
 
+$(OBJS)\monodll_stdstream.obj: ..\..\src\common\stdstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
 $(OBJS)\monodll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp
 
@@ -6125,9 +6163,6 @@ $(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
-$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
@@ -6362,11 +6397,11 @@ $(OBJS)\monodll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
 $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
 
-$(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+$(OBJS)\monodll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
 
-$(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+$(OBJS)\monodll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
 
 $(OBJS)\monodll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
@@ -6374,6 +6409,9 @@ $(OBJS)\monodll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
 $(OBJS)\monodll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
 
+$(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+
 $(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
 
@@ -6398,6 +6436,9 @@ $(OBJS)\monodll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
 $(OBJS)\monodll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
 
+$(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+
 $(OBJS)\monodll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
 
@@ -6572,6 +6613,11 @@ $(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp
 $(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xtixml.cpp
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_app.obj: ..\..\src\msw\app.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\app.cpp
@@ -7477,6 +7523,11 @@ $(OBJS)\monodll_menucmn.obj: ..\..\src\common\menucmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\menucmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp
@@ -7492,6 +7543,11 @@ $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
@@ -7912,16 +7968,6 @@ $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
@@ -7947,6 +7993,11 @@ $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+
 $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_64)  /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 /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_BASE=1 /d WXMAKINGDLL /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS ..\..\src\msw\version.rc
 
@@ -7986,6 +8037,9 @@ $(OBJS)\monolib_convauto.obj: ..\..\src\common\convauto.cpp
 $(OBJS)\monolib_datetime.obj: ..\..\src\common\datetime.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datetime.cpp
 
+$(OBJS)\monolib_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datetimefmt.cpp
+
 $(OBJS)\monolib_datstrm.obj: ..\..\src\common\datstrm.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datstrm.cpp
 
@@ -8103,6 +8157,9 @@ $(OBJS)\monolib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 $(OBJS)\monolib_sstream.obj: ..\..\src\common\sstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sstream.cpp
 
+$(OBJS)\monolib_stdstream.obj: ..\..\src\common\stdstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
 $(OBJS)\monolib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp
 
@@ -8343,9 +8400,6 @@ $(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
-$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
@@ -8580,11 +8634,11 @@ $(OBJS)\monolib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
 $(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
 
-$(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+$(OBJS)\monolib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
 
-$(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+$(OBJS)\monolib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
 
 $(OBJS)\monolib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
@@ -8592,6 +8646,9 @@ $(OBJS)\monolib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
 $(OBJS)\monolib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
 
+$(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+
 $(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
 
@@ -8616,6 +8673,9 @@ $(OBJS)\monolib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
 $(OBJS)\monolib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
 
+$(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+
 $(OBJS)\monolib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
 
@@ -8790,6 +8850,11 @@ $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
 $(OBJS)\monolib_xtixml.obj: ..\..\src\common\xtixml.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xtixml.cpp
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_app.obj: ..\..\src\msw\app.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\app.cpp
@@ -9695,6 +9760,11 @@ $(OBJS)\monolib_menucmn.obj: ..\..\src\common\menucmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\menucmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp
@@ -9710,6 +9780,11 @@ $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
@@ -10130,16 +10205,6 @@ $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
@@ -10165,6 +10230,11 @@ $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+
 $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
@@ -10204,6 +10274,9 @@ $(OBJS)\basedll_convauto.obj: ..\..\src\common\convauto.cpp
 $(OBJS)\basedll_datetime.obj: ..\..\src\common\datetime.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datetime.cpp
 
+$(OBJS)\basedll_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datetimefmt.cpp
+
 $(OBJS)\basedll_datstrm.obj: ..\..\src\common\datstrm.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datstrm.cpp
 
@@ -10321,6 +10394,9 @@ $(OBJS)\basedll_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 $(OBJS)\basedll_sstream.obj: ..\..\src\common\sstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\sstream.cpp
 
+$(OBJS)\basedll_stdstream.obj: ..\..\src\common\stdstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
 $(OBJS)\basedll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp
 
@@ -10513,6 +10589,9 @@ $(OBJS)\baselib_convauto.obj: ..\..\src\common\convauto.cpp
 $(OBJS)\baselib_datetime.obj: ..\..\src\common\datetime.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datetime.cpp
 
+$(OBJS)\baselib_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datetimefmt.cpp
+
 $(OBJS)\baselib_datstrm.obj: ..\..\src\common\datstrm.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datstrm.cpp
 
@@ -10630,6 +10709,9 @@ $(OBJS)\baselib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
 $(OBJS)\baselib_sstream.obj: ..\..\src\common\sstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\sstream.cpp
 
+$(OBJS)\baselib_stdstream.obj: ..\..\src\common\stdstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
 $(OBJS)\baselib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp
 
@@ -10945,9 +11027,6 @@ $(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
-$(OBJS)\coredll_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
@@ -11029,6 +11108,11 @@ $(OBJS)\coredll_mono.obj: ..\..\src\univ\themes\mono.cpp
 $(OBJS)\coredll_win32.obj: ..\..\src\univ\themes\win32.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_app.obj: ..\..\src\msw\app.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\app.cpp
@@ -11934,6 +12018,11 @@ $(OBJS)\coredll_menucmn.obj: ..\..\src\common\menucmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\menucmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp
@@ -11949,6 +12038,11 @@ $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
@@ -12314,9 +12408,6 @@ $(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp
 $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
 
-$(OBJS)\corelib_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
 $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
 
@@ -12398,6 +12489,11 @@ $(OBJS)\corelib_mono.obj: ..\..\src\univ\themes\mono.cpp
 $(OBJS)\corelib_win32.obj: ..\..\src\univ\themes\win32.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_app.obj: ..\..\src\msw\app.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\app.cpp
@@ -13303,6 +13399,11 @@ $(OBJS)\corelib_menucmn.obj: ..\..\src\common\menucmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\menucmn.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp
@@ -13318,6 +13419,11 @@ $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
@@ -13704,14 +13810,6 @@ $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
 $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
 
-$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-
-!if "$(WXUNIV)" == "1"
-$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
 $(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
 
@@ -13727,6 +13825,9 @@ $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
 $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
 
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+
 $(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
@@ -13820,14 +13921,6 @@ $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
 $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
 
-$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-
-!if "$(WXUNIV)" == "1"
-$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
 $(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
 
@@ -13843,6 +13936,9 @@ $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
 $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
 
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+
 $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
 
@@ -14128,11 +14224,11 @@ $(OBJS)\xrcdll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
 $(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
 
-$(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+$(OBJS)\xrcdll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
 
-$(OBJS)\xrcdll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+$(OBJS)\xrcdll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
 
 $(OBJS)\xrcdll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
@@ -14140,6 +14236,9 @@ $(OBJS)\xrcdll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
 $(OBJS)\xrcdll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
 
+$(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+
 $(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
 
@@ -14164,6 +14263,9 @@ $(OBJS)\xrcdll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
 $(OBJS)\xrcdll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
 
+$(OBJS)\xrcdll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+
 $(OBJS)\xrcdll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
 
@@ -14308,11 +14410,11 @@ $(OBJS)\xrclib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
 $(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
 
-$(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+$(OBJS)\xrclib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
 
-$(OBJS)\xrclib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+$(OBJS)\xrclib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
 
 $(OBJS)\xrclib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
@@ -14320,6 +14422,9 @@ $(OBJS)\xrclib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
 $(OBJS)\xrclib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
 
+$(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+
 $(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
 
@@ -14344,6 +14449,9 @@ $(OBJS)\xrclib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
 $(OBJS)\xrclib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
 
+$(OBJS)\xrclib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+
 $(OBJS)\xrclib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp