diff --git a/Makefile.in b/Makefile.in
index 70083bcab2..80dbefb426 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6185,7 +6185,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS =  \
 	monodll_notifmsgg.o \
 	monodll_odcombo.o \
 	monodll_propdlg.o \
-	monodll_generic_richtooltip.o \
+	monodll_richtooltipg.o \
 	monodll_sashwin.o \
 	monodll_splash.o \
 	monodll_generic_timectrl.o \
@@ -6222,7 +6222,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS =  \
 	monodll_notifmsgg.o \
 	monodll_odcombo.o \
 	monodll_propdlg.o \
-	monodll_generic_richtooltip.o \
+	monodll_richtooltipg.o \
 	monodll_sashwin.o \
 	monodll_splash.o \
 	monodll_generic_timectrl.o \
@@ -8143,7 +8143,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 =  \
 	monolib_notifmsgg.o \
 	monolib_odcombo.o \
 	monolib_propdlg.o \
-	monolib_generic_richtooltip.o \
+	monolib_richtooltipg.o \
 	monolib_sashwin.o \
 	monolib_splash.o \
 	monolib_generic_timectrl.o \
@@ -8180,7 +8180,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 =  \
 	monolib_notifmsgg.o \
 	monolib_odcombo.o \
 	monolib_propdlg.o \
-	monolib_generic_richtooltip.o \
+	monolib_richtooltipg.o \
 	monolib_sashwin.o \
 	monolib_splash.o \
 	monolib_generic_timectrl.o \
@@ -11943,7 +11943,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 =  \
 	advdll_notifmsgg.o \
 	advdll_odcombo.o \
 	advdll_propdlg.o \
-	advdll_generic_richtooltip.o \
+	advdll_richtooltipg.o \
 	advdll_sashwin.o \
 	advdll_splash.o \
 	advdll_generic_timectrl.o \
@@ -11980,7 +11980,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 =  \
 	advdll_notifmsgg.o \
 	advdll_odcombo.o \
 	advdll_propdlg.o \
-	advdll_generic_richtooltip.o \
+	advdll_richtooltipg.o \
 	advdll_sashwin.o \
 	advdll_splash.o \
 	advdll_generic_timectrl.o \
@@ -12061,7 +12061,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 =  \
 	advlib_notifmsgg.o \
 	advlib_odcombo.o \
 	advlib_propdlg.o \
-	advlib_generic_richtooltip.o \
+	advlib_richtooltipg.o \
 	advlib_sashwin.o \
 	advlib_splash.o \
 	advlib_generic_timectrl.o \
@@ -12098,7 +12098,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
 	advlib_notifmsgg.o \
 	advlib_odcombo.o \
 	advlib_propdlg.o \
-	advlib_generic_richtooltip.o \
+	advlib_richtooltipg.o \
 	advlib_sashwin.o \
 	advlib_splash.o \
 	advlib_generic_timectrl.o \
@@ -13387,7 +13387,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS =  \
 	monodll_taskbarcmn.o \
 	monodll_msw_aboutdlg.o \
 	monodll_msw_notifmsg.o \
-	monodll_msw_richtooltip.o \
+	monodll_richtooltip.o \
 	monodll_msw_sound.o \
 	monodll_msw_taskbar.o \
 	monodll_msw_joystick.o
@@ -13426,7 +13426,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS =  \
 	monodll_taskbarcmn.o \
 	monodll_msw_aboutdlg.o \
 	monodll_msw_notifmsg.o \
-	monodll_msw_richtooltip.o \
+	monodll_richtooltip.o \
 	monodll_msw_sound.o \
 	monodll_msw_taskbar.o
 @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS)
@@ -13575,7 +13575,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
 	monolib_taskbarcmn.o \
 	monolib_msw_aboutdlg.o \
 	monolib_msw_notifmsg.o \
-	monolib_msw_richtooltip.o \
+	monolib_richtooltip.o \
 	monolib_msw_sound.o \
 	monolib_msw_taskbar.o \
 	monolib_msw_joystick.o
@@ -13614,7 +13614,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
 	monolib_taskbarcmn.o \
 	monolib_msw_aboutdlg.o \
 	monolib_msw_notifmsg.o \
-	monolib_msw_richtooltip.o \
+	monolib_richtooltip.o \
 	monolib_msw_sound.o \
 	monolib_msw_taskbar.o
 @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_0)
@@ -13861,7 +13861,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
 	advdll_taskbarcmn.o \
 	advdll_msw_aboutdlg.o \
 	advdll_msw_notifmsg.o \
-	advdll_msw_richtooltip.o \
+	advdll_richtooltip.o \
 	advdll_msw_sound.o \
 	advdll_msw_taskbar.o \
 	advdll_msw_joystick.o
@@ -13900,7 +13900,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
 	advdll_taskbarcmn.o \
 	advdll_msw_aboutdlg.o \
 	advdll_msw_notifmsg.o \
-	advdll_msw_richtooltip.o \
+	advdll_richtooltip.o \
 	advdll_msw_sound.o \
 	advdll_msw_taskbar.o
 @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_8)
@@ -13951,7 +13951,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
 	advlib_taskbarcmn.o \
 	advlib_msw_aboutdlg.o \
 	advlib_msw_notifmsg.o \
-	advlib_msw_richtooltip.o \
+	advlib_richtooltip.o \
 	advlib_msw_sound.o \
 	advlib_msw_taskbar.o \
 	advlib_msw_joystick.o
@@ -13990,7 +13990,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
 	advlib_taskbarcmn.o \
 	advlib_msw_aboutdlg.o \
 	advlib_msw_notifmsg.o \
-	advlib_msw_richtooltip.o \
+	advlib_richtooltip.o \
 	advlib_msw_sound.o \
 	advlib_msw_taskbar.o
 @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_9)
@@ -20750,8 +20750,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_propdlg.o: $(srcdir)/src/generic/propdlg.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/propdlg.cpp
 
-@COND_USE_GUI_1@monodll_generic_richtooltip.o: $(srcdir)/src/generic/richtooltip.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/richtooltip.cpp
+@COND_USE_GUI_1@monodll_richtooltipg.o: $(srcdir)/src/generic/richtooltipg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/richtooltipg.cpp
 
 @COND_USE_GUI_1@monodll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/sashwin.cpp
@@ -20813,10 +20813,10 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
 
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/richtooltip.cpp
 
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/richtooltip.cpp
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONODLL_ODEP)
@@ -26138,8 +26138,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_propdlg.o: $(srcdir)/src/generic/propdlg.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/propdlg.cpp
 
-@COND_USE_GUI_1@monolib_generic_richtooltip.o: $(srcdir)/src/generic/richtooltip.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/richtooltip.cpp
+@COND_USE_GUI_1@monolib_richtooltipg.o: $(srcdir)/src/generic/richtooltipg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/richtooltipg.cpp
 
 @COND_USE_GUI_1@monolib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/sashwin.cpp
@@ -26201,10 +26201,10 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
 
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/richtooltip.cpp
 
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/richtooltip.cpp
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONOLIB_ODEP)
@@ -35726,8 +35726,8 @@ advdll_odcombo.o: $(srcdir)/src/generic/odcombo.cpp $(ADVDLL_ODEP)
 advdll_propdlg.o: $(srcdir)/src/generic/propdlg.cpp $(ADVDLL_ODEP)
 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/propdlg.cpp
 
-advdll_generic_richtooltip.o: $(srcdir)/src/generic/richtooltip.cpp $(ADVDLL_ODEP)
-	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/richtooltip.cpp
+advdll_richtooltipg.o: $(srcdir)/src/generic/richtooltipg.cpp $(ADVDLL_ODEP)
+	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/richtooltipg.cpp
 
 advdll_sashwin.o: $(srcdir)/src/generic/sashwin.cpp $(ADVDLL_ODEP)
 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/sashwin.cpp
@@ -35789,10 +35789,10 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_WINCE@advdll_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_WINCE@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
 
-@COND_TOOLKIT_MSW@advdll_msw_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW@advdll_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/richtooltip.cpp
 
-@COND_TOOLKIT_WINCE@advdll_msw_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE@advdll_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(ADVDLL_ODEP)
 @COND_TOOLKIT_WINCE@	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/richtooltip.cpp
 
 @COND_TOOLKIT_MSW@advdll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVDLL_ODEP)
@@ -36113,8 +36113,8 @@ advlib_odcombo.o: $(srcdir)/src/generic/odcombo.cpp $(ADVLIB_ODEP)
 advlib_propdlg.o: $(srcdir)/src/generic/propdlg.cpp $(ADVLIB_ODEP)
 	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/propdlg.cpp
 
-advlib_generic_richtooltip.o: $(srcdir)/src/generic/richtooltip.cpp $(ADVLIB_ODEP)
-	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/richtooltip.cpp
+advlib_richtooltipg.o: $(srcdir)/src/generic/richtooltipg.cpp $(ADVLIB_ODEP)
+	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/richtooltipg.cpp
 
 advlib_sashwin.o: $(srcdir)/src/generic/sashwin.cpp $(ADVLIB_ODEP)
 	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/sashwin.cpp
@@ -36176,10 +36176,10 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_WINCE@advlib_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_WINCE@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
 
-@COND_TOOLKIT_MSW@advlib_msw_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW@advlib_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_MSW@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/richtooltip.cpp
 
-@COND_TOOLKIT_WINCE@advlib_msw_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE@advlib_richtooltip.o: $(srcdir)/src/msw/richtooltip.cpp $(ADVLIB_ODEP)
 @COND_TOOLKIT_WINCE@	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/richtooltip.cpp
 
 @COND_TOOLKIT_MSW@advlib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVLIB_ODEP)
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index f8aa57fcc1..d4a6dab336 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2983,7 +2983,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/notifmsgg.cpp
     src/generic/odcombo.cpp
     src/generic/propdlg.cpp
-    src/generic/richtooltip.cpp
+    src/generic/richtooltipg.cpp
     src/generic/sashwin.cpp
     src/generic/splash.cpp
     src/generic/timectrl.cpp
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index a74195709e..351d72227d 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -390,7 +390,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_tarstrm.obj \
 	$(OBJS)\monodll_textbuf.obj \
 	$(OBJS)\monodll_textfile.obj \
-	$(OBJS)\monodll_time.obj \
+	$(OBJS)\monodll_time.obj \
 	$(OBJS)\monodll_timercmn.obj \
 	$(OBJS)\monodll_timerimpl.obj \
 	$(OBJS)\monodll_tokenzr.obj \
@@ -539,7 +539,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_tarstrm.obj \
 	$(OBJS)\monolib_textbuf.obj \
 	$(OBJS)\monolib_textfile.obj \
-	$(OBJS)\monolib_time.obj \
+	$(OBJS)\monolib_time.obj \
 	$(OBJS)\monolib_timercmn.obj \
 	$(OBJS)\monolib_timerimpl.obj \
 	$(OBJS)\monolib_tokenzr.obj \
@@ -686,7 +686,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_tarstrm.obj \
 	$(OBJS)\basedll_textbuf.obj \
 	$(OBJS)\basedll_textfile.obj \
-	$(OBJS)\basedll_time.obj \
+	$(OBJS)\basedll_time.obj \
 	$(OBJS)\basedll_timercmn.obj \
 	$(OBJS)\basedll_timerimpl.obj \
 	$(OBJS)\basedll_tokenzr.obj \
@@ -817,7 +817,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_tarstrm.obj \
 	$(OBJS)\baselib_textbuf.obj \
 	$(OBJS)\baselib_textfile.obj \
-	$(OBJS)\baselib_time.obj \
+	$(OBJS)\baselib_time.obj \
 	$(OBJS)\baselib_timercmn.obj \
 	$(OBJS)\baselib_timerimpl.obj \
 	$(OBJS)\baselib_tokenzr.obj \
@@ -1217,19 +1217,19 @@ XRCDLL_OBJECTS =  \
 	$(OBJS)\xrcdll_xh_split.obj \
 	$(OBJS)\xrcdll_xh_srchctrl.obj \
 	$(OBJS)\xrcdll_xh_statbar.obj \
-	$(OBJS)\xrcdll_xh_stbmp.obj \
-	$(OBJS)\xrcdll_xh_stbox.obj \
-	$(OBJS)\xrcdll_xh_stlin.obj \
-	$(OBJS)\xrcdll_xh_sttxt.obj \
-	$(OBJS)\xrcdll_xh_text.obj \
-	$(OBJS)\xrcdll_xh_tglbtn.obj \
-	$(OBJS)\xrcdll_xh_timectrl.obj \
-	$(OBJS)\xrcdll_xh_toolb.obj \
-	$(OBJS)\xrcdll_xh_toolbk.obj \
-	$(OBJS)\xrcdll_xh_tree.obj \
-	$(OBJS)\xrcdll_xh_treebk.obj \
-	$(OBJS)\xrcdll_xh_unkwn.obj \
-	$(OBJS)\xrcdll_xh_wizrd.obj \
+	$(OBJS)\xrcdll_xh_stbmp.obj \
+	$(OBJS)\xrcdll_xh_stbox.obj \
+	$(OBJS)\xrcdll_xh_stlin.obj \
+	$(OBJS)\xrcdll_xh_sttxt.obj \
+	$(OBJS)\xrcdll_xh_text.obj \
+	$(OBJS)\xrcdll_xh_tglbtn.obj \
+	$(OBJS)\xrcdll_xh_timectrl.obj \
+	$(OBJS)\xrcdll_xh_toolb.obj \
+	$(OBJS)\xrcdll_xh_toolbk.obj \
+	$(OBJS)\xrcdll_xh_tree.obj \
+	$(OBJS)\xrcdll_xh_treebk.obj \
+	$(OBJS)\xrcdll_xh_unkwn.obj \
+	$(OBJS)\xrcdll_xh_wizrd.obj \
 	$(OBJS)\xrcdll_xmlres.obj \
 	$(OBJS)\xrcdll_xmladv.obj \
 	$(OBJS)\xrcdll_xmlrsall.obj
@@ -1293,19 +1293,19 @@ XRCLIB_OBJECTS =  \
 	$(OBJS)\xrclib_xh_split.obj \
 	$(OBJS)\xrclib_xh_srchctrl.obj \
 	$(OBJS)\xrclib_xh_statbar.obj \
-	$(OBJS)\xrclib_xh_stbmp.obj \
-	$(OBJS)\xrclib_xh_stbox.obj \
-	$(OBJS)\xrclib_xh_stlin.obj \
-	$(OBJS)\xrclib_xh_sttxt.obj \
-	$(OBJS)\xrclib_xh_text.obj \
-	$(OBJS)\xrclib_xh_tglbtn.obj \
-	$(OBJS)\xrclib_xh_timectrl.obj \
-	$(OBJS)\xrclib_xh_toolb.obj \
-	$(OBJS)\xrclib_xh_toolbk.obj \
-	$(OBJS)\xrclib_xh_tree.obj \
-	$(OBJS)\xrclib_xh_treebk.obj \
-	$(OBJS)\xrclib_xh_unkwn.obj \
-	$(OBJS)\xrclib_xh_wizrd.obj \
+	$(OBJS)\xrclib_xh_stbmp.obj \
+	$(OBJS)\xrclib_xh_stbox.obj \
+	$(OBJS)\xrclib_xh_stlin.obj \
+	$(OBJS)\xrclib_xh_sttxt.obj \
+	$(OBJS)\xrclib_xh_text.obj \
+	$(OBJS)\xrclib_xh_tglbtn.obj \
+	$(OBJS)\xrclib_xh_timectrl.obj \
+	$(OBJS)\xrclib_xh_toolb.obj \
+	$(OBJS)\xrclib_xh_toolbk.obj \
+	$(OBJS)\xrclib_xh_tree.obj \
+	$(OBJS)\xrclib_xh_treebk.obj \
+	$(OBJS)\xrclib_xh_unkwn.obj \
+	$(OBJS)\xrclib_xh_wizrd.obj \
 	$(OBJS)\xrclib_xmlres.obj \
 	$(OBJS)\xrclib_xmladv.obj \
 	$(OBJS)\xrclib_xmlrsall.obj
@@ -1666,19 +1666,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_xh_split.obj \
 	$(OBJS)\monodll_xh_srchctrl.obj \
 	$(OBJS)\monodll_xh_statbar.obj \
-	$(OBJS)\monodll_xh_stbmp.obj \
-	$(OBJS)\monodll_xh_stbox.obj \
-	$(OBJS)\monodll_xh_stlin.obj \
-	$(OBJS)\monodll_xh_sttxt.obj \
-	$(OBJS)\monodll_xh_text.obj \
-	$(OBJS)\monodll_xh_tglbtn.obj \
-	$(OBJS)\monodll_xh_timectrl.obj \
-	$(OBJS)\monodll_xh_toolb.obj \
-	$(OBJS)\monodll_xh_toolbk.obj \
-	$(OBJS)\monodll_xh_tree.obj \
-	$(OBJS)\monodll_xh_treebk.obj \
-	$(OBJS)\monodll_xh_unkwn.obj \
-	$(OBJS)\monodll_xh_wizrd.obj \
+	$(OBJS)\monodll_xh_stbmp.obj \
+	$(OBJS)\monodll_xh_stbox.obj \
+	$(OBJS)\monodll_xh_stlin.obj \
+	$(OBJS)\monodll_xh_sttxt.obj \
+	$(OBJS)\monodll_xh_text.obj \
+	$(OBJS)\monodll_xh_tglbtn.obj \
+	$(OBJS)\monodll_xh_timectrl.obj \
+	$(OBJS)\monodll_xh_toolb.obj \
+	$(OBJS)\monodll_xh_toolbk.obj \
+	$(OBJS)\monodll_xh_tree.obj \
+	$(OBJS)\monodll_xh_treebk.obj \
+	$(OBJS)\monodll_xh_unkwn.obj \
+	$(OBJS)\monodll_xh_wizrd.obj \
 	$(OBJS)\monodll_xmlres.obj \
 	$(OBJS)\monodll_xmladv.obj \
 	$(OBJS)\monodll_xmlrsall.obj \
@@ -1744,19 +1744,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontenum.obj \
 	$(OBJS)\monodll_fontutil.obj \
 	$(OBJS)\monodll_gdiimage.obj \
-	$(OBJS)\monodll_gdiobj.obj \
-	$(OBJS)\monodll_gdiplus.obj \
-	$(OBJS)\monodll_graphics.obj \
-	$(OBJS)\monodll_icon.obj \
-	$(OBJS)\monodll_imaglist.obj \
-	$(OBJS)\monodll_minifram.obj \
-	$(OBJS)\monodll_nonownedwnd.obj \
-	$(OBJS)\monodll_dataobj.obj \
-	$(OBJS)\monodll_dropsrc.obj \
-	$(OBJS)\monodll_droptgt.obj \
-	$(OBJS)\monodll_oleutils.obj \
-	$(OBJS)\monodll_palette.obj \
-	$(OBJS)\monodll_pen.obj \
+	$(OBJS)\monodll_gdiobj.obj \
+	$(OBJS)\monodll_gdiplus.obj \
+	$(OBJS)\monodll_graphics.obj \
+	$(OBJS)\monodll_icon.obj \
+	$(OBJS)\monodll_imaglist.obj \
+	$(OBJS)\monodll_minifram.obj \
+	$(OBJS)\monodll_nonownedwnd.obj \
+	$(OBJS)\monodll_dataobj.obj \
+	$(OBJS)\monodll_dropsrc.obj \
+	$(OBJS)\monodll_droptgt.obj \
+	$(OBJS)\monodll_oleutils.obj \
+	$(OBJS)\monodll_palette.obj \
+	$(OBJS)\monodll_pen.obj \
 	$(OBJS)\monodll_popupwin.obj \
 	$(OBJS)\monodll_printdlg.obj \
 	$(OBJS)\monodll_printwin.obj \
@@ -2016,19 +2016,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontenum.obj \
 	$(OBJS)\monodll_fontutil.obj \
 	$(OBJS)\monodll_gdiimage.obj \
-	$(OBJS)\monodll_gdiobj.obj \
-	$(OBJS)\monodll_gdiplus.obj \
-	$(OBJS)\monodll_graphics.obj \
-	$(OBJS)\monodll_icon.obj \
-	$(OBJS)\monodll_imaglist.obj \
-	$(OBJS)\monodll_minifram.obj \
-	$(OBJS)\monodll_nonownedwnd.obj \
-	$(OBJS)\monodll_dataobj.obj \
-	$(OBJS)\monodll_dropsrc.obj \
-	$(OBJS)\monodll_droptgt.obj \
-	$(OBJS)\monodll_oleutils.obj \
-	$(OBJS)\monodll_palette.obj \
-	$(OBJS)\monodll_pen.obj \
+	$(OBJS)\monodll_gdiobj.obj \
+	$(OBJS)\monodll_gdiplus.obj \
+	$(OBJS)\monodll_graphics.obj \
+	$(OBJS)\monodll_icon.obj \
+	$(OBJS)\monodll_imaglist.obj \
+	$(OBJS)\monodll_minifram.obj \
+	$(OBJS)\monodll_nonownedwnd.obj \
+	$(OBJS)\monodll_dataobj.obj \
+	$(OBJS)\monodll_dropsrc.obj \
+	$(OBJS)\monodll_droptgt.obj \
+	$(OBJS)\monodll_oleutils.obj \
+	$(OBJS)\monodll_palette.obj \
+	$(OBJS)\monodll_pen.obj \
 	$(OBJS)\monodll_popupwin.obj \
 	$(OBJS)\monodll_printdlg.obj \
 	$(OBJS)\monodll_printwin.obj \
@@ -2261,100 +2261,100 @@ ____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_gridcmn.obj \
-	$(OBJS)\monodll_hyperlnkcmn.obj \
-	$(OBJS)\monodll_odcombocmn.obj \
-	$(OBJS)\monodll_richtooltipcmn.obj \
-	$(OBJS)\monodll_aboutdlgg.obj \
-	$(OBJS)\monodll_bannerwindow.obj \
-	$(OBJS)\monodll_bmpcboxg.obj \
-	$(OBJS)\monodll_calctrlg.obj \
-	$(OBJS)\monodll_commandlinkbuttong.obj \
-	$(OBJS)\monodll_datavgen.obj \
+	$(OBJS)\monodll_bmpcboxcmn.obj \
+	$(OBJS)\monodll_calctrlcmn.obj \
+	$(OBJS)\monodll_datavcmn.obj \
+	$(OBJS)\monodll_gridcmn.obj \
+	$(OBJS)\monodll_hyperlnkcmn.obj \
+	$(OBJS)\monodll_odcombocmn.obj \
+	$(OBJS)\monodll_richtooltipcmn.obj \
+	$(OBJS)\monodll_aboutdlgg.obj \
+	$(OBJS)\monodll_bannerwindow.obj \
+	$(OBJS)\monodll_bmpcboxg.obj \
+	$(OBJS)\monodll_calctrlg.obj \
+	$(OBJS)\monodll_commandlinkbuttong.obj \
+	$(OBJS)\monodll_datavgen.obj \
 	$(OBJS)\monodll_datectlg.obj \
 	$(OBJS)\monodll_editlbox.obj \
 	$(OBJS)\monodll_grid.obj \
 	$(OBJS)\monodll_gridctrl.obj \
 	$(OBJS)\monodll_grideditors.obj \
 	$(OBJS)\monodll_gridsel.obj \
-	$(OBJS)\monodll_helpext.obj \
-	$(OBJS)\monodll_hyperlinkg.obj \
-	$(OBJS)\monodll_laywin.obj \
-	$(OBJS)\monodll_notifmsgg.obj \
-	$(OBJS)\monodll_odcombo.obj \
-	$(OBJS)\monodll_propdlg.obj \
-	$(OBJS)\monodll_generic_richtooltip.obj \
-	$(OBJS)\monodll_sashwin.obj \
-	$(OBJS)\monodll_splash.obj \
-	$(OBJS)\monodll_generic_timectrl.obj \
-	$(OBJS)\monodll_tipdlg.obj \
-	$(OBJS)\monodll_treelist.obj \
-	$(OBJS)\monodll_wizard.obj \
-	$(OBJS)\monodll_taskbarcmn.obj \
-	$(OBJS)\monodll_aboutdlg.obj \
-	$(OBJS)\monodll_notifmsg.obj \
-	$(OBJS)\monodll_msw_richtooltip.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_commandlinkbutton.obj \
-	$(OBJS)\monodll_datecontrols.obj \
-	$(OBJS)\monodll_datectrl.obj \
-	$(OBJS)\monodll_datetimectrl.obj \
-	$(OBJS)\monodll_hyperlink.obj \
-	$(OBJS)\monodll_msw_timectrl.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_gridcmn.obj \
-	$(OBJS)\monodll_hyperlnkcmn.obj \
-	$(OBJS)\monodll_odcombocmn.obj \
-	$(OBJS)\monodll_richtooltipcmn.obj \
-	$(OBJS)\monodll_aboutdlgg.obj \
-	$(OBJS)\monodll_bannerwindow.obj \
-	$(OBJS)\monodll_bmpcboxg.obj \
-	$(OBJS)\monodll_calctrlg.obj \
-	$(OBJS)\monodll_commandlinkbuttong.obj \
-	$(OBJS)\monodll_datavgen.obj \
+	$(OBJS)\monodll_helpext.obj \
+	$(OBJS)\monodll_hyperlinkg.obj \
+	$(OBJS)\monodll_laywin.obj \
+	$(OBJS)\monodll_notifmsgg.obj \
+	$(OBJS)\monodll_odcombo.obj \
+	$(OBJS)\monodll_propdlg.obj \
+	$(OBJS)\monodll_richtooltipg.obj \
+	$(OBJS)\monodll_sashwin.obj \
+	$(OBJS)\monodll_splash.obj \
+	$(OBJS)\monodll_generic_timectrl.obj \
+	$(OBJS)\monodll_tipdlg.obj \
+	$(OBJS)\monodll_treelist.obj \
+	$(OBJS)\monodll_wizard.obj \
+	$(OBJS)\monodll_taskbarcmn.obj \
+	$(OBJS)\monodll_aboutdlg.obj \
+	$(OBJS)\monodll_notifmsg.obj \
+	$(OBJS)\monodll_richtooltip.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_commandlinkbutton.obj \
+	$(OBJS)\monodll_datecontrols.obj \
+	$(OBJS)\monodll_datectrl.obj \
+	$(OBJS)\monodll_datetimectrl.obj \
+	$(OBJS)\monodll_hyperlink.obj \
+	$(OBJS)\monodll_msw_timectrl.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_gridcmn.obj \
+	$(OBJS)\monodll_hyperlnkcmn.obj \
+	$(OBJS)\monodll_odcombocmn.obj \
+	$(OBJS)\monodll_richtooltipcmn.obj \
+	$(OBJS)\monodll_aboutdlgg.obj \
+	$(OBJS)\monodll_bannerwindow.obj \
+	$(OBJS)\monodll_bmpcboxg.obj \
+	$(OBJS)\monodll_calctrlg.obj \
+	$(OBJS)\monodll_commandlinkbuttong.obj \
+	$(OBJS)\monodll_datavgen.obj \
 	$(OBJS)\monodll_datectlg.obj \
 	$(OBJS)\monodll_editlbox.obj \
 	$(OBJS)\monodll_grid.obj \
 	$(OBJS)\monodll_gridctrl.obj \
 	$(OBJS)\monodll_grideditors.obj \
 	$(OBJS)\monodll_gridsel.obj \
-	$(OBJS)\monodll_helpext.obj \
-	$(OBJS)\monodll_hyperlinkg.obj \
-	$(OBJS)\monodll_laywin.obj \
-	$(OBJS)\monodll_notifmsgg.obj \
-	$(OBJS)\monodll_odcombo.obj \
-	$(OBJS)\monodll_propdlg.obj \
-	$(OBJS)\monodll_generic_richtooltip.obj \
-	$(OBJS)\monodll_sashwin.obj \
-	$(OBJS)\monodll_splash.obj \
-	$(OBJS)\monodll_generic_timectrl.obj \
-	$(OBJS)\monodll_tipdlg.obj \
-	$(OBJS)\monodll_treelist.obj \
-	$(OBJS)\monodll_wizard.obj \
-	$(OBJS)\monodll_taskbarcmn.obj \
-	$(OBJS)\monodll_aboutdlg.obj \
-	$(OBJS)\monodll_notifmsg.obj \
-	$(OBJS)\monodll_msw_richtooltip.obj \
-	$(OBJS)\monodll_sound.obj \
-	$(OBJS)\monodll_taskbar.obj \
-	$(OBJS)\monodll_joystick.obj \
-	$(OBJS)\monodll_animateg.obj
-!endif
-!if "$(USE_STC)" == "1"
+	$(OBJS)\monodll_helpext.obj \
+	$(OBJS)\monodll_hyperlinkg.obj \
+	$(OBJS)\monodll_laywin.obj \
+	$(OBJS)\monodll_notifmsgg.obj \
+	$(OBJS)\monodll_odcombo.obj \
+	$(OBJS)\monodll_propdlg.obj \
+	$(OBJS)\monodll_richtooltipg.obj \
+	$(OBJS)\monodll_sashwin.obj \
+	$(OBJS)\monodll_splash.obj \
+	$(OBJS)\monodll_generic_timectrl.obj \
+	$(OBJS)\monodll_tipdlg.obj \
+	$(OBJS)\monodll_treelist.obj \
+	$(OBJS)\monodll_wizard.obj \
+	$(OBJS)\monodll_taskbarcmn.obj \
+	$(OBJS)\monodll_aboutdlg.obj \
+	$(OBJS)\monodll_notifmsg.obj \
+	$(OBJS)\monodll_richtooltip.obj \
+	$(OBJS)\monodll_sound.obj \
+	$(OBJS)\monodll_taskbar.obj \
+	$(OBJS)\monodll_joystick.obj \
+	$(OBJS)\monodll_animateg.obj
+!endif
+!if "$(USE_STC)" == "1"
 __wxscintilla_library_link_DEP = $(__wxscintilla)
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
@@ -2449,19 +2449,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_xh_split.obj \
 	$(OBJS)\monolib_xh_srchctrl.obj \
 	$(OBJS)\monolib_xh_statbar.obj \
-	$(OBJS)\monolib_xh_stbmp.obj \
-	$(OBJS)\monolib_xh_stbox.obj \
-	$(OBJS)\monolib_xh_stlin.obj \
-	$(OBJS)\monolib_xh_sttxt.obj \
-	$(OBJS)\monolib_xh_text.obj \
-	$(OBJS)\monolib_xh_tglbtn.obj \
-	$(OBJS)\monolib_xh_timectrl.obj \
-	$(OBJS)\monolib_xh_toolb.obj \
-	$(OBJS)\monolib_xh_toolbk.obj \
-	$(OBJS)\monolib_xh_tree.obj \
-	$(OBJS)\monolib_xh_treebk.obj \
-	$(OBJS)\monolib_xh_unkwn.obj \
-	$(OBJS)\monolib_xh_wizrd.obj \
+	$(OBJS)\monolib_xh_stbmp.obj \
+	$(OBJS)\monolib_xh_stbox.obj \
+	$(OBJS)\monolib_xh_stlin.obj \
+	$(OBJS)\monolib_xh_sttxt.obj \
+	$(OBJS)\monolib_xh_text.obj \
+	$(OBJS)\monolib_xh_tglbtn.obj \
+	$(OBJS)\monolib_xh_timectrl.obj \
+	$(OBJS)\monolib_xh_toolb.obj \
+	$(OBJS)\monolib_xh_toolbk.obj \
+	$(OBJS)\monolib_xh_tree.obj \
+	$(OBJS)\monolib_xh_treebk.obj \
+	$(OBJS)\monolib_xh_unkwn.obj \
+	$(OBJS)\monolib_xh_wizrd.obj \
 	$(OBJS)\monolib_xmlres.obj \
 	$(OBJS)\monolib_xmladv.obj \
 	$(OBJS)\monolib_xmlrsall.obj \
@@ -2527,19 +2527,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontenum.obj \
 	$(OBJS)\monolib_fontutil.obj \
 	$(OBJS)\monolib_gdiimage.obj \
-	$(OBJS)\monolib_gdiobj.obj \
-	$(OBJS)\monolib_gdiplus.obj \
-	$(OBJS)\monolib_graphics.obj \
-	$(OBJS)\monolib_icon.obj \
-	$(OBJS)\monolib_imaglist.obj \
-	$(OBJS)\monolib_minifram.obj \
-	$(OBJS)\monolib_nonownedwnd.obj \
-	$(OBJS)\monolib_dataobj.obj \
-	$(OBJS)\monolib_dropsrc.obj \
-	$(OBJS)\monolib_droptgt.obj \
-	$(OBJS)\monolib_oleutils.obj \
-	$(OBJS)\monolib_palette.obj \
-	$(OBJS)\monolib_pen.obj \
+	$(OBJS)\monolib_gdiobj.obj \
+	$(OBJS)\monolib_gdiplus.obj \
+	$(OBJS)\monolib_graphics.obj \
+	$(OBJS)\monolib_icon.obj \
+	$(OBJS)\monolib_imaglist.obj \
+	$(OBJS)\monolib_minifram.obj \
+	$(OBJS)\monolib_nonownedwnd.obj \
+	$(OBJS)\monolib_dataobj.obj \
+	$(OBJS)\monolib_dropsrc.obj \
+	$(OBJS)\monolib_droptgt.obj \
+	$(OBJS)\monolib_oleutils.obj \
+	$(OBJS)\monolib_palette.obj \
+	$(OBJS)\monolib_pen.obj \
 	$(OBJS)\monolib_popupwin.obj \
 	$(OBJS)\monolib_printdlg.obj \
 	$(OBJS)\monolib_printwin.obj \
@@ -2799,19 +2799,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontenum.obj \
 	$(OBJS)\monolib_fontutil.obj \
 	$(OBJS)\monolib_gdiimage.obj \
-	$(OBJS)\monolib_gdiobj.obj \
-	$(OBJS)\monolib_gdiplus.obj \
-	$(OBJS)\monolib_graphics.obj \
-	$(OBJS)\monolib_icon.obj \
-	$(OBJS)\monolib_imaglist.obj \
-	$(OBJS)\monolib_minifram.obj \
-	$(OBJS)\monolib_nonownedwnd.obj \
-	$(OBJS)\monolib_dataobj.obj \
-	$(OBJS)\monolib_dropsrc.obj \
-	$(OBJS)\monolib_droptgt.obj \
-	$(OBJS)\monolib_oleutils.obj \
-	$(OBJS)\monolib_palette.obj \
-	$(OBJS)\monolib_pen.obj \
+	$(OBJS)\monolib_gdiobj.obj \
+	$(OBJS)\monolib_gdiplus.obj \
+	$(OBJS)\monolib_graphics.obj \
+	$(OBJS)\monolib_icon.obj \
+	$(OBJS)\monolib_imaglist.obj \
+	$(OBJS)\monolib_minifram.obj \
+	$(OBJS)\monolib_nonownedwnd.obj \
+	$(OBJS)\monolib_dataobj.obj \
+	$(OBJS)\monolib_dropsrc.obj \
+	$(OBJS)\monolib_droptgt.obj \
+	$(OBJS)\monolib_oleutils.obj \
+	$(OBJS)\monolib_palette.obj \
+	$(OBJS)\monolib_pen.obj \
 	$(OBJS)\monolib_popupwin.obj \
 	$(OBJS)\monolib_printdlg.obj \
 	$(OBJS)\monolib_printwin.obj \
@@ -3044,100 +3044,100 @@ ____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_gridcmn.obj \
-	$(OBJS)\monolib_hyperlnkcmn.obj \
-	$(OBJS)\monolib_odcombocmn.obj \
-	$(OBJS)\monolib_richtooltipcmn.obj \
-	$(OBJS)\monolib_aboutdlgg.obj \
-	$(OBJS)\monolib_bannerwindow.obj \
-	$(OBJS)\monolib_bmpcboxg.obj \
-	$(OBJS)\monolib_calctrlg.obj \
-	$(OBJS)\monolib_commandlinkbuttong.obj \
-	$(OBJS)\monolib_datavgen.obj \
+	$(OBJS)\monolib_bmpcboxcmn.obj \
+	$(OBJS)\monolib_calctrlcmn.obj \
+	$(OBJS)\monolib_datavcmn.obj \
+	$(OBJS)\monolib_gridcmn.obj \
+	$(OBJS)\monolib_hyperlnkcmn.obj \
+	$(OBJS)\monolib_odcombocmn.obj \
+	$(OBJS)\monolib_richtooltipcmn.obj \
+	$(OBJS)\monolib_aboutdlgg.obj \
+	$(OBJS)\monolib_bannerwindow.obj \
+	$(OBJS)\monolib_bmpcboxg.obj \
+	$(OBJS)\monolib_calctrlg.obj \
+	$(OBJS)\monolib_commandlinkbuttong.obj \
+	$(OBJS)\monolib_datavgen.obj \
 	$(OBJS)\monolib_datectlg.obj \
 	$(OBJS)\monolib_editlbox.obj \
 	$(OBJS)\monolib_grid.obj \
 	$(OBJS)\monolib_gridctrl.obj \
 	$(OBJS)\monolib_grideditors.obj \
 	$(OBJS)\monolib_gridsel.obj \
-	$(OBJS)\monolib_helpext.obj \
-	$(OBJS)\monolib_hyperlinkg.obj \
-	$(OBJS)\monolib_laywin.obj \
-	$(OBJS)\monolib_notifmsgg.obj \
-	$(OBJS)\monolib_odcombo.obj \
-	$(OBJS)\monolib_propdlg.obj \
-	$(OBJS)\monolib_generic_richtooltip.obj \
-	$(OBJS)\monolib_sashwin.obj \
-	$(OBJS)\monolib_splash.obj \
-	$(OBJS)\monolib_generic_timectrl.obj \
-	$(OBJS)\monolib_tipdlg.obj \
-	$(OBJS)\monolib_treelist.obj \
-	$(OBJS)\monolib_wizard.obj \
-	$(OBJS)\monolib_taskbarcmn.obj \
-	$(OBJS)\monolib_aboutdlg.obj \
-	$(OBJS)\monolib_notifmsg.obj \
-	$(OBJS)\monolib_msw_richtooltip.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_commandlinkbutton.obj \
-	$(OBJS)\monolib_datecontrols.obj \
-	$(OBJS)\monolib_datectrl.obj \
-	$(OBJS)\monolib_datetimectrl.obj \
-	$(OBJS)\monolib_hyperlink.obj \
-	$(OBJS)\monolib_msw_timectrl.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_gridcmn.obj \
-	$(OBJS)\monolib_hyperlnkcmn.obj \
-	$(OBJS)\monolib_odcombocmn.obj \
-	$(OBJS)\monolib_richtooltipcmn.obj \
-	$(OBJS)\monolib_aboutdlgg.obj \
-	$(OBJS)\monolib_bannerwindow.obj \
-	$(OBJS)\monolib_bmpcboxg.obj \
-	$(OBJS)\monolib_calctrlg.obj \
-	$(OBJS)\monolib_commandlinkbuttong.obj \
-	$(OBJS)\monolib_datavgen.obj \
+	$(OBJS)\monolib_helpext.obj \
+	$(OBJS)\monolib_hyperlinkg.obj \
+	$(OBJS)\monolib_laywin.obj \
+	$(OBJS)\monolib_notifmsgg.obj \
+	$(OBJS)\monolib_odcombo.obj \
+	$(OBJS)\monolib_propdlg.obj \
+	$(OBJS)\monolib_richtooltipg.obj \
+	$(OBJS)\monolib_sashwin.obj \
+	$(OBJS)\monolib_splash.obj \
+	$(OBJS)\monolib_generic_timectrl.obj \
+	$(OBJS)\monolib_tipdlg.obj \
+	$(OBJS)\monolib_treelist.obj \
+	$(OBJS)\monolib_wizard.obj \
+	$(OBJS)\monolib_taskbarcmn.obj \
+	$(OBJS)\monolib_aboutdlg.obj \
+	$(OBJS)\monolib_notifmsg.obj \
+	$(OBJS)\monolib_richtooltip.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_commandlinkbutton.obj \
+	$(OBJS)\monolib_datecontrols.obj \
+	$(OBJS)\monolib_datectrl.obj \
+	$(OBJS)\monolib_datetimectrl.obj \
+	$(OBJS)\monolib_hyperlink.obj \
+	$(OBJS)\monolib_msw_timectrl.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_gridcmn.obj \
+	$(OBJS)\monolib_hyperlnkcmn.obj \
+	$(OBJS)\monolib_odcombocmn.obj \
+	$(OBJS)\monolib_richtooltipcmn.obj \
+	$(OBJS)\monolib_aboutdlgg.obj \
+	$(OBJS)\monolib_bannerwindow.obj \
+	$(OBJS)\monolib_bmpcboxg.obj \
+	$(OBJS)\monolib_calctrlg.obj \
+	$(OBJS)\monolib_commandlinkbuttong.obj \
+	$(OBJS)\monolib_datavgen.obj \
 	$(OBJS)\monolib_datectlg.obj \
 	$(OBJS)\monolib_editlbox.obj \
 	$(OBJS)\monolib_grid.obj \
 	$(OBJS)\monolib_gridctrl.obj \
 	$(OBJS)\monolib_grideditors.obj \
 	$(OBJS)\monolib_gridsel.obj \
-	$(OBJS)\monolib_helpext.obj \
-	$(OBJS)\monolib_hyperlinkg.obj \
-	$(OBJS)\monolib_laywin.obj \
-	$(OBJS)\monolib_notifmsgg.obj \
-	$(OBJS)\monolib_odcombo.obj \
-	$(OBJS)\monolib_propdlg.obj \
-	$(OBJS)\monolib_generic_richtooltip.obj \
-	$(OBJS)\monolib_sashwin.obj \
-	$(OBJS)\monolib_splash.obj \
-	$(OBJS)\monolib_generic_timectrl.obj \
-	$(OBJS)\monolib_tipdlg.obj \
-	$(OBJS)\monolib_treelist.obj \
-	$(OBJS)\monolib_wizard.obj \
-	$(OBJS)\monolib_taskbarcmn.obj \
-	$(OBJS)\monolib_aboutdlg.obj \
-	$(OBJS)\monolib_notifmsg.obj \
-	$(OBJS)\monolib_msw_richtooltip.obj \
-	$(OBJS)\monolib_sound.obj \
-	$(OBJS)\monolib_taskbar.obj \
-	$(OBJS)\monolib_joystick.obj \
-	$(OBJS)\monolib_animateg.obj
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
+	$(OBJS)\monolib_helpext.obj \
+	$(OBJS)\monolib_hyperlinkg.obj \
+	$(OBJS)\monolib_laywin.obj \
+	$(OBJS)\monolib_notifmsgg.obj \
+	$(OBJS)\monolib_odcombo.obj \
+	$(OBJS)\monolib_propdlg.obj \
+	$(OBJS)\monolib_richtooltipg.obj \
+	$(OBJS)\monolib_sashwin.obj \
+	$(OBJS)\monolib_splash.obj \
+	$(OBJS)\monolib_generic_timectrl.obj \
+	$(OBJS)\monolib_tipdlg.obj \
+	$(OBJS)\monolib_treelist.obj \
+	$(OBJS)\monolib_wizard.obj \
+	$(OBJS)\monolib_taskbarcmn.obj \
+	$(OBJS)\monolib_aboutdlg.obj \
+	$(OBJS)\monolib_notifmsg.obj \
+	$(OBJS)\monolib_richtooltip.obj \
+	$(OBJS)\monolib_sound.obj \
+	$(OBJS)\monolib_taskbar.obj \
+	$(OBJS)\monolib_joystick.obj \
+	$(OBJS)\monolib_animateg.obj
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __basedll___depname = \
 	$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll
 !endif
@@ -3193,19 +3193,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontenum.obj \
 	$(OBJS)\coredll_fontutil.obj \
 	$(OBJS)\coredll_gdiimage.obj \
-	$(OBJS)\coredll_gdiobj.obj \
-	$(OBJS)\coredll_gdiplus.obj \
-	$(OBJS)\coredll_graphics.obj \
-	$(OBJS)\coredll_icon.obj \
-	$(OBJS)\coredll_imaglist.obj \
-	$(OBJS)\coredll_minifram.obj \
-	$(OBJS)\coredll_nonownedwnd.obj \
-	$(OBJS)\coredll_dataobj.obj \
-	$(OBJS)\coredll_dropsrc.obj \
-	$(OBJS)\coredll_droptgt.obj \
-	$(OBJS)\coredll_oleutils.obj \
-	$(OBJS)\coredll_palette.obj \
-	$(OBJS)\coredll_pen.obj \
+	$(OBJS)\coredll_gdiobj.obj \
+	$(OBJS)\coredll_gdiplus.obj \
+	$(OBJS)\coredll_graphics.obj \
+	$(OBJS)\coredll_icon.obj \
+	$(OBJS)\coredll_imaglist.obj \
+	$(OBJS)\coredll_minifram.obj \
+	$(OBJS)\coredll_nonownedwnd.obj \
+	$(OBJS)\coredll_dataobj.obj \
+	$(OBJS)\coredll_dropsrc.obj \
+	$(OBJS)\coredll_droptgt.obj \
+	$(OBJS)\coredll_oleutils.obj \
+	$(OBJS)\coredll_palette.obj \
+	$(OBJS)\coredll_pen.obj \
 	$(OBJS)\coredll_popupwin.obj \
 	$(OBJS)\coredll_printdlg.obj \
 	$(OBJS)\coredll_printwin.obj \
@@ -3465,19 +3465,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontenum.obj \
 	$(OBJS)\coredll_fontutil.obj \
 	$(OBJS)\coredll_gdiimage.obj \
-	$(OBJS)\coredll_gdiobj.obj \
-	$(OBJS)\coredll_gdiplus.obj \
-	$(OBJS)\coredll_graphics.obj \
-	$(OBJS)\coredll_icon.obj \
-	$(OBJS)\coredll_imaglist.obj \
-	$(OBJS)\coredll_minifram.obj \
-	$(OBJS)\coredll_nonownedwnd.obj \
-	$(OBJS)\coredll_dataobj.obj \
-	$(OBJS)\coredll_dropsrc.obj \
-	$(OBJS)\coredll_droptgt.obj \
-	$(OBJS)\coredll_oleutils.obj \
-	$(OBJS)\coredll_palette.obj \
-	$(OBJS)\coredll_pen.obj \
+	$(OBJS)\coredll_gdiobj.obj \
+	$(OBJS)\coredll_gdiplus.obj \
+	$(OBJS)\coredll_graphics.obj \
+	$(OBJS)\coredll_icon.obj \
+	$(OBJS)\coredll_imaglist.obj \
+	$(OBJS)\coredll_minifram.obj \
+	$(OBJS)\coredll_nonownedwnd.obj \
+	$(OBJS)\coredll_dataobj.obj \
+	$(OBJS)\coredll_dropsrc.obj \
+	$(OBJS)\coredll_droptgt.obj \
+	$(OBJS)\coredll_oleutils.obj \
+	$(OBJS)\coredll_palette.obj \
+	$(OBJS)\coredll_pen.obj \
 	$(OBJS)\coredll_popupwin.obj \
 	$(OBJS)\coredll_printdlg.obj \
 	$(OBJS)\coredll_printwin.obj \
@@ -3735,19 +3735,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontenum.obj \
 	$(OBJS)\corelib_fontutil.obj \
 	$(OBJS)\corelib_gdiimage.obj \
-	$(OBJS)\corelib_gdiobj.obj \
-	$(OBJS)\corelib_gdiplus.obj \
-	$(OBJS)\corelib_graphics.obj \
-	$(OBJS)\corelib_icon.obj \
-	$(OBJS)\corelib_imaglist.obj \
-	$(OBJS)\corelib_minifram.obj \
-	$(OBJS)\corelib_nonownedwnd.obj \
-	$(OBJS)\corelib_dataobj.obj \
-	$(OBJS)\corelib_dropsrc.obj \
-	$(OBJS)\corelib_droptgt.obj \
-	$(OBJS)\corelib_oleutils.obj \
-	$(OBJS)\corelib_palette.obj \
-	$(OBJS)\corelib_pen.obj \
+	$(OBJS)\corelib_gdiobj.obj \
+	$(OBJS)\corelib_gdiplus.obj \
+	$(OBJS)\corelib_graphics.obj \
+	$(OBJS)\corelib_icon.obj \
+	$(OBJS)\corelib_imaglist.obj \
+	$(OBJS)\corelib_minifram.obj \
+	$(OBJS)\corelib_nonownedwnd.obj \
+	$(OBJS)\corelib_dataobj.obj \
+	$(OBJS)\corelib_dropsrc.obj \
+	$(OBJS)\corelib_droptgt.obj \
+	$(OBJS)\corelib_oleutils.obj \
+	$(OBJS)\corelib_palette.obj \
+	$(OBJS)\corelib_pen.obj \
 	$(OBJS)\corelib_popupwin.obj \
 	$(OBJS)\corelib_printdlg.obj \
 	$(OBJS)\corelib_printwin.obj \
@@ -4007,19 +4007,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontenum.obj \
 	$(OBJS)\corelib_fontutil.obj \
 	$(OBJS)\corelib_gdiimage.obj \
-	$(OBJS)\corelib_gdiobj.obj \
-	$(OBJS)\corelib_gdiplus.obj \
-	$(OBJS)\corelib_graphics.obj \
-	$(OBJS)\corelib_icon.obj \
-	$(OBJS)\corelib_imaglist.obj \
-	$(OBJS)\corelib_minifram.obj \
-	$(OBJS)\corelib_nonownedwnd.obj \
-	$(OBJS)\corelib_dataobj.obj \
-	$(OBJS)\corelib_dropsrc.obj \
-	$(OBJS)\corelib_droptgt.obj \
-	$(OBJS)\corelib_oleutils.obj \
-	$(OBJS)\corelib_palette.obj \
-	$(OBJS)\corelib_pen.obj \
+	$(OBJS)\corelib_gdiobj.obj \
+	$(OBJS)\corelib_gdiplus.obj \
+	$(OBJS)\corelib_graphics.obj \
+	$(OBJS)\corelib_icon.obj \
+	$(OBJS)\corelib_imaglist.obj \
+	$(OBJS)\corelib_minifram.obj \
+	$(OBJS)\corelib_nonownedwnd.obj \
+	$(OBJS)\corelib_dataobj.obj \
+	$(OBJS)\corelib_dropsrc.obj \
+	$(OBJS)\corelib_droptgt.obj \
+	$(OBJS)\corelib_oleutils.obj \
+	$(OBJS)\corelib_palette.obj \
+	$(OBJS)\corelib_pen.obj \
 	$(OBJS)\corelib_popupwin.obj \
 	$(OBJS)\corelib_printdlg.obj \
 	$(OBJS)\corelib_printwin.obj \
@@ -4262,200 +4262,200 @@ __advdll___depname = \
 !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_gridcmn.obj \
-	$(OBJS)\advdll_hyperlnkcmn.obj \
-	$(OBJS)\advdll_odcombocmn.obj \
-	$(OBJS)\advdll_richtooltipcmn.obj \
-	$(OBJS)\advdll_aboutdlgg.obj \
-	$(OBJS)\advdll_bannerwindow.obj \
-	$(OBJS)\advdll_bmpcboxg.obj \
-	$(OBJS)\advdll_calctrlg.obj \
-	$(OBJS)\advdll_commandlinkbuttong.obj \
-	$(OBJS)\advdll_datavgen.obj \
+	$(OBJS)\advdll_bmpcboxcmn.obj \
+	$(OBJS)\advdll_calctrlcmn.obj \
+	$(OBJS)\advdll_datavcmn.obj \
+	$(OBJS)\advdll_gridcmn.obj \
+	$(OBJS)\advdll_hyperlnkcmn.obj \
+	$(OBJS)\advdll_odcombocmn.obj \
+	$(OBJS)\advdll_richtooltipcmn.obj \
+	$(OBJS)\advdll_aboutdlgg.obj \
+	$(OBJS)\advdll_bannerwindow.obj \
+	$(OBJS)\advdll_bmpcboxg.obj \
+	$(OBJS)\advdll_calctrlg.obj \
+	$(OBJS)\advdll_commandlinkbuttong.obj \
+	$(OBJS)\advdll_datavgen.obj \
 	$(OBJS)\advdll_datectlg.obj \
 	$(OBJS)\advdll_editlbox.obj \
 	$(OBJS)\advdll_grid.obj \
 	$(OBJS)\advdll_gridctrl.obj \
 	$(OBJS)\advdll_grideditors.obj \
 	$(OBJS)\advdll_gridsel.obj \
-	$(OBJS)\advdll_helpext.obj \
-	$(OBJS)\advdll_hyperlinkg.obj \
-	$(OBJS)\advdll_laywin.obj \
-	$(OBJS)\advdll_notifmsgg.obj \
-	$(OBJS)\advdll_odcombo.obj \
-	$(OBJS)\advdll_propdlg.obj \
-	$(OBJS)\advdll_generic_richtooltip.obj \
-	$(OBJS)\advdll_sashwin.obj \
-	$(OBJS)\advdll_splash.obj \
-	$(OBJS)\advdll_generic_timectrl.obj \
-	$(OBJS)\advdll_tipdlg.obj \
-	$(OBJS)\advdll_treelist.obj \
-	$(OBJS)\advdll_wizard.obj \
-	$(OBJS)\advdll_taskbarcmn.obj \
-	$(OBJS)\advdll_aboutdlg.obj \
-	$(OBJS)\advdll_notifmsg.obj \
-	$(OBJS)\advdll_msw_richtooltip.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_commandlinkbutton.obj \
-	$(OBJS)\advdll_datecontrols.obj \
-	$(OBJS)\advdll_datectrl.obj \
-	$(OBJS)\advdll_datetimectrl.obj \
-	$(OBJS)\advdll_hyperlink.obj \
-	$(OBJS)\advdll_msw_timectrl.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_gridcmn.obj \
-	$(OBJS)\advdll_hyperlnkcmn.obj \
-	$(OBJS)\advdll_odcombocmn.obj \
-	$(OBJS)\advdll_richtooltipcmn.obj \
-	$(OBJS)\advdll_aboutdlgg.obj \
-	$(OBJS)\advdll_bannerwindow.obj \
-	$(OBJS)\advdll_bmpcboxg.obj \
-	$(OBJS)\advdll_calctrlg.obj \
-	$(OBJS)\advdll_commandlinkbuttong.obj \
-	$(OBJS)\advdll_datavgen.obj \
+	$(OBJS)\advdll_helpext.obj \
+	$(OBJS)\advdll_hyperlinkg.obj \
+	$(OBJS)\advdll_laywin.obj \
+	$(OBJS)\advdll_notifmsgg.obj \
+	$(OBJS)\advdll_odcombo.obj \
+	$(OBJS)\advdll_propdlg.obj \
+	$(OBJS)\advdll_richtooltipg.obj \
+	$(OBJS)\advdll_sashwin.obj \
+	$(OBJS)\advdll_splash.obj \
+	$(OBJS)\advdll_generic_timectrl.obj \
+	$(OBJS)\advdll_tipdlg.obj \
+	$(OBJS)\advdll_treelist.obj \
+	$(OBJS)\advdll_wizard.obj \
+	$(OBJS)\advdll_taskbarcmn.obj \
+	$(OBJS)\advdll_aboutdlg.obj \
+	$(OBJS)\advdll_notifmsg.obj \
+	$(OBJS)\advdll_richtooltip.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_commandlinkbutton.obj \
+	$(OBJS)\advdll_datecontrols.obj \
+	$(OBJS)\advdll_datectrl.obj \
+	$(OBJS)\advdll_datetimectrl.obj \
+	$(OBJS)\advdll_hyperlink.obj \
+	$(OBJS)\advdll_msw_timectrl.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_gridcmn.obj \
+	$(OBJS)\advdll_hyperlnkcmn.obj \
+	$(OBJS)\advdll_odcombocmn.obj \
+	$(OBJS)\advdll_richtooltipcmn.obj \
+	$(OBJS)\advdll_aboutdlgg.obj \
+	$(OBJS)\advdll_bannerwindow.obj \
+	$(OBJS)\advdll_bmpcboxg.obj \
+	$(OBJS)\advdll_calctrlg.obj \
+	$(OBJS)\advdll_commandlinkbuttong.obj \
+	$(OBJS)\advdll_datavgen.obj \
 	$(OBJS)\advdll_datectlg.obj \
 	$(OBJS)\advdll_editlbox.obj \
 	$(OBJS)\advdll_grid.obj \
 	$(OBJS)\advdll_gridctrl.obj \
 	$(OBJS)\advdll_grideditors.obj \
 	$(OBJS)\advdll_gridsel.obj \
-	$(OBJS)\advdll_helpext.obj \
-	$(OBJS)\advdll_hyperlinkg.obj \
-	$(OBJS)\advdll_laywin.obj \
-	$(OBJS)\advdll_notifmsgg.obj \
-	$(OBJS)\advdll_odcombo.obj \
-	$(OBJS)\advdll_propdlg.obj \
-	$(OBJS)\advdll_generic_richtooltip.obj \
-	$(OBJS)\advdll_sashwin.obj \
-	$(OBJS)\advdll_splash.obj \
-	$(OBJS)\advdll_generic_timectrl.obj \
-	$(OBJS)\advdll_tipdlg.obj \
-	$(OBJS)\advdll_treelist.obj \
-	$(OBJS)\advdll_wizard.obj \
-	$(OBJS)\advdll_taskbarcmn.obj \
-	$(OBJS)\advdll_aboutdlg.obj \
-	$(OBJS)\advdll_notifmsg.obj \
-	$(OBJS)\advdll_msw_richtooltip.obj \
-	$(OBJS)\advdll_sound.obj \
-	$(OBJS)\advdll_taskbar.obj \
-	$(OBJS)\advdll_joystick.obj \
-	$(OBJS)\advdll_animateg.obj
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
+	$(OBJS)\advdll_helpext.obj \
+	$(OBJS)\advdll_hyperlinkg.obj \
+	$(OBJS)\advdll_laywin.obj \
+	$(OBJS)\advdll_notifmsgg.obj \
+	$(OBJS)\advdll_odcombo.obj \
+	$(OBJS)\advdll_propdlg.obj \
+	$(OBJS)\advdll_richtooltipg.obj \
+	$(OBJS)\advdll_sashwin.obj \
+	$(OBJS)\advdll_splash.obj \
+	$(OBJS)\advdll_generic_timectrl.obj \
+	$(OBJS)\advdll_tipdlg.obj \
+	$(OBJS)\advdll_treelist.obj \
+	$(OBJS)\advdll_wizard.obj \
+	$(OBJS)\advdll_taskbarcmn.obj \
+	$(OBJS)\advdll_aboutdlg.obj \
+	$(OBJS)\advdll_notifmsg.obj \
+	$(OBJS)\advdll_richtooltip.obj \
+	$(OBJS)\advdll_sound.obj \
+	$(OBJS)\advdll_taskbar.obj \
+	$(OBJS)\advdll_joystick.obj \
+	$(OBJS)\advdll_animateg.obj
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
 __advlib___depname = \
 	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
 !endif
 !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_gridcmn.obj \
-	$(OBJS)\advlib_hyperlnkcmn.obj \
-	$(OBJS)\advlib_odcombocmn.obj \
-	$(OBJS)\advlib_richtooltipcmn.obj \
-	$(OBJS)\advlib_aboutdlgg.obj \
-	$(OBJS)\advlib_bannerwindow.obj \
-	$(OBJS)\advlib_bmpcboxg.obj \
-	$(OBJS)\advlib_calctrlg.obj \
-	$(OBJS)\advlib_commandlinkbuttong.obj \
-	$(OBJS)\advlib_datavgen.obj \
+	$(OBJS)\advlib_bmpcboxcmn.obj \
+	$(OBJS)\advlib_calctrlcmn.obj \
+	$(OBJS)\advlib_datavcmn.obj \
+	$(OBJS)\advlib_gridcmn.obj \
+	$(OBJS)\advlib_hyperlnkcmn.obj \
+	$(OBJS)\advlib_odcombocmn.obj \
+	$(OBJS)\advlib_richtooltipcmn.obj \
+	$(OBJS)\advlib_aboutdlgg.obj \
+	$(OBJS)\advlib_bannerwindow.obj \
+	$(OBJS)\advlib_bmpcboxg.obj \
+	$(OBJS)\advlib_calctrlg.obj \
+	$(OBJS)\advlib_commandlinkbuttong.obj \
+	$(OBJS)\advlib_datavgen.obj \
 	$(OBJS)\advlib_datectlg.obj \
 	$(OBJS)\advlib_editlbox.obj \
 	$(OBJS)\advlib_grid.obj \
 	$(OBJS)\advlib_gridctrl.obj \
 	$(OBJS)\advlib_grideditors.obj \
 	$(OBJS)\advlib_gridsel.obj \
-	$(OBJS)\advlib_helpext.obj \
-	$(OBJS)\advlib_hyperlinkg.obj \
-	$(OBJS)\advlib_laywin.obj \
-	$(OBJS)\advlib_notifmsgg.obj \
-	$(OBJS)\advlib_odcombo.obj \
-	$(OBJS)\advlib_propdlg.obj \
-	$(OBJS)\advlib_generic_richtooltip.obj \
-	$(OBJS)\advlib_sashwin.obj \
-	$(OBJS)\advlib_splash.obj \
-	$(OBJS)\advlib_generic_timectrl.obj \
-	$(OBJS)\advlib_tipdlg.obj \
-	$(OBJS)\advlib_treelist.obj \
-	$(OBJS)\advlib_wizard.obj \
-	$(OBJS)\advlib_taskbarcmn.obj \
-	$(OBJS)\advlib_aboutdlg.obj \
-	$(OBJS)\advlib_notifmsg.obj \
-	$(OBJS)\advlib_msw_richtooltip.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_commandlinkbutton.obj \
-	$(OBJS)\advlib_datecontrols.obj \
-	$(OBJS)\advlib_datectrl.obj \
-	$(OBJS)\advlib_datetimectrl.obj \
-	$(OBJS)\advlib_hyperlink.obj \
-	$(OBJS)\advlib_msw_timectrl.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_gridcmn.obj \
-	$(OBJS)\advlib_hyperlnkcmn.obj \
-	$(OBJS)\advlib_odcombocmn.obj \
-	$(OBJS)\advlib_richtooltipcmn.obj \
-	$(OBJS)\advlib_aboutdlgg.obj \
-	$(OBJS)\advlib_bannerwindow.obj \
-	$(OBJS)\advlib_bmpcboxg.obj \
-	$(OBJS)\advlib_calctrlg.obj \
-	$(OBJS)\advlib_commandlinkbuttong.obj \
-	$(OBJS)\advlib_datavgen.obj \
+	$(OBJS)\advlib_helpext.obj \
+	$(OBJS)\advlib_hyperlinkg.obj \
+	$(OBJS)\advlib_laywin.obj \
+	$(OBJS)\advlib_notifmsgg.obj \
+	$(OBJS)\advlib_odcombo.obj \
+	$(OBJS)\advlib_propdlg.obj \
+	$(OBJS)\advlib_richtooltipg.obj \
+	$(OBJS)\advlib_sashwin.obj \
+	$(OBJS)\advlib_splash.obj \
+	$(OBJS)\advlib_generic_timectrl.obj \
+	$(OBJS)\advlib_tipdlg.obj \
+	$(OBJS)\advlib_treelist.obj \
+	$(OBJS)\advlib_wizard.obj \
+	$(OBJS)\advlib_taskbarcmn.obj \
+	$(OBJS)\advlib_aboutdlg.obj \
+	$(OBJS)\advlib_notifmsg.obj \
+	$(OBJS)\advlib_richtooltip.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_commandlinkbutton.obj \
+	$(OBJS)\advlib_datecontrols.obj \
+	$(OBJS)\advlib_datectrl.obj \
+	$(OBJS)\advlib_datetimectrl.obj \
+	$(OBJS)\advlib_hyperlink.obj \
+	$(OBJS)\advlib_msw_timectrl.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_gridcmn.obj \
+	$(OBJS)\advlib_hyperlnkcmn.obj \
+	$(OBJS)\advlib_odcombocmn.obj \
+	$(OBJS)\advlib_richtooltipcmn.obj \
+	$(OBJS)\advlib_aboutdlgg.obj \
+	$(OBJS)\advlib_bannerwindow.obj \
+	$(OBJS)\advlib_bmpcboxg.obj \
+	$(OBJS)\advlib_calctrlg.obj \
+	$(OBJS)\advlib_commandlinkbuttong.obj \
+	$(OBJS)\advlib_datavgen.obj \
 	$(OBJS)\advlib_datectlg.obj \
 	$(OBJS)\advlib_editlbox.obj \
 	$(OBJS)\advlib_grid.obj \
 	$(OBJS)\advlib_gridctrl.obj \
 	$(OBJS)\advlib_grideditors.obj \
 	$(OBJS)\advlib_gridsel.obj \
-	$(OBJS)\advlib_helpext.obj \
-	$(OBJS)\advlib_hyperlinkg.obj \
-	$(OBJS)\advlib_laywin.obj \
-	$(OBJS)\advlib_notifmsgg.obj \
-	$(OBJS)\advlib_odcombo.obj \
-	$(OBJS)\advlib_propdlg.obj \
-	$(OBJS)\advlib_generic_richtooltip.obj \
-	$(OBJS)\advlib_sashwin.obj \
-	$(OBJS)\advlib_splash.obj \
-	$(OBJS)\advlib_generic_timectrl.obj \
-	$(OBJS)\advlib_tipdlg.obj \
-	$(OBJS)\advlib_treelist.obj \
-	$(OBJS)\advlib_wizard.obj \
-	$(OBJS)\advlib_taskbarcmn.obj \
-	$(OBJS)\advlib_aboutdlg.obj \
-	$(OBJS)\advlib_notifmsg.obj \
-	$(OBJS)\advlib_msw_richtooltip.obj \
-	$(OBJS)\advlib_sound.obj \
-	$(OBJS)\advlib_taskbar.obj \
-	$(OBJS)\advlib_joystick.obj \
-	$(OBJS)\advlib_animateg.obj
-!endif
-!if "$(SHARED)" == "1"
+	$(OBJS)\advlib_helpext.obj \
+	$(OBJS)\advlib_hyperlinkg.obj \
+	$(OBJS)\advlib_laywin.obj \
+	$(OBJS)\advlib_notifmsgg.obj \
+	$(OBJS)\advlib_odcombo.obj \
+	$(OBJS)\advlib_propdlg.obj \
+	$(OBJS)\advlib_richtooltipg.obj \
+	$(OBJS)\advlib_sashwin.obj \
+	$(OBJS)\advlib_splash.obj \
+	$(OBJS)\advlib_generic_timectrl.obj \
+	$(OBJS)\advlib_tipdlg.obj \
+	$(OBJS)\advlib_treelist.obj \
+	$(OBJS)\advlib_wizard.obj \
+	$(OBJS)\advlib_taskbarcmn.obj \
+	$(OBJS)\advlib_aboutdlg.obj \
+	$(OBJS)\advlib_notifmsg.obj \
+	$(OBJS)\advlib_richtooltip.obj \
+	$(OBJS)\advlib_sound.obj \
+	$(OBJS)\advlib_taskbar.obj \
+	$(OBJS)\advlib_joystick.obj \
+	$(OBJS)\advlib_animateg.obj
+!endif
+!if "$(SHARED)" == "1"
 ____wxadv_namedll_DEP = $(__advdll___depname)
 !endif
 !if "$(SHARED)" == "0"
@@ -6250,9 +6250,9 @@ $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
 $(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textfile.cpp
 
-$(OBJS)\monodll_time.obj: ..\..\src\common\time.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\time.cpp
-
+$(OBJS)\monodll_time.obj: ..\..\src\common\time.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\time.cpp
+
 $(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timercmn.cpp
 
@@ -6739,27 +6739,27 @@ $(OBJS)\monodll_calctrl.obj: ..\..\src\msw\calctrl.cpp
 $(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
 
-$(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
-
-$(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
-
-$(OBJS)\monodll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
-
-$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
-
-$(OBJS)\monodll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
-
-$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
-
-$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
-
+$(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+
+$(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
+
+$(OBJS)\monodll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
+
+$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+
+$(OBJS)\monodll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
+
+$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
+
+$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
+
 $(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp
 
@@ -7018,21 +7018,21 @@ $(OBJS)\monodll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\monodll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp
 
-$(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
-
-$(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
-
-$(OBJS)\monodll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
-
-$(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
-
-$(OBJS)\monodll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
-
+$(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
+
+$(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
+
+$(OBJS)\monodll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
+
+$(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\monodll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
 
@@ -7306,23 +7306,23 @@ $(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
 !endif
 
@@ -8276,23 +8276,23 @@ $(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
 !endif
 
@@ -8371,38 +8371,38 @@ $(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_generic_richtooltip.obj: ..\..\src\generic\richtooltip.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\richtooltip.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splash.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splash.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treelist.cpp
 !endif
 
@@ -8421,23 +8421,23 @@ $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_msw_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp
 !endif
 
@@ -8655,9 +8655,9 @@ $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
 $(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textfile.cpp
 
-$(OBJS)\monolib_time.obj: ..\..\src\common\time.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\time.cpp
-
+$(OBJS)\monolib_time.obj: ..\..\src\common\time.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\time.cpp
+
 $(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp
 
@@ -9144,27 +9144,27 @@ $(OBJS)\monolib_calctrl.obj: ..\..\src\msw\calctrl.cpp
 $(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
 
-$(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
-
-$(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
-
-$(OBJS)\monolib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
-
-$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
-
-$(OBJS)\monolib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
-
-$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
-
-$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
-
+$(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+
+$(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
+
+$(OBJS)\monolib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
+
+$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+
+$(OBJS)\monolib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
+
+$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
+
+$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
+
 $(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp
 
@@ -9423,21 +9423,21 @@ $(OBJS)\monolib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\monolib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp
 
-$(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
-
-$(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
-
-$(OBJS)\monolib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
-
-$(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
-
-$(OBJS)\monolib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
-
+$(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
+
+$(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
+
+$(OBJS)\monolib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
+
+$(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\monolib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
 
@@ -9711,23 +9711,23 @@ $(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
 !endif
 
@@ -10681,23 +10681,23 @@ $(OBJS)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
 !endif
 
@@ -10776,38 +10776,38 @@ $(OBJS)\monolib_odcombo.obj: ..\..\src\generic\odcombo.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_generic_richtooltip.obj: ..\..\src\generic\richtooltip.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richtooltip.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splash.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splash.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp
 !endif
 
@@ -10826,23 +10826,23 @@ $(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_msw_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp
 !endif
 
@@ -11060,9 +11060,9 @@ $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
 $(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textfile.cpp
 
-$(OBJS)\basedll_time.obj: ..\..\src\common\time.cpp
-	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\time.cpp
-
+$(OBJS)\basedll_time.obj: ..\..\src\common\time.cpp
+	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\time.cpp
+
 $(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp
 	$(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp
 
@@ -11399,9 +11399,9 @@ $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
 $(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textfile.cpp
 
-$(OBJS)\baselib_time.obj: ..\..\src\common\time.cpp
-	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\time.cpp
-
+$(OBJS)\baselib_time.obj: ..\..\src\common\time.cpp
+	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\time.cpp
+
 $(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp
 	$(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp
 
@@ -12089,23 +12089,23 @@ $(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
 !endif
 
@@ -13497,23 +13497,23 @@ $(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
 !endif
 
@@ -14452,27 +14452,27 @@ $(OBJS)\advdll_calctrl.obj: ..\..\src\msw\calctrl.cpp
 $(OBJS)\advdll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
 
-$(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
-
-$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
-
-$(OBJS)\advdll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
-
-$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
-
-$(OBJS)\advdll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
-
-$(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
-
-$(OBJS)\advdll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
-
+$(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+
+$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
+
+$(OBJS)\advdll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
+
+$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+
+$(OBJS)\advdll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
+
+$(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
+
+$(OBJS)\advdll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+
 $(OBJS)\advdll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
 
@@ -14482,21 +14482,21 @@ $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 $(OBJS)\advdll_gridcmn.obj: ..\..\src\common\gridcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp
 
-$(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
-
-$(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
-
-$(OBJS)\advdll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
-
-$(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
-
-$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
-
+$(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
+
+$(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+
+$(OBJS)\advdll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
+
+$(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+
+$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
+
 $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
 
@@ -14539,51 +14539,51 @@ $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
 $(OBJS)\advdll_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp
 
-$(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp
-
-$(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp
-
-$(OBJS)\advdll_generic_richtooltip.obj: ..\..\src\generic\richtooltip.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\richtooltip.cpp
-
-$(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp
-
-$(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp
-
-$(OBJS)\advdll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp
-
-$(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
-
-$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp
-
+$(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp
+
+$(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp
+
+$(OBJS)\advdll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp
+
+$(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp
+
+$(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp
+
+$(OBJS)\advdll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+
+$(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+
+$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp
+
 $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\wizard.cpp
 
 $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
 
-$(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
-
-$(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
-
-$(OBJS)\advdll_msw_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
-
-$(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp
-
-$(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp
-
+$(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+
+$(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+
+$(OBJS)\advdll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+
+$(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+
+$(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
+	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+
 $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
 
@@ -14602,27 +14602,27 @@ $(OBJS)\advlib_calctrl.obj: ..\..\src\msw\calctrl.cpp
 $(OBJS)\advlib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
 
-$(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
-
-$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
-
-$(OBJS)\advlib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
-
-$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
-
-$(OBJS)\advlib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
-
-$(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
-
-$(OBJS)\advlib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
-
+$(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+
+$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
+
+$(OBJS)\advlib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
+
+$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+
+$(OBJS)\advlib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
+
+$(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
+
+$(OBJS)\advlib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+
 $(OBJS)\advlib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
 
@@ -14632,21 +14632,21 @@ $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 $(OBJS)\advlib_gridcmn.obj: ..\..\src\common\gridcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp
 
-$(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
-
-$(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
-
-$(OBJS)\advlib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
-
-$(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
-
-$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
-
+$(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
+
+$(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+
+$(OBJS)\advlib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
+
+$(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+
+$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
+
 $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
 
@@ -14689,51 +14689,51 @@ $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
 $(OBJS)\advlib_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp
 
-$(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp
-
-$(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp
-
-$(OBJS)\advlib_generic_richtooltip.obj: ..\..\src\generic\richtooltip.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\richtooltip.cpp
-
-$(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp
-
-$(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp
-
-$(OBJS)\advlib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp
-
-$(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
-
-$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp
-
+$(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp
+
+$(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp
+
+$(OBJS)\advlib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp
+
+$(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp
+
+$(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp
+
+$(OBJS)\advlib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+
+$(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+
+$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp
+
 $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp
 
 $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
 
-$(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
-
-$(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
-
-$(OBJS)\advlib_msw_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
-
-$(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
-
-$(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp
-
+$(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+
+$(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+
+$(OBJS)\advlib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+
+$(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+
+$(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
+	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+
 $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
 
@@ -15172,21 +15172,21 @@ $(OBJS)\xrcdll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\xrcdll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp
 
-$(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
-	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
-
-$(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
-
-$(OBJS)\xrcdll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
-
-$(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
-
-$(OBJS)\xrcdll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
-
+$(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
+	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
+
+$(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
+
+$(OBJS)\xrcdll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
+
+$(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\xrcdll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
 
@@ -15370,21 +15370,21 @@ $(OBJS)\xrclib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\xrclib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp
 
-$(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
-	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
-
-$(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
-
-$(OBJS)\xrclib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
-
-$(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
-
-$(OBJS)\xrclib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
-
+$(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
+	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
+
+$(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
+
+$(OBJS)\xrclib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
+
+$(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\xrclib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
 
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 3d4f9a8d3d..6855909f61 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -375,7 +375,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_tarstrm.o \
 	$(OBJS)\monodll_textbuf.o \
 	$(OBJS)\monodll_textfile.o \
-	$(OBJS)\monodll_time.o \
+	$(OBJS)\monodll_time.o \
 	$(OBJS)\monodll_timercmn.o \
 	$(OBJS)\monodll_timerimpl.o \
 	$(OBJS)\monodll_tokenzr.o \
@@ -525,7 +525,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_tarstrm.o \
 	$(OBJS)\monolib_textbuf.o \
 	$(OBJS)\monolib_textfile.o \
-	$(OBJS)\monolib_time.o \
+	$(OBJS)\monolib_time.o \
 	$(OBJS)\monolib_timercmn.o \
 	$(OBJS)\monolib_timerimpl.o \
 	$(OBJS)\monolib_tokenzr.o \
@@ -673,7 +673,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_tarstrm.o \
 	$(OBJS)\basedll_textbuf.o \
 	$(OBJS)\basedll_textfile.o \
-	$(OBJS)\basedll_time.o \
+	$(OBJS)\basedll_time.o \
 	$(OBJS)\basedll_timercmn.o \
 	$(OBJS)\basedll_timerimpl.o \
 	$(OBJS)\basedll_tokenzr.o \
@@ -805,7 +805,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_tarstrm.o \
 	$(OBJS)\baselib_textbuf.o \
 	$(OBJS)\baselib_textfile.o \
-	$(OBJS)\baselib_time.o \
+	$(OBJS)\baselib_time.o \
 	$(OBJS)\baselib_timercmn.o \
 	$(OBJS)\baselib_timerimpl.o \
 	$(OBJS)\baselib_tokenzr.o \
@@ -1216,19 +1216,19 @@ XRCDLL_OBJECTS =  \
 	$(OBJS)\xrcdll_xh_split.o \
 	$(OBJS)\xrcdll_xh_srchctrl.o \
 	$(OBJS)\xrcdll_xh_statbar.o \
-	$(OBJS)\xrcdll_xh_stbmp.o \
-	$(OBJS)\xrcdll_xh_stbox.o \
-	$(OBJS)\xrcdll_xh_stlin.o \
-	$(OBJS)\xrcdll_xh_sttxt.o \
-	$(OBJS)\xrcdll_xh_text.o \
-	$(OBJS)\xrcdll_xh_tglbtn.o \
-	$(OBJS)\xrcdll_xh_timectrl.o \
-	$(OBJS)\xrcdll_xh_toolb.o \
-	$(OBJS)\xrcdll_xh_toolbk.o \
-	$(OBJS)\xrcdll_xh_tree.o \
-	$(OBJS)\xrcdll_xh_treebk.o \
-	$(OBJS)\xrcdll_xh_unkwn.o \
-	$(OBJS)\xrcdll_xh_wizrd.o \
+	$(OBJS)\xrcdll_xh_stbmp.o \
+	$(OBJS)\xrcdll_xh_stbox.o \
+	$(OBJS)\xrcdll_xh_stlin.o \
+	$(OBJS)\xrcdll_xh_sttxt.o \
+	$(OBJS)\xrcdll_xh_text.o \
+	$(OBJS)\xrcdll_xh_tglbtn.o \
+	$(OBJS)\xrcdll_xh_timectrl.o \
+	$(OBJS)\xrcdll_xh_toolb.o \
+	$(OBJS)\xrcdll_xh_toolbk.o \
+	$(OBJS)\xrcdll_xh_tree.o \
+	$(OBJS)\xrcdll_xh_treebk.o \
+	$(OBJS)\xrcdll_xh_unkwn.o \
+	$(OBJS)\xrcdll_xh_wizrd.o \
 	$(OBJS)\xrcdll_xmlres.o \
 	$(OBJS)\xrcdll_xmladv.o \
 	$(OBJS)\xrcdll_xmlrsall.o
@@ -1291,19 +1291,19 @@ XRCLIB_OBJECTS =  \
 	$(OBJS)\xrclib_xh_split.o \
 	$(OBJS)\xrclib_xh_srchctrl.o \
 	$(OBJS)\xrclib_xh_statbar.o \
-	$(OBJS)\xrclib_xh_stbmp.o \
-	$(OBJS)\xrclib_xh_stbox.o \
-	$(OBJS)\xrclib_xh_stlin.o \
-	$(OBJS)\xrclib_xh_sttxt.o \
-	$(OBJS)\xrclib_xh_text.o \
-	$(OBJS)\xrclib_xh_tglbtn.o \
-	$(OBJS)\xrclib_xh_timectrl.o \
-	$(OBJS)\xrclib_xh_toolb.o \
-	$(OBJS)\xrclib_xh_toolbk.o \
-	$(OBJS)\xrclib_xh_tree.o \
-	$(OBJS)\xrclib_xh_treebk.o \
-	$(OBJS)\xrclib_xh_unkwn.o \
-	$(OBJS)\xrclib_xh_wizrd.o \
+	$(OBJS)\xrclib_xh_stbmp.o \
+	$(OBJS)\xrclib_xh_stbox.o \
+	$(OBJS)\xrclib_xh_stlin.o \
+	$(OBJS)\xrclib_xh_sttxt.o \
+	$(OBJS)\xrclib_xh_text.o \
+	$(OBJS)\xrclib_xh_tglbtn.o \
+	$(OBJS)\xrclib_xh_timectrl.o \
+	$(OBJS)\xrclib_xh_toolb.o \
+	$(OBJS)\xrclib_xh_toolbk.o \
+	$(OBJS)\xrclib_xh_tree.o \
+	$(OBJS)\xrclib_xh_treebk.o \
+	$(OBJS)\xrclib_xh_unkwn.o \
+	$(OBJS)\xrclib_xh_wizrd.o \
 	$(OBJS)\xrclib_xmlres.o \
 	$(OBJS)\xrclib_xmladv.o \
 	$(OBJS)\xrclib_xmlrsall.o
@@ -1677,19 +1677,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_xh_split.o \
 	$(OBJS)\monodll_xh_srchctrl.o \
 	$(OBJS)\monodll_xh_statbar.o \
-	$(OBJS)\monodll_xh_stbmp.o \
-	$(OBJS)\monodll_xh_stbox.o \
-	$(OBJS)\monodll_xh_stlin.o \
-	$(OBJS)\monodll_xh_sttxt.o \
-	$(OBJS)\monodll_xh_text.o \
-	$(OBJS)\monodll_xh_tglbtn.o \
-	$(OBJS)\monodll_xh_timectrl.o \
-	$(OBJS)\monodll_xh_toolb.o \
-	$(OBJS)\monodll_xh_toolbk.o \
-	$(OBJS)\monodll_xh_tree.o \
-	$(OBJS)\monodll_xh_treebk.o \
-	$(OBJS)\monodll_xh_unkwn.o \
-	$(OBJS)\monodll_xh_wizrd.o \
+	$(OBJS)\monodll_xh_stbmp.o \
+	$(OBJS)\monodll_xh_stbox.o \
+	$(OBJS)\monodll_xh_stlin.o \
+	$(OBJS)\monodll_xh_sttxt.o \
+	$(OBJS)\monodll_xh_text.o \
+	$(OBJS)\monodll_xh_tglbtn.o \
+	$(OBJS)\monodll_xh_timectrl.o \
+	$(OBJS)\monodll_xh_toolb.o \
+	$(OBJS)\monodll_xh_toolbk.o \
+	$(OBJS)\monodll_xh_tree.o \
+	$(OBJS)\monodll_xh_treebk.o \
+	$(OBJS)\monodll_xh_unkwn.o \
+	$(OBJS)\monodll_xh_wizrd.o \
 	$(OBJS)\monodll_xmlres.o \
 	$(OBJS)\monodll_xmladv.o \
 	$(OBJS)\monodll_xmlrsall.o \
@@ -1756,19 +1756,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontenum.o \
 	$(OBJS)\monodll_fontutil.o \
 	$(OBJS)\monodll_gdiimage.o \
-	$(OBJS)\monodll_gdiobj.o \
-	$(OBJS)\monodll_gdiplus.o \
-	$(OBJS)\monodll_graphics.o \
-	$(OBJS)\monodll_icon.o \
-	$(OBJS)\monodll_imaglist.o \
-	$(OBJS)\monodll_minifram.o \
-	$(OBJS)\monodll_nonownedwnd.o \
-	$(OBJS)\monodll_dataobj.o \
-	$(OBJS)\monodll_dropsrc.o \
-	$(OBJS)\monodll_droptgt.o \
-	$(OBJS)\monodll_oleutils.o \
-	$(OBJS)\monodll_palette.o \
-	$(OBJS)\monodll_pen.o \
+	$(OBJS)\monodll_gdiobj.o \
+	$(OBJS)\monodll_gdiplus.o \
+	$(OBJS)\monodll_graphics.o \
+	$(OBJS)\monodll_icon.o \
+	$(OBJS)\monodll_imaglist.o \
+	$(OBJS)\monodll_minifram.o \
+	$(OBJS)\monodll_nonownedwnd.o \
+	$(OBJS)\monodll_dataobj.o \
+	$(OBJS)\monodll_dropsrc.o \
+	$(OBJS)\monodll_droptgt.o \
+	$(OBJS)\monodll_oleutils.o \
+	$(OBJS)\monodll_palette.o \
+	$(OBJS)\monodll_pen.o \
 	$(OBJS)\monodll_popupwin.o \
 	$(OBJS)\monodll_printdlg.o \
 	$(OBJS)\monodll_printwin.o \
@@ -2030,19 +2030,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontenum.o \
 	$(OBJS)\monodll_fontutil.o \
 	$(OBJS)\monodll_gdiimage.o \
-	$(OBJS)\monodll_gdiobj.o \
-	$(OBJS)\monodll_gdiplus.o \
-	$(OBJS)\monodll_graphics.o \
-	$(OBJS)\monodll_icon.o \
-	$(OBJS)\monodll_imaglist.o \
-	$(OBJS)\monodll_minifram.o \
-	$(OBJS)\monodll_nonownedwnd.o \
-	$(OBJS)\monodll_dataobj.o \
-	$(OBJS)\monodll_dropsrc.o \
-	$(OBJS)\monodll_droptgt.o \
-	$(OBJS)\monodll_oleutils.o \
-	$(OBJS)\monodll_palette.o \
-	$(OBJS)\monodll_pen.o \
+	$(OBJS)\monodll_gdiobj.o \
+	$(OBJS)\monodll_gdiplus.o \
+	$(OBJS)\monodll_graphics.o \
+	$(OBJS)\monodll_icon.o \
+	$(OBJS)\monodll_imaglist.o \
+	$(OBJS)\monodll_minifram.o \
+	$(OBJS)\monodll_nonownedwnd.o \
+	$(OBJS)\monodll_dataobj.o \
+	$(OBJS)\monodll_dropsrc.o \
+	$(OBJS)\monodll_droptgt.o \
+	$(OBJS)\monodll_oleutils.o \
+	$(OBJS)\monodll_palette.o \
+	$(OBJS)\monodll_pen.o \
 	$(OBJS)\monodll_popupwin.o \
 	$(OBJS)\monodll_printdlg.o \
 	$(OBJS)\monodll_printwin.o \
@@ -2276,100 +2276,100 @@ endif
 ifeq ($(WXUNIV),0)
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_animatecmn.o \
-	$(OBJS)\monodll_bmpcboxcmn.o \
-	$(OBJS)\monodll_calctrlcmn.o \
-	$(OBJS)\monodll_datavcmn.o \
-	$(OBJS)\monodll_gridcmn.o \
-	$(OBJS)\monodll_hyperlnkcmn.o \
-	$(OBJS)\monodll_odcombocmn.o \
-	$(OBJS)\monodll_richtooltipcmn.o \
-	$(OBJS)\monodll_aboutdlgg.o \
-	$(OBJS)\monodll_bannerwindow.o \
-	$(OBJS)\monodll_bmpcboxg.o \
-	$(OBJS)\monodll_calctrlg.o \
-	$(OBJS)\monodll_commandlinkbuttong.o \
-	$(OBJS)\monodll_datavgen.o \
+	$(OBJS)\monodll_bmpcboxcmn.o \
+	$(OBJS)\monodll_calctrlcmn.o \
+	$(OBJS)\monodll_datavcmn.o \
+	$(OBJS)\monodll_gridcmn.o \
+	$(OBJS)\monodll_hyperlnkcmn.o \
+	$(OBJS)\monodll_odcombocmn.o \
+	$(OBJS)\monodll_richtooltipcmn.o \
+	$(OBJS)\monodll_aboutdlgg.o \
+	$(OBJS)\monodll_bannerwindow.o \
+	$(OBJS)\monodll_bmpcboxg.o \
+	$(OBJS)\monodll_calctrlg.o \
+	$(OBJS)\monodll_commandlinkbuttong.o \
+	$(OBJS)\monodll_datavgen.o \
 	$(OBJS)\monodll_datectlg.o \
 	$(OBJS)\monodll_editlbox.o \
 	$(OBJS)\monodll_grid.o \
 	$(OBJS)\monodll_gridctrl.o \
 	$(OBJS)\monodll_grideditors.o \
 	$(OBJS)\monodll_gridsel.o \
-	$(OBJS)\monodll_helpext.o \
-	$(OBJS)\monodll_hyperlinkg.o \
-	$(OBJS)\monodll_laywin.o \
-	$(OBJS)\monodll_notifmsgg.o \
-	$(OBJS)\monodll_odcombo.o \
-	$(OBJS)\monodll_propdlg.o \
-	$(OBJS)\monodll_generic_richtooltip.o \
-	$(OBJS)\monodll_sashwin.o \
-	$(OBJS)\monodll_splash.o \
-	$(OBJS)\monodll_generic_timectrl.o \
-	$(OBJS)\monodll_tipdlg.o \
-	$(OBJS)\monodll_treelist.o \
-	$(OBJS)\monodll_wizard.o \
-	$(OBJS)\monodll_taskbarcmn.o \
-	$(OBJS)\monodll_aboutdlg.o \
-	$(OBJS)\monodll_notifmsg.o \
-	$(OBJS)\monodll_msw_richtooltip.o \
-	$(OBJS)\monodll_sound.o \
-	$(OBJS)\monodll_taskbar.o \
-	$(OBJS)\monodll_joystick.o \
-	$(OBJS)\monodll_animateg.o \
-	$(OBJS)\monodll_bmpcbox.o \
-	$(OBJS)\monodll_calctrl.o \
-	$(OBJS)\monodll_commandlinkbutton.o \
-	$(OBJS)\monodll_datecontrols.o \
-	$(OBJS)\monodll_datectrl.o \
-	$(OBJS)\monodll_datetimectrl.o \
-	$(OBJS)\monodll_hyperlink.o \
-	$(OBJS)\monodll_msw_timectrl.o
-endif
-ifeq ($(WXUNIV),1)
-____ADVANCED_SRC_FILENAMES_OBJECTS =  \
-	$(OBJS)\monodll_animatecmn.o \
-	$(OBJS)\monodll_bmpcboxcmn.o \
-	$(OBJS)\monodll_calctrlcmn.o \
-	$(OBJS)\monodll_datavcmn.o \
-	$(OBJS)\monodll_gridcmn.o \
-	$(OBJS)\monodll_hyperlnkcmn.o \
-	$(OBJS)\monodll_odcombocmn.o \
-	$(OBJS)\monodll_richtooltipcmn.o \
-	$(OBJS)\monodll_aboutdlgg.o \
-	$(OBJS)\monodll_bannerwindow.o \
-	$(OBJS)\monodll_bmpcboxg.o \
-	$(OBJS)\monodll_calctrlg.o \
-	$(OBJS)\monodll_commandlinkbuttong.o \
-	$(OBJS)\monodll_datavgen.o \
+	$(OBJS)\monodll_helpext.o \
+	$(OBJS)\monodll_hyperlinkg.o \
+	$(OBJS)\monodll_laywin.o \
+	$(OBJS)\monodll_notifmsgg.o \
+	$(OBJS)\monodll_odcombo.o \
+	$(OBJS)\monodll_propdlg.o \
+	$(OBJS)\monodll_richtooltipg.o \
+	$(OBJS)\monodll_sashwin.o \
+	$(OBJS)\monodll_splash.o \
+	$(OBJS)\monodll_generic_timectrl.o \
+	$(OBJS)\monodll_tipdlg.o \
+	$(OBJS)\monodll_treelist.o \
+	$(OBJS)\monodll_wizard.o \
+	$(OBJS)\monodll_taskbarcmn.o \
+	$(OBJS)\monodll_aboutdlg.o \
+	$(OBJS)\monodll_notifmsg.o \
+	$(OBJS)\monodll_richtooltip.o \
+	$(OBJS)\monodll_sound.o \
+	$(OBJS)\monodll_taskbar.o \
+	$(OBJS)\monodll_joystick.o \
+	$(OBJS)\monodll_animateg.o \
+	$(OBJS)\monodll_bmpcbox.o \
+	$(OBJS)\monodll_calctrl.o \
+	$(OBJS)\monodll_commandlinkbutton.o \
+	$(OBJS)\monodll_datecontrols.o \
+	$(OBJS)\monodll_datectrl.o \
+	$(OBJS)\monodll_datetimectrl.o \
+	$(OBJS)\monodll_hyperlink.o \
+	$(OBJS)\monodll_msw_timectrl.o
+endif
+ifeq ($(WXUNIV),1)
+____ADVANCED_SRC_FILENAMES_OBJECTS =  \
+	$(OBJS)\monodll_animatecmn.o \
+	$(OBJS)\monodll_bmpcboxcmn.o \
+	$(OBJS)\monodll_calctrlcmn.o \
+	$(OBJS)\monodll_datavcmn.o \
+	$(OBJS)\monodll_gridcmn.o \
+	$(OBJS)\monodll_hyperlnkcmn.o \
+	$(OBJS)\monodll_odcombocmn.o \
+	$(OBJS)\monodll_richtooltipcmn.o \
+	$(OBJS)\monodll_aboutdlgg.o \
+	$(OBJS)\monodll_bannerwindow.o \
+	$(OBJS)\monodll_bmpcboxg.o \
+	$(OBJS)\monodll_calctrlg.o \
+	$(OBJS)\monodll_commandlinkbuttong.o \
+	$(OBJS)\monodll_datavgen.o \
 	$(OBJS)\monodll_datectlg.o \
 	$(OBJS)\monodll_editlbox.o \
 	$(OBJS)\monodll_grid.o \
 	$(OBJS)\monodll_gridctrl.o \
 	$(OBJS)\monodll_grideditors.o \
 	$(OBJS)\monodll_gridsel.o \
-	$(OBJS)\monodll_helpext.o \
-	$(OBJS)\monodll_hyperlinkg.o \
-	$(OBJS)\monodll_laywin.o \
-	$(OBJS)\monodll_notifmsgg.o \
-	$(OBJS)\monodll_odcombo.o \
-	$(OBJS)\monodll_propdlg.o \
-	$(OBJS)\monodll_generic_richtooltip.o \
-	$(OBJS)\monodll_sashwin.o \
-	$(OBJS)\monodll_splash.o \
-	$(OBJS)\monodll_generic_timectrl.o \
-	$(OBJS)\monodll_tipdlg.o \
-	$(OBJS)\monodll_treelist.o \
-	$(OBJS)\monodll_wizard.o \
-	$(OBJS)\monodll_taskbarcmn.o \
-	$(OBJS)\monodll_aboutdlg.o \
-	$(OBJS)\monodll_notifmsg.o \
-	$(OBJS)\monodll_msw_richtooltip.o \
-	$(OBJS)\monodll_sound.o \
-	$(OBJS)\monodll_taskbar.o \
-	$(OBJS)\monodll_joystick.o \
-	$(OBJS)\monodll_animateg.o
-endif
-ifeq ($(USE_STC),1)
+	$(OBJS)\monodll_helpext.o \
+	$(OBJS)\monodll_hyperlinkg.o \
+	$(OBJS)\monodll_laywin.o \
+	$(OBJS)\monodll_notifmsgg.o \
+	$(OBJS)\monodll_odcombo.o \
+	$(OBJS)\monodll_propdlg.o \
+	$(OBJS)\monodll_richtooltipg.o \
+	$(OBJS)\monodll_sashwin.o \
+	$(OBJS)\monodll_splash.o \
+	$(OBJS)\monodll_generic_timectrl.o \
+	$(OBJS)\monodll_tipdlg.o \
+	$(OBJS)\monodll_treelist.o \
+	$(OBJS)\monodll_wizard.o \
+	$(OBJS)\monodll_taskbarcmn.o \
+	$(OBJS)\monodll_aboutdlg.o \
+	$(OBJS)\monodll_notifmsg.o \
+	$(OBJS)\monodll_richtooltip.o \
+	$(OBJS)\monodll_sound.o \
+	$(OBJS)\monodll_taskbar.o \
+	$(OBJS)\monodll_joystick.o \
+	$(OBJS)\monodll_animateg.o
+endif
+ifeq ($(USE_STC),1)
 __wxscintilla_library_link_DEP = $(__wxscintilla)
 endif
 ifeq ($(MONOLITHIC),1)
@@ -2466,19 +2466,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_xh_split.o \
 	$(OBJS)\monolib_xh_srchctrl.o \
 	$(OBJS)\monolib_xh_statbar.o \
-	$(OBJS)\monolib_xh_stbmp.o \
-	$(OBJS)\monolib_xh_stbox.o \
-	$(OBJS)\monolib_xh_stlin.o \
-	$(OBJS)\monolib_xh_sttxt.o \
-	$(OBJS)\monolib_xh_text.o \
-	$(OBJS)\monolib_xh_tglbtn.o \
-	$(OBJS)\monolib_xh_timectrl.o \
-	$(OBJS)\monolib_xh_toolb.o \
-	$(OBJS)\monolib_xh_toolbk.o \
-	$(OBJS)\monolib_xh_tree.o \
-	$(OBJS)\monolib_xh_treebk.o \
-	$(OBJS)\monolib_xh_unkwn.o \
-	$(OBJS)\monolib_xh_wizrd.o \
+	$(OBJS)\monolib_xh_stbmp.o \
+	$(OBJS)\monolib_xh_stbox.o \
+	$(OBJS)\monolib_xh_stlin.o \
+	$(OBJS)\monolib_xh_sttxt.o \
+	$(OBJS)\monolib_xh_text.o \
+	$(OBJS)\monolib_xh_tglbtn.o \
+	$(OBJS)\monolib_xh_timectrl.o \
+	$(OBJS)\monolib_xh_toolb.o \
+	$(OBJS)\monolib_xh_toolbk.o \
+	$(OBJS)\monolib_xh_tree.o \
+	$(OBJS)\monolib_xh_treebk.o \
+	$(OBJS)\monolib_xh_unkwn.o \
+	$(OBJS)\monolib_xh_wizrd.o \
 	$(OBJS)\monolib_xmlres.o \
 	$(OBJS)\monolib_xmladv.o \
 	$(OBJS)\monolib_xmlrsall.o \
@@ -2545,19 +2545,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontenum.o \
 	$(OBJS)\monolib_fontutil.o \
 	$(OBJS)\monolib_gdiimage.o \
-	$(OBJS)\monolib_gdiobj.o \
-	$(OBJS)\monolib_gdiplus.o \
-	$(OBJS)\monolib_graphics.o \
-	$(OBJS)\monolib_icon.o \
-	$(OBJS)\monolib_imaglist.o \
-	$(OBJS)\monolib_minifram.o \
-	$(OBJS)\monolib_nonownedwnd.o \
-	$(OBJS)\monolib_dataobj.o \
-	$(OBJS)\monolib_dropsrc.o \
-	$(OBJS)\monolib_droptgt.o \
-	$(OBJS)\monolib_oleutils.o \
-	$(OBJS)\monolib_palette.o \
-	$(OBJS)\monolib_pen.o \
+	$(OBJS)\monolib_gdiobj.o \
+	$(OBJS)\monolib_gdiplus.o \
+	$(OBJS)\monolib_graphics.o \
+	$(OBJS)\monolib_icon.o \
+	$(OBJS)\monolib_imaglist.o \
+	$(OBJS)\monolib_minifram.o \
+	$(OBJS)\monolib_nonownedwnd.o \
+	$(OBJS)\monolib_dataobj.o \
+	$(OBJS)\monolib_dropsrc.o \
+	$(OBJS)\monolib_droptgt.o \
+	$(OBJS)\monolib_oleutils.o \
+	$(OBJS)\monolib_palette.o \
+	$(OBJS)\monolib_pen.o \
 	$(OBJS)\monolib_popupwin.o \
 	$(OBJS)\monolib_printdlg.o \
 	$(OBJS)\monolib_printwin.o \
@@ -2819,19 +2819,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontenum.o \
 	$(OBJS)\monolib_fontutil.o \
 	$(OBJS)\monolib_gdiimage.o \
-	$(OBJS)\monolib_gdiobj.o \
-	$(OBJS)\monolib_gdiplus.o \
-	$(OBJS)\monolib_graphics.o \
-	$(OBJS)\monolib_icon.o \
-	$(OBJS)\monolib_imaglist.o \
-	$(OBJS)\monolib_minifram.o \
-	$(OBJS)\monolib_nonownedwnd.o \
-	$(OBJS)\monolib_dataobj.o \
-	$(OBJS)\monolib_dropsrc.o \
-	$(OBJS)\monolib_droptgt.o \
-	$(OBJS)\monolib_oleutils.o \
-	$(OBJS)\monolib_palette.o \
-	$(OBJS)\monolib_pen.o \
+	$(OBJS)\monolib_gdiobj.o \
+	$(OBJS)\monolib_gdiplus.o \
+	$(OBJS)\monolib_graphics.o \
+	$(OBJS)\monolib_icon.o \
+	$(OBJS)\monolib_imaglist.o \
+	$(OBJS)\monolib_minifram.o \
+	$(OBJS)\monolib_nonownedwnd.o \
+	$(OBJS)\monolib_dataobj.o \
+	$(OBJS)\monolib_dropsrc.o \
+	$(OBJS)\monolib_droptgt.o \
+	$(OBJS)\monolib_oleutils.o \
+	$(OBJS)\monolib_palette.o \
+	$(OBJS)\monolib_pen.o \
 	$(OBJS)\monolib_popupwin.o \
 	$(OBJS)\monolib_printdlg.o \
 	$(OBJS)\monolib_printwin.o \
@@ -3065,100 +3065,100 @@ endif
 ifeq ($(WXUNIV),0)
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_animatecmn.o \
-	$(OBJS)\monolib_bmpcboxcmn.o \
-	$(OBJS)\monolib_calctrlcmn.o \
-	$(OBJS)\monolib_datavcmn.o \
-	$(OBJS)\monolib_gridcmn.o \
-	$(OBJS)\monolib_hyperlnkcmn.o \
-	$(OBJS)\monolib_odcombocmn.o \
-	$(OBJS)\monolib_richtooltipcmn.o \
-	$(OBJS)\monolib_aboutdlgg.o \
-	$(OBJS)\monolib_bannerwindow.o \
-	$(OBJS)\monolib_bmpcboxg.o \
-	$(OBJS)\monolib_calctrlg.o \
-	$(OBJS)\monolib_commandlinkbuttong.o \
-	$(OBJS)\monolib_datavgen.o \
+	$(OBJS)\monolib_bmpcboxcmn.o \
+	$(OBJS)\monolib_calctrlcmn.o \
+	$(OBJS)\monolib_datavcmn.o \
+	$(OBJS)\monolib_gridcmn.o \
+	$(OBJS)\monolib_hyperlnkcmn.o \
+	$(OBJS)\monolib_odcombocmn.o \
+	$(OBJS)\monolib_richtooltipcmn.o \
+	$(OBJS)\monolib_aboutdlgg.o \
+	$(OBJS)\monolib_bannerwindow.o \
+	$(OBJS)\monolib_bmpcboxg.o \
+	$(OBJS)\monolib_calctrlg.o \
+	$(OBJS)\monolib_commandlinkbuttong.o \
+	$(OBJS)\monolib_datavgen.o \
 	$(OBJS)\monolib_datectlg.o \
 	$(OBJS)\monolib_editlbox.o \
 	$(OBJS)\monolib_grid.o \
 	$(OBJS)\monolib_gridctrl.o \
 	$(OBJS)\monolib_grideditors.o \
 	$(OBJS)\monolib_gridsel.o \
-	$(OBJS)\monolib_helpext.o \
-	$(OBJS)\monolib_hyperlinkg.o \
-	$(OBJS)\monolib_laywin.o \
-	$(OBJS)\monolib_notifmsgg.o \
-	$(OBJS)\monolib_odcombo.o \
-	$(OBJS)\monolib_propdlg.o \
-	$(OBJS)\monolib_generic_richtooltip.o \
-	$(OBJS)\monolib_sashwin.o \
-	$(OBJS)\monolib_splash.o \
-	$(OBJS)\monolib_generic_timectrl.o \
-	$(OBJS)\monolib_tipdlg.o \
-	$(OBJS)\monolib_treelist.o \
-	$(OBJS)\monolib_wizard.o \
-	$(OBJS)\monolib_taskbarcmn.o \
-	$(OBJS)\monolib_aboutdlg.o \
-	$(OBJS)\monolib_notifmsg.o \
-	$(OBJS)\monolib_msw_richtooltip.o \
-	$(OBJS)\monolib_sound.o \
-	$(OBJS)\monolib_taskbar.o \
-	$(OBJS)\monolib_joystick.o \
-	$(OBJS)\monolib_animateg.o \
-	$(OBJS)\monolib_bmpcbox.o \
-	$(OBJS)\monolib_calctrl.o \
-	$(OBJS)\monolib_commandlinkbutton.o \
-	$(OBJS)\monolib_datecontrols.o \
-	$(OBJS)\monolib_datectrl.o \
-	$(OBJS)\monolib_datetimectrl.o \
-	$(OBJS)\monolib_hyperlink.o \
-	$(OBJS)\monolib_msw_timectrl.o
-endif
-ifeq ($(WXUNIV),1)
-____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
-	$(OBJS)\monolib_animatecmn.o \
-	$(OBJS)\monolib_bmpcboxcmn.o \
-	$(OBJS)\monolib_calctrlcmn.o \
-	$(OBJS)\monolib_datavcmn.o \
-	$(OBJS)\monolib_gridcmn.o \
-	$(OBJS)\monolib_hyperlnkcmn.o \
-	$(OBJS)\monolib_odcombocmn.o \
-	$(OBJS)\monolib_richtooltipcmn.o \
-	$(OBJS)\monolib_aboutdlgg.o \
-	$(OBJS)\monolib_bannerwindow.o \
-	$(OBJS)\monolib_bmpcboxg.o \
-	$(OBJS)\monolib_calctrlg.o \
-	$(OBJS)\monolib_commandlinkbuttong.o \
-	$(OBJS)\monolib_datavgen.o \
+	$(OBJS)\monolib_helpext.o \
+	$(OBJS)\monolib_hyperlinkg.o \
+	$(OBJS)\monolib_laywin.o \
+	$(OBJS)\monolib_notifmsgg.o \
+	$(OBJS)\monolib_odcombo.o \
+	$(OBJS)\monolib_propdlg.o \
+	$(OBJS)\monolib_richtooltipg.o \
+	$(OBJS)\monolib_sashwin.o \
+	$(OBJS)\monolib_splash.o \
+	$(OBJS)\monolib_generic_timectrl.o \
+	$(OBJS)\monolib_tipdlg.o \
+	$(OBJS)\monolib_treelist.o \
+	$(OBJS)\monolib_wizard.o \
+	$(OBJS)\monolib_taskbarcmn.o \
+	$(OBJS)\monolib_aboutdlg.o \
+	$(OBJS)\monolib_notifmsg.o \
+	$(OBJS)\monolib_richtooltip.o \
+	$(OBJS)\monolib_sound.o \
+	$(OBJS)\monolib_taskbar.o \
+	$(OBJS)\monolib_joystick.o \
+	$(OBJS)\monolib_animateg.o \
+	$(OBJS)\monolib_bmpcbox.o \
+	$(OBJS)\monolib_calctrl.o \
+	$(OBJS)\monolib_commandlinkbutton.o \
+	$(OBJS)\monolib_datecontrols.o \
+	$(OBJS)\monolib_datectrl.o \
+	$(OBJS)\monolib_datetimectrl.o \
+	$(OBJS)\monolib_hyperlink.o \
+	$(OBJS)\monolib_msw_timectrl.o
+endif
+ifeq ($(WXUNIV),1)
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
+	$(OBJS)\monolib_animatecmn.o \
+	$(OBJS)\monolib_bmpcboxcmn.o \
+	$(OBJS)\monolib_calctrlcmn.o \
+	$(OBJS)\monolib_datavcmn.o \
+	$(OBJS)\monolib_gridcmn.o \
+	$(OBJS)\monolib_hyperlnkcmn.o \
+	$(OBJS)\monolib_odcombocmn.o \
+	$(OBJS)\monolib_richtooltipcmn.o \
+	$(OBJS)\monolib_aboutdlgg.o \
+	$(OBJS)\monolib_bannerwindow.o \
+	$(OBJS)\monolib_bmpcboxg.o \
+	$(OBJS)\monolib_calctrlg.o \
+	$(OBJS)\monolib_commandlinkbuttong.o \
+	$(OBJS)\monolib_datavgen.o \
 	$(OBJS)\monolib_datectlg.o \
 	$(OBJS)\monolib_editlbox.o \
 	$(OBJS)\monolib_grid.o \
 	$(OBJS)\monolib_gridctrl.o \
 	$(OBJS)\monolib_grideditors.o \
 	$(OBJS)\monolib_gridsel.o \
-	$(OBJS)\monolib_helpext.o \
-	$(OBJS)\monolib_hyperlinkg.o \
-	$(OBJS)\monolib_laywin.o \
-	$(OBJS)\monolib_notifmsgg.o \
-	$(OBJS)\monolib_odcombo.o \
-	$(OBJS)\monolib_propdlg.o \
-	$(OBJS)\monolib_generic_richtooltip.o \
-	$(OBJS)\monolib_sashwin.o \
-	$(OBJS)\monolib_splash.o \
-	$(OBJS)\monolib_generic_timectrl.o \
-	$(OBJS)\monolib_tipdlg.o \
-	$(OBJS)\monolib_treelist.o \
-	$(OBJS)\monolib_wizard.o \
-	$(OBJS)\monolib_taskbarcmn.o \
-	$(OBJS)\monolib_aboutdlg.o \
-	$(OBJS)\monolib_notifmsg.o \
-	$(OBJS)\monolib_msw_richtooltip.o \
-	$(OBJS)\monolib_sound.o \
-	$(OBJS)\monolib_taskbar.o \
-	$(OBJS)\monolib_joystick.o \
-	$(OBJS)\monolib_animateg.o
-endif
-ifeq ($(MONOLITHIC),0)
+	$(OBJS)\monolib_helpext.o \
+	$(OBJS)\monolib_hyperlinkg.o \
+	$(OBJS)\monolib_laywin.o \
+	$(OBJS)\monolib_notifmsgg.o \
+	$(OBJS)\monolib_odcombo.o \
+	$(OBJS)\monolib_propdlg.o \
+	$(OBJS)\monolib_richtooltipg.o \
+	$(OBJS)\monolib_sashwin.o \
+	$(OBJS)\monolib_splash.o \
+	$(OBJS)\monolib_generic_timectrl.o \
+	$(OBJS)\monolib_tipdlg.o \
+	$(OBJS)\monolib_treelist.o \
+	$(OBJS)\monolib_wizard.o \
+	$(OBJS)\monolib_taskbarcmn.o \
+	$(OBJS)\monolib_aboutdlg.o \
+	$(OBJS)\monolib_notifmsg.o \
+	$(OBJS)\monolib_richtooltip.o \
+	$(OBJS)\monolib_sound.o \
+	$(OBJS)\monolib_taskbar.o \
+	$(OBJS)\monolib_joystick.o \
+	$(OBJS)\monolib_animateg.o
+endif
+ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)
 __basedll___depname = \
 	$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll
@@ -3227,19 +3227,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontenum.o \
 	$(OBJS)\coredll_fontutil.o \
 	$(OBJS)\coredll_gdiimage.o \
-	$(OBJS)\coredll_gdiobj.o \
-	$(OBJS)\coredll_gdiplus.o \
-	$(OBJS)\coredll_graphics.o \
-	$(OBJS)\coredll_icon.o \
-	$(OBJS)\coredll_imaglist.o \
-	$(OBJS)\coredll_minifram.o \
-	$(OBJS)\coredll_nonownedwnd.o \
-	$(OBJS)\coredll_dataobj.o \
-	$(OBJS)\coredll_dropsrc.o \
-	$(OBJS)\coredll_droptgt.o \
-	$(OBJS)\coredll_oleutils.o \
-	$(OBJS)\coredll_palette.o \
-	$(OBJS)\coredll_pen.o \
+	$(OBJS)\coredll_gdiobj.o \
+	$(OBJS)\coredll_gdiplus.o \
+	$(OBJS)\coredll_graphics.o \
+	$(OBJS)\coredll_icon.o \
+	$(OBJS)\coredll_imaglist.o \
+	$(OBJS)\coredll_minifram.o \
+	$(OBJS)\coredll_nonownedwnd.o \
+	$(OBJS)\coredll_dataobj.o \
+	$(OBJS)\coredll_dropsrc.o \
+	$(OBJS)\coredll_droptgt.o \
+	$(OBJS)\coredll_oleutils.o \
+	$(OBJS)\coredll_palette.o \
+	$(OBJS)\coredll_pen.o \
 	$(OBJS)\coredll_popupwin.o \
 	$(OBJS)\coredll_printdlg.o \
 	$(OBJS)\coredll_printwin.o \
@@ -3501,19 +3501,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontenum.o \
 	$(OBJS)\coredll_fontutil.o \
 	$(OBJS)\coredll_gdiimage.o \
-	$(OBJS)\coredll_gdiobj.o \
-	$(OBJS)\coredll_gdiplus.o \
-	$(OBJS)\coredll_graphics.o \
-	$(OBJS)\coredll_icon.o \
-	$(OBJS)\coredll_imaglist.o \
-	$(OBJS)\coredll_minifram.o \
-	$(OBJS)\coredll_nonownedwnd.o \
-	$(OBJS)\coredll_dataobj.o \
-	$(OBJS)\coredll_dropsrc.o \
-	$(OBJS)\coredll_droptgt.o \
-	$(OBJS)\coredll_oleutils.o \
-	$(OBJS)\coredll_palette.o \
-	$(OBJS)\coredll_pen.o \
+	$(OBJS)\coredll_gdiobj.o \
+	$(OBJS)\coredll_gdiplus.o \
+	$(OBJS)\coredll_graphics.o \
+	$(OBJS)\coredll_icon.o \
+	$(OBJS)\coredll_imaglist.o \
+	$(OBJS)\coredll_minifram.o \
+	$(OBJS)\coredll_nonownedwnd.o \
+	$(OBJS)\coredll_dataobj.o \
+	$(OBJS)\coredll_dropsrc.o \
+	$(OBJS)\coredll_droptgt.o \
+	$(OBJS)\coredll_oleutils.o \
+	$(OBJS)\coredll_palette.o \
+	$(OBJS)\coredll_pen.o \
 	$(OBJS)\coredll_popupwin.o \
 	$(OBJS)\coredll_printdlg.o \
 	$(OBJS)\coredll_printwin.o \
@@ -3777,19 +3777,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontenum.o \
 	$(OBJS)\corelib_fontutil.o \
 	$(OBJS)\corelib_gdiimage.o \
-	$(OBJS)\corelib_gdiobj.o \
-	$(OBJS)\corelib_gdiplus.o \
-	$(OBJS)\corelib_graphics.o \
-	$(OBJS)\corelib_icon.o \
-	$(OBJS)\corelib_imaglist.o \
-	$(OBJS)\corelib_minifram.o \
-	$(OBJS)\corelib_nonownedwnd.o \
-	$(OBJS)\corelib_dataobj.o \
-	$(OBJS)\corelib_dropsrc.o \
-	$(OBJS)\corelib_droptgt.o \
-	$(OBJS)\corelib_oleutils.o \
-	$(OBJS)\corelib_palette.o \
-	$(OBJS)\corelib_pen.o \
+	$(OBJS)\corelib_gdiobj.o \
+	$(OBJS)\corelib_gdiplus.o \
+	$(OBJS)\corelib_graphics.o \
+	$(OBJS)\corelib_icon.o \
+	$(OBJS)\corelib_imaglist.o \
+	$(OBJS)\corelib_minifram.o \
+	$(OBJS)\corelib_nonownedwnd.o \
+	$(OBJS)\corelib_dataobj.o \
+	$(OBJS)\corelib_dropsrc.o \
+	$(OBJS)\corelib_droptgt.o \
+	$(OBJS)\corelib_oleutils.o \
+	$(OBJS)\corelib_palette.o \
+	$(OBJS)\corelib_pen.o \
 	$(OBJS)\corelib_popupwin.o \
 	$(OBJS)\corelib_printdlg.o \
 	$(OBJS)\corelib_printwin.o \
@@ -4051,19 +4051,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontenum.o \
 	$(OBJS)\corelib_fontutil.o \
 	$(OBJS)\corelib_gdiimage.o \
-	$(OBJS)\corelib_gdiobj.o \
-	$(OBJS)\corelib_gdiplus.o \
-	$(OBJS)\corelib_graphics.o \
-	$(OBJS)\corelib_icon.o \
-	$(OBJS)\corelib_imaglist.o \
-	$(OBJS)\corelib_minifram.o \
-	$(OBJS)\corelib_nonownedwnd.o \
-	$(OBJS)\corelib_dataobj.o \
-	$(OBJS)\corelib_dropsrc.o \
-	$(OBJS)\corelib_droptgt.o \
-	$(OBJS)\corelib_oleutils.o \
-	$(OBJS)\corelib_palette.o \
-	$(OBJS)\corelib_pen.o \
+	$(OBJS)\corelib_gdiobj.o \
+	$(OBJS)\corelib_gdiplus.o \
+	$(OBJS)\corelib_graphics.o \
+	$(OBJS)\corelib_icon.o \
+	$(OBJS)\corelib_imaglist.o \
+	$(OBJS)\corelib_minifram.o \
+	$(OBJS)\corelib_nonownedwnd.o \
+	$(OBJS)\corelib_dataobj.o \
+	$(OBJS)\corelib_dropsrc.o \
+	$(OBJS)\corelib_droptgt.o \
+	$(OBJS)\corelib_oleutils.o \
+	$(OBJS)\corelib_palette.o \
+	$(OBJS)\corelib_pen.o \
 	$(OBJS)\corelib_popupwin.o \
 	$(OBJS)\corelib_printdlg.o \
 	$(OBJS)\corelib_printwin.o \
@@ -4311,100 +4311,100 @@ endif
 ifeq ($(WXUNIV),0)
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_animatecmn.o \
-	$(OBJS)\advdll_bmpcboxcmn.o \
-	$(OBJS)\advdll_calctrlcmn.o \
-	$(OBJS)\advdll_datavcmn.o \
-	$(OBJS)\advdll_gridcmn.o \
-	$(OBJS)\advdll_hyperlnkcmn.o \
-	$(OBJS)\advdll_odcombocmn.o \
-	$(OBJS)\advdll_richtooltipcmn.o \
-	$(OBJS)\advdll_aboutdlgg.o \
-	$(OBJS)\advdll_bannerwindow.o \
-	$(OBJS)\advdll_bmpcboxg.o \
-	$(OBJS)\advdll_calctrlg.o \
-	$(OBJS)\advdll_commandlinkbuttong.o \
-	$(OBJS)\advdll_datavgen.o \
+	$(OBJS)\advdll_bmpcboxcmn.o \
+	$(OBJS)\advdll_calctrlcmn.o \
+	$(OBJS)\advdll_datavcmn.o \
+	$(OBJS)\advdll_gridcmn.o \
+	$(OBJS)\advdll_hyperlnkcmn.o \
+	$(OBJS)\advdll_odcombocmn.o \
+	$(OBJS)\advdll_richtooltipcmn.o \
+	$(OBJS)\advdll_aboutdlgg.o \
+	$(OBJS)\advdll_bannerwindow.o \
+	$(OBJS)\advdll_bmpcboxg.o \
+	$(OBJS)\advdll_calctrlg.o \
+	$(OBJS)\advdll_commandlinkbuttong.o \
+	$(OBJS)\advdll_datavgen.o \
 	$(OBJS)\advdll_datectlg.o \
 	$(OBJS)\advdll_editlbox.o \
 	$(OBJS)\advdll_grid.o \
 	$(OBJS)\advdll_gridctrl.o \
 	$(OBJS)\advdll_grideditors.o \
 	$(OBJS)\advdll_gridsel.o \
-	$(OBJS)\advdll_helpext.o \
-	$(OBJS)\advdll_hyperlinkg.o \
-	$(OBJS)\advdll_laywin.o \
-	$(OBJS)\advdll_notifmsgg.o \
-	$(OBJS)\advdll_odcombo.o \
-	$(OBJS)\advdll_propdlg.o \
-	$(OBJS)\advdll_generic_richtooltip.o \
-	$(OBJS)\advdll_sashwin.o \
-	$(OBJS)\advdll_splash.o \
-	$(OBJS)\advdll_generic_timectrl.o \
-	$(OBJS)\advdll_tipdlg.o \
-	$(OBJS)\advdll_treelist.o \
-	$(OBJS)\advdll_wizard.o \
-	$(OBJS)\advdll_taskbarcmn.o \
-	$(OBJS)\advdll_aboutdlg.o \
-	$(OBJS)\advdll_notifmsg.o \
-	$(OBJS)\advdll_msw_richtooltip.o \
-	$(OBJS)\advdll_sound.o \
-	$(OBJS)\advdll_taskbar.o \
-	$(OBJS)\advdll_joystick.o \
-	$(OBJS)\advdll_animateg.o \
-	$(OBJS)\advdll_bmpcbox.o \
-	$(OBJS)\advdll_calctrl.o \
-	$(OBJS)\advdll_commandlinkbutton.o \
-	$(OBJS)\advdll_datecontrols.o \
-	$(OBJS)\advdll_datectrl.o \
-	$(OBJS)\advdll_datetimectrl.o \
-	$(OBJS)\advdll_hyperlink.o \
-	$(OBJS)\advdll_msw_timectrl.o
-endif
-ifeq ($(WXUNIV),1)
-____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
-	$(OBJS)\advdll_animatecmn.o \
-	$(OBJS)\advdll_bmpcboxcmn.o \
-	$(OBJS)\advdll_calctrlcmn.o \
-	$(OBJS)\advdll_datavcmn.o \
-	$(OBJS)\advdll_gridcmn.o \
-	$(OBJS)\advdll_hyperlnkcmn.o \
-	$(OBJS)\advdll_odcombocmn.o \
-	$(OBJS)\advdll_richtooltipcmn.o \
-	$(OBJS)\advdll_aboutdlgg.o \
-	$(OBJS)\advdll_bannerwindow.o \
-	$(OBJS)\advdll_bmpcboxg.o \
-	$(OBJS)\advdll_calctrlg.o \
-	$(OBJS)\advdll_commandlinkbuttong.o \
-	$(OBJS)\advdll_datavgen.o \
+	$(OBJS)\advdll_helpext.o \
+	$(OBJS)\advdll_hyperlinkg.o \
+	$(OBJS)\advdll_laywin.o \
+	$(OBJS)\advdll_notifmsgg.o \
+	$(OBJS)\advdll_odcombo.o \
+	$(OBJS)\advdll_propdlg.o \
+	$(OBJS)\advdll_richtooltipg.o \
+	$(OBJS)\advdll_sashwin.o \
+	$(OBJS)\advdll_splash.o \
+	$(OBJS)\advdll_generic_timectrl.o \
+	$(OBJS)\advdll_tipdlg.o \
+	$(OBJS)\advdll_treelist.o \
+	$(OBJS)\advdll_wizard.o \
+	$(OBJS)\advdll_taskbarcmn.o \
+	$(OBJS)\advdll_aboutdlg.o \
+	$(OBJS)\advdll_notifmsg.o \
+	$(OBJS)\advdll_richtooltip.o \
+	$(OBJS)\advdll_sound.o \
+	$(OBJS)\advdll_taskbar.o \
+	$(OBJS)\advdll_joystick.o \
+	$(OBJS)\advdll_animateg.o \
+	$(OBJS)\advdll_bmpcbox.o \
+	$(OBJS)\advdll_calctrl.o \
+	$(OBJS)\advdll_commandlinkbutton.o \
+	$(OBJS)\advdll_datecontrols.o \
+	$(OBJS)\advdll_datectrl.o \
+	$(OBJS)\advdll_datetimectrl.o \
+	$(OBJS)\advdll_hyperlink.o \
+	$(OBJS)\advdll_msw_timectrl.o
+endif
+ifeq ($(WXUNIV),1)
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
+	$(OBJS)\advdll_animatecmn.o \
+	$(OBJS)\advdll_bmpcboxcmn.o \
+	$(OBJS)\advdll_calctrlcmn.o \
+	$(OBJS)\advdll_datavcmn.o \
+	$(OBJS)\advdll_gridcmn.o \
+	$(OBJS)\advdll_hyperlnkcmn.o \
+	$(OBJS)\advdll_odcombocmn.o \
+	$(OBJS)\advdll_richtooltipcmn.o \
+	$(OBJS)\advdll_aboutdlgg.o \
+	$(OBJS)\advdll_bannerwindow.o \
+	$(OBJS)\advdll_bmpcboxg.o \
+	$(OBJS)\advdll_calctrlg.o \
+	$(OBJS)\advdll_commandlinkbuttong.o \
+	$(OBJS)\advdll_datavgen.o \
 	$(OBJS)\advdll_datectlg.o \
 	$(OBJS)\advdll_editlbox.o \
 	$(OBJS)\advdll_grid.o \
 	$(OBJS)\advdll_gridctrl.o \
 	$(OBJS)\advdll_grideditors.o \
 	$(OBJS)\advdll_gridsel.o \
-	$(OBJS)\advdll_helpext.o \
-	$(OBJS)\advdll_hyperlinkg.o \
-	$(OBJS)\advdll_laywin.o \
-	$(OBJS)\advdll_notifmsgg.o \
-	$(OBJS)\advdll_odcombo.o \
-	$(OBJS)\advdll_propdlg.o \
-	$(OBJS)\advdll_generic_richtooltip.o \
-	$(OBJS)\advdll_sashwin.o \
-	$(OBJS)\advdll_splash.o \
-	$(OBJS)\advdll_generic_timectrl.o \
-	$(OBJS)\advdll_tipdlg.o \
-	$(OBJS)\advdll_treelist.o \
-	$(OBJS)\advdll_wizard.o \
-	$(OBJS)\advdll_taskbarcmn.o \
-	$(OBJS)\advdll_aboutdlg.o \
-	$(OBJS)\advdll_notifmsg.o \
-	$(OBJS)\advdll_msw_richtooltip.o \
-	$(OBJS)\advdll_sound.o \
-	$(OBJS)\advdll_taskbar.o \
-	$(OBJS)\advdll_joystick.o \
-	$(OBJS)\advdll_animateg.o
-endif
-ifeq ($(MONOLITHIC),0)
+	$(OBJS)\advdll_helpext.o \
+	$(OBJS)\advdll_hyperlinkg.o \
+	$(OBJS)\advdll_laywin.o \
+	$(OBJS)\advdll_notifmsgg.o \
+	$(OBJS)\advdll_odcombo.o \
+	$(OBJS)\advdll_propdlg.o \
+	$(OBJS)\advdll_richtooltipg.o \
+	$(OBJS)\advdll_sashwin.o \
+	$(OBJS)\advdll_splash.o \
+	$(OBJS)\advdll_generic_timectrl.o \
+	$(OBJS)\advdll_tipdlg.o \
+	$(OBJS)\advdll_treelist.o \
+	$(OBJS)\advdll_wizard.o \
+	$(OBJS)\advdll_taskbarcmn.o \
+	$(OBJS)\advdll_aboutdlg.o \
+	$(OBJS)\advdll_notifmsg.o \
+	$(OBJS)\advdll_richtooltip.o \
+	$(OBJS)\advdll_sound.o \
+	$(OBJS)\advdll_taskbar.o \
+	$(OBJS)\advdll_joystick.o \
+	$(OBJS)\advdll_animateg.o
+endif
+ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),0)
 ifeq ($(USE_GUI),1)
 __advlib___depname = \
@@ -4415,100 +4415,100 @@ endif
 ifeq ($(WXUNIV),0)
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_animatecmn.o \
-	$(OBJS)\advlib_bmpcboxcmn.o \
-	$(OBJS)\advlib_calctrlcmn.o \
-	$(OBJS)\advlib_datavcmn.o \
-	$(OBJS)\advlib_gridcmn.o \
-	$(OBJS)\advlib_hyperlnkcmn.o \
-	$(OBJS)\advlib_odcombocmn.o \
-	$(OBJS)\advlib_richtooltipcmn.o \
-	$(OBJS)\advlib_aboutdlgg.o \
-	$(OBJS)\advlib_bannerwindow.o \
-	$(OBJS)\advlib_bmpcboxg.o \
-	$(OBJS)\advlib_calctrlg.o \
-	$(OBJS)\advlib_commandlinkbuttong.o \
-	$(OBJS)\advlib_datavgen.o \
+	$(OBJS)\advlib_bmpcboxcmn.o \
+	$(OBJS)\advlib_calctrlcmn.o \
+	$(OBJS)\advlib_datavcmn.o \
+	$(OBJS)\advlib_gridcmn.o \
+	$(OBJS)\advlib_hyperlnkcmn.o \
+	$(OBJS)\advlib_odcombocmn.o \
+	$(OBJS)\advlib_richtooltipcmn.o \
+	$(OBJS)\advlib_aboutdlgg.o \
+	$(OBJS)\advlib_bannerwindow.o \
+	$(OBJS)\advlib_bmpcboxg.o \
+	$(OBJS)\advlib_calctrlg.o \
+	$(OBJS)\advlib_commandlinkbuttong.o \
+	$(OBJS)\advlib_datavgen.o \
 	$(OBJS)\advlib_datectlg.o \
 	$(OBJS)\advlib_editlbox.o \
 	$(OBJS)\advlib_grid.o \
 	$(OBJS)\advlib_gridctrl.o \
 	$(OBJS)\advlib_grideditors.o \
 	$(OBJS)\advlib_gridsel.o \
-	$(OBJS)\advlib_helpext.o \
-	$(OBJS)\advlib_hyperlinkg.o \
-	$(OBJS)\advlib_laywin.o \
-	$(OBJS)\advlib_notifmsgg.o \
-	$(OBJS)\advlib_odcombo.o \
-	$(OBJS)\advlib_propdlg.o \
-	$(OBJS)\advlib_generic_richtooltip.o \
-	$(OBJS)\advlib_sashwin.o \
-	$(OBJS)\advlib_splash.o \
-	$(OBJS)\advlib_generic_timectrl.o \
-	$(OBJS)\advlib_tipdlg.o \
-	$(OBJS)\advlib_treelist.o \
-	$(OBJS)\advlib_wizard.o \
-	$(OBJS)\advlib_taskbarcmn.o \
-	$(OBJS)\advlib_aboutdlg.o \
-	$(OBJS)\advlib_notifmsg.o \
-	$(OBJS)\advlib_msw_richtooltip.o \
-	$(OBJS)\advlib_sound.o \
-	$(OBJS)\advlib_taskbar.o \
-	$(OBJS)\advlib_joystick.o \
-	$(OBJS)\advlib_animateg.o \
-	$(OBJS)\advlib_bmpcbox.o \
-	$(OBJS)\advlib_calctrl.o \
-	$(OBJS)\advlib_commandlinkbutton.o \
-	$(OBJS)\advlib_datecontrols.o \
-	$(OBJS)\advlib_datectrl.o \
-	$(OBJS)\advlib_datetimectrl.o \
-	$(OBJS)\advlib_hyperlink.o \
-	$(OBJS)\advlib_msw_timectrl.o
-endif
-ifeq ($(WXUNIV),1)
-____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
-	$(OBJS)\advlib_animatecmn.o \
-	$(OBJS)\advlib_bmpcboxcmn.o \
-	$(OBJS)\advlib_calctrlcmn.o \
-	$(OBJS)\advlib_datavcmn.o \
-	$(OBJS)\advlib_gridcmn.o \
-	$(OBJS)\advlib_hyperlnkcmn.o \
-	$(OBJS)\advlib_odcombocmn.o \
-	$(OBJS)\advlib_richtooltipcmn.o \
-	$(OBJS)\advlib_aboutdlgg.o \
-	$(OBJS)\advlib_bannerwindow.o \
-	$(OBJS)\advlib_bmpcboxg.o \
-	$(OBJS)\advlib_calctrlg.o \
-	$(OBJS)\advlib_commandlinkbuttong.o \
-	$(OBJS)\advlib_datavgen.o \
+	$(OBJS)\advlib_helpext.o \
+	$(OBJS)\advlib_hyperlinkg.o \
+	$(OBJS)\advlib_laywin.o \
+	$(OBJS)\advlib_notifmsgg.o \
+	$(OBJS)\advlib_odcombo.o \
+	$(OBJS)\advlib_propdlg.o \
+	$(OBJS)\advlib_richtooltipg.o \
+	$(OBJS)\advlib_sashwin.o \
+	$(OBJS)\advlib_splash.o \
+	$(OBJS)\advlib_generic_timectrl.o \
+	$(OBJS)\advlib_tipdlg.o \
+	$(OBJS)\advlib_treelist.o \
+	$(OBJS)\advlib_wizard.o \
+	$(OBJS)\advlib_taskbarcmn.o \
+	$(OBJS)\advlib_aboutdlg.o \
+	$(OBJS)\advlib_notifmsg.o \
+	$(OBJS)\advlib_richtooltip.o \
+	$(OBJS)\advlib_sound.o \
+	$(OBJS)\advlib_taskbar.o \
+	$(OBJS)\advlib_joystick.o \
+	$(OBJS)\advlib_animateg.o \
+	$(OBJS)\advlib_bmpcbox.o \
+	$(OBJS)\advlib_calctrl.o \
+	$(OBJS)\advlib_commandlinkbutton.o \
+	$(OBJS)\advlib_datecontrols.o \
+	$(OBJS)\advlib_datectrl.o \
+	$(OBJS)\advlib_datetimectrl.o \
+	$(OBJS)\advlib_hyperlink.o \
+	$(OBJS)\advlib_msw_timectrl.o
+endif
+ifeq ($(WXUNIV),1)
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
+	$(OBJS)\advlib_animatecmn.o \
+	$(OBJS)\advlib_bmpcboxcmn.o \
+	$(OBJS)\advlib_calctrlcmn.o \
+	$(OBJS)\advlib_datavcmn.o \
+	$(OBJS)\advlib_gridcmn.o \
+	$(OBJS)\advlib_hyperlnkcmn.o \
+	$(OBJS)\advlib_odcombocmn.o \
+	$(OBJS)\advlib_richtooltipcmn.o \
+	$(OBJS)\advlib_aboutdlgg.o \
+	$(OBJS)\advlib_bannerwindow.o \
+	$(OBJS)\advlib_bmpcboxg.o \
+	$(OBJS)\advlib_calctrlg.o \
+	$(OBJS)\advlib_commandlinkbuttong.o \
+	$(OBJS)\advlib_datavgen.o \
 	$(OBJS)\advlib_datectlg.o \
 	$(OBJS)\advlib_editlbox.o \
 	$(OBJS)\advlib_grid.o \
 	$(OBJS)\advlib_gridctrl.o \
 	$(OBJS)\advlib_grideditors.o \
 	$(OBJS)\advlib_gridsel.o \
-	$(OBJS)\advlib_helpext.o \
-	$(OBJS)\advlib_hyperlinkg.o \
-	$(OBJS)\advlib_laywin.o \
-	$(OBJS)\advlib_notifmsgg.o \
-	$(OBJS)\advlib_odcombo.o \
-	$(OBJS)\advlib_propdlg.o \
-	$(OBJS)\advlib_generic_richtooltip.o \
-	$(OBJS)\advlib_sashwin.o \
-	$(OBJS)\advlib_splash.o \
-	$(OBJS)\advlib_generic_timectrl.o \
-	$(OBJS)\advlib_tipdlg.o \
-	$(OBJS)\advlib_treelist.o \
-	$(OBJS)\advlib_wizard.o \
-	$(OBJS)\advlib_taskbarcmn.o \
-	$(OBJS)\advlib_aboutdlg.o \
-	$(OBJS)\advlib_notifmsg.o \
-	$(OBJS)\advlib_msw_richtooltip.o \
-	$(OBJS)\advlib_sound.o \
-	$(OBJS)\advlib_taskbar.o \
-	$(OBJS)\advlib_joystick.o \
-	$(OBJS)\advlib_animateg.o
-endif
-ifeq ($(SHARED),1)
+	$(OBJS)\advlib_helpext.o \
+	$(OBJS)\advlib_hyperlinkg.o \
+	$(OBJS)\advlib_laywin.o \
+	$(OBJS)\advlib_notifmsgg.o \
+	$(OBJS)\advlib_odcombo.o \
+	$(OBJS)\advlib_propdlg.o \
+	$(OBJS)\advlib_richtooltipg.o \
+	$(OBJS)\advlib_sashwin.o \
+	$(OBJS)\advlib_splash.o \
+	$(OBJS)\advlib_generic_timectrl.o \
+	$(OBJS)\advlib_tipdlg.o \
+	$(OBJS)\advlib_treelist.o \
+	$(OBJS)\advlib_wizard.o \
+	$(OBJS)\advlib_taskbarcmn.o \
+	$(OBJS)\advlib_aboutdlg.o \
+	$(OBJS)\advlib_notifmsg.o \
+	$(OBJS)\advlib_richtooltip.o \
+	$(OBJS)\advlib_sound.o \
+	$(OBJS)\advlib_taskbar.o \
+	$(OBJS)\advlib_joystick.o \
+	$(OBJS)\advlib_animateg.o
+endif
+ifeq ($(SHARED),1)
 ____wxadv_namedll_DEP = $(__advdll___depname)
 endif
 ifeq ($(SHARED),0)
@@ -6418,9 +6418,9 @@ $(OBJS)\monodll_textbuf.o: ../../src/common/textbuf.cpp
 $(OBJS)\monodll_textfile.o: ../../src/common/textfile.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monodll_time.o: ../../src/common/time.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\monodll_time.o: ../../src/common/time.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_timercmn.o: ../../src/common/timercmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -6907,27 +6907,27 @@ $(OBJS)\monodll_calctrl.o: ../../src/msw/calctrl.cpp
 $(OBJS)\monodll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monodll_datecontrols.o: ../../src/msw/datecontrols.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monodll_datectrl.o: ../../src/msw/datectrl.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monodll_datetimectrl.o: ../../src/msw/datetimectrl.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monodll_hyperlink.o: ../../src/msw/hyperlink.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monodll_msw_timectrl.o: ../../src/msw/timectrl.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monodll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monodll_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\monodll_datecontrols.o: ../../src/msw/datecontrols.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_datectrl.o: ../../src/msw/datectrl.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_datetimectrl.o: ../../src/msw/datetimectrl.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_hyperlink.o: ../../src/msw/hyperlink.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_msw_timectrl.o: ../../src/msw/timectrl.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -7186,21 +7186,21 @@ $(OBJS)\monodll_xh_stlin.o: ../../src/xrc/xh_stlin.cpp
 $(OBJS)\monodll_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monodll_xh_text.o: ../../src/xrc/xh_text.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monodll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monodll_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monodll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monodll_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\monodll_xh_text.o: ../../src/xrc/xh_text.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_xh_tree.o: ../../src/xrc/xh_tree.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -7474,23 +7474,23 @@ $(OBJS)\monodll_imaglist.o: ../../src/msw/imaglist.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_minifram.o: ../../src/msw/minifram.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_dataobj.o: ../../src/msw/ole/dataobj.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_dropsrc.o: ../../src/msw/ole/dropsrc.cpp
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_minifram.o: ../../src/msw/minifram.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_dataobj.o: ../../src/msw/ole/dataobj.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_dropsrc.o: ../../src/msw/ole/dropsrc.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
@@ -8444,23 +8444,23 @@ $(OBJS)\monodll_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_odcombocmn.o: ../../src/common/odcombocmn.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_bannerwindow.o: ../../src/generic/bannerwindow.cpp
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_odcombocmn.o: ../../src/common/odcombocmn.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_bannerwindow.o: ../../src/generic/bannerwindow.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
@@ -8539,38 +8539,38 @@ $(OBJS)\monodll_odcombo.o: ../../src/generic/odcombo.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_propdlg.o: ../../src/generic/propdlg.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_generic_richtooltip.o: ../../src/generic/richtooltip.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_sashwin.o: ../../src/generic/sashwin.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_splash.o: ../../src/generic/splash.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_generic_timectrl.o: ../../src/generic/timectrl.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_tipdlg.o: ../../src/generic/tipdlg.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_treelist.o: ../../src/generic/treelist.cpp
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_propdlg.o: ../../src/generic/propdlg.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_richtooltipg.o: ../../src/generic/richtooltipg.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_sashwin.o: ../../src/generic/sashwin.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_splash.o: ../../src/generic/splash.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_generic_timectrl.o: ../../src/generic/timectrl.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_tipdlg.o: ../../src/generic/tipdlg.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_treelist.o: ../../src/generic/treelist.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
@@ -8589,23 +8589,23 @@ $(OBJS)\monodll_aboutdlg.o: ../../src/msw/aboutdlg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_notifmsg.o: ../../src/msw/notifmsg.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_msw_richtooltip.o: ../../src/msw/richtooltip.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_sound.o: ../../src/msw/sound.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_taskbar.o: ../../src/msw/taskbar.cpp
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_notifmsg.o: ../../src/msw/notifmsg.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_richtooltip.o: ../../src/msw/richtooltip.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_sound.o: ../../src/msw/sound.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_taskbar.o: ../../src/msw/taskbar.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
@@ -8823,9 +8823,9 @@ $(OBJS)\monolib_textbuf.o: ../../src/common/textbuf.cpp
 $(OBJS)\monolib_textfile.o: ../../src/common/textfile.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monolib_time.o: ../../src/common/time.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\monolib_time.o: ../../src/common/time.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_timercmn.o: ../../src/common/timercmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -9312,27 +9312,27 @@ $(OBJS)\monolib_calctrl.o: ../../src/msw/calctrl.cpp
 $(OBJS)\monolib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monolib_datecontrols.o: ../../src/msw/datecontrols.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monolib_datectrl.o: ../../src/msw/datectrl.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monolib_datetimectrl.o: ../../src/msw/datetimectrl.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monolib_hyperlink.o: ../../src/msw/hyperlink.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monolib_msw_timectrl.o: ../../src/msw/timectrl.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monolib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monolib_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\monolib_datecontrols.o: ../../src/msw/datecontrols.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_datectrl.o: ../../src/msw/datectrl.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_datetimectrl.o: ../../src/msw/datetimectrl.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_hyperlink.o: ../../src/msw/hyperlink.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_msw_timectrl.o: ../../src/msw/timectrl.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -9591,21 +9591,21 @@ $(OBJS)\monolib_xh_stlin.o: ../../src/xrc/xh_stlin.cpp
 $(OBJS)\monolib_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\monolib_xh_text.o: ../../src/xrc/xh_text.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monolib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monolib_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monolib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\monolib_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\monolib_xh_text.o: ../../src/xrc/xh_text.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_xh_tree.o: ../../src/xrc/xh_tree.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -9879,23 +9879,23 @@ $(OBJS)\monolib_imaglist.o: ../../src/msw/imaglist.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_minifram.o: ../../src/msw/minifram.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_dataobj.o: ../../src/msw/ole/dataobj.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_dropsrc.o: ../../src/msw/ole/dropsrc.cpp
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_minifram.o: ../../src/msw/minifram.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_dataobj.o: ../../src/msw/ole/dataobj.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_dropsrc.o: ../../src/msw/ole/dropsrc.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
@@ -10849,23 +10849,23 @@ $(OBJS)\monolib_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_odcombocmn.o: ../../src/common/odcombocmn.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_bannerwindow.o: ../../src/generic/bannerwindow.cpp
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_odcombocmn.o: ../../src/common/odcombocmn.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_bannerwindow.o: ../../src/generic/bannerwindow.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
@@ -10944,38 +10944,38 @@ $(OBJS)\monolib_odcombo.o: ../../src/generic/odcombo.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_propdlg.o: ../../src/generic/propdlg.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_generic_richtooltip.o: ../../src/generic/richtooltip.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_sashwin.o: ../../src/generic/sashwin.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_splash.o: ../../src/generic/splash.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_generic_timectrl.o: ../../src/generic/timectrl.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_tipdlg.o: ../../src/generic/tipdlg.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_treelist.o: ../../src/generic/treelist.cpp
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_propdlg.o: ../../src/generic/propdlg.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_richtooltipg.o: ../../src/generic/richtooltipg.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_sashwin.o: ../../src/generic/sashwin.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_splash.o: ../../src/generic/splash.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_generic_timectrl.o: ../../src/generic/timectrl.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_tipdlg.o: ../../src/generic/tipdlg.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_treelist.o: ../../src/generic/treelist.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
@@ -10994,23 +10994,23 @@ $(OBJS)\monolib_aboutdlg.o: ../../src/msw/aboutdlg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_notifmsg.o: ../../src/msw/notifmsg.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_msw_richtooltip.o: ../../src/msw/richtooltip.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_sound.o: ../../src/msw/sound.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_taskbar.o: ../../src/msw/taskbar.cpp
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_notifmsg.o: ../../src/msw/notifmsg.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_richtooltip.o: ../../src/msw/richtooltip.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_sound.o: ../../src/msw/sound.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_taskbar.o: ../../src/msw/taskbar.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
@@ -11228,9 +11228,9 @@ $(OBJS)\basedll_textbuf.o: ../../src/common/textbuf.cpp
 $(OBJS)\basedll_textfile.o: ../../src/common/textfile.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\basedll_time.o: ../../src/common/time.cpp
-	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\basedll_time.o: ../../src/common/time.cpp
+	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\basedll_timercmn.o: ../../src/common/timercmn.cpp
 	$(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -11567,9 +11567,9 @@ $(OBJS)\baselib_textbuf.o: ../../src/common/textbuf.cpp
 $(OBJS)\baselib_textfile.o: ../../src/common/textfile.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\baselib_time.o: ../../src/common/time.cpp
-	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\baselib_time.o: ../../src/common/time.cpp
+	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\baselib_timercmn.o: ../../src/common/timercmn.cpp
 	$(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -12257,23 +12257,23 @@ $(OBJS)\coredll_imaglist.o: ../../src/msw/imaglist.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_minifram.o: ../../src/msw/minifram.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_dataobj.o: ../../src/msw/ole/dataobj.cpp
-	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_dropsrc.o: ../../src/msw/ole/dropsrc.cpp
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_minifram.o: ../../src/msw/minifram.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_dataobj.o: ../../src/msw/ole/dataobj.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_dropsrc.o: ../../src/msw/ole/dropsrc.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
@@ -13665,23 +13665,23 @@ $(OBJS)\corelib_imaglist.o: ../../src/msw/imaglist.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_minifram.o: ../../src/msw/minifram.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_dataobj.o: ../../src/msw/ole/dataobj.cpp
-	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_dropsrc.o: ../../src/msw/ole/dropsrc.cpp
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_minifram.o: ../../src/msw/minifram.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_dataobj.o: ../../src/msw/ole/dataobj.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_dropsrc.o: ../../src/msw/ole/dropsrc.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
@@ -14620,27 +14620,27 @@ $(OBJS)\advdll_calctrl.o: ../../src/msw/calctrl.cpp
 $(OBJS)\advdll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advdll_datecontrols.o: ../../src/msw/datecontrols.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_datetimectrl.o: ../../src/msw/datetimectrl.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_hyperlink.o: ../../src/msw/hyperlink.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_msw_timectrl.o: ../../src/msw/timectrl.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_animatecmn.o: ../../src/common/animatecmn.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\advdll_datecontrols.o: ../../src/msw/datecontrols.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_datetimectrl.o: ../../src/msw/datetimectrl.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_hyperlink.o: ../../src/msw/hyperlink.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_msw_timectrl.o: ../../src/msw/timectrl.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_animatecmn.o: ../../src/common/animatecmn.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advdll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -14650,21 +14650,21 @@ $(OBJS)\advdll_datavcmn.o: ../../src/common/datavcmn.cpp
 $(OBJS)\advdll_gridcmn.o: ../../src/common/gridcmn.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advdll_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_odcombocmn.o: ../../src/common/odcombocmn.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_bannerwindow.o: ../../src/generic/bannerwindow.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\advdll_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_odcombocmn.o: ../../src/common/odcombocmn.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_bannerwindow.o: ../../src/generic/bannerwindow.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advdll_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -14707,51 +14707,51 @@ $(OBJS)\advdll_laywin.o: ../../src/generic/laywin.cpp
 $(OBJS)\advdll_notifmsgg.o: ../../src/generic/notifmsgg.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advdll_odcombo.o: ../../src/generic/odcombo.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_propdlg.o: ../../src/generic/propdlg.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_generic_richtooltip.o: ../../src/generic/richtooltip.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_sashwin.o: ../../src/generic/sashwin.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_splash.o: ../../src/generic/splash.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_generic_timectrl.o: ../../src/generic/timectrl.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_tipdlg.o: ../../src/generic/tipdlg.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_treelist.o: ../../src/generic/treelist.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\advdll_odcombo.o: ../../src/generic/odcombo.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_propdlg.o: ../../src/generic/propdlg.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_richtooltipg.o: ../../src/generic/richtooltipg.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_sashwin.o: ../../src/generic/sashwin.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_splash.o: ../../src/generic/splash.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_generic_timectrl.o: ../../src/generic/timectrl.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_tipdlg.o: ../../src/generic/tipdlg.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_treelist.o: ../../src/generic/treelist.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advdll_wizard.o: ../../src/generic/wizard.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\advdll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advdll_aboutdlg.o: ../../src/msw/aboutdlg.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_notifmsg.o: ../../src/msw/notifmsg.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_msw_richtooltip.o: ../../src/msw/richtooltip.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_sound.o: ../../src/msw/sound.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advdll_taskbar.o: ../../src/msw/taskbar.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\advdll_aboutdlg.o: ../../src/msw/aboutdlg.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_notifmsg.o: ../../src/msw/notifmsg.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_richtooltip.o: ../../src/msw/richtooltip.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_sound.o: ../../src/msw/sound.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_taskbar.o: ../../src/msw/taskbar.cpp
+	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advdll_joystick.o: ../../src/msw/joystick.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -14770,27 +14770,27 @@ $(OBJS)\advlib_calctrl.o: ../../src/msw/calctrl.cpp
 $(OBJS)\advlib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advlib_datecontrols.o: ../../src/msw/datecontrols.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_datectrl.o: ../../src/msw/datectrl.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_datetimectrl.o: ../../src/msw/datetimectrl.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_hyperlink.o: ../../src/msw/hyperlink.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_msw_timectrl.o: ../../src/msw/timectrl.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_animatecmn.o: ../../src/common/animatecmn.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\advlib_datecontrols.o: ../../src/msw/datecontrols.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_datectrl.o: ../../src/msw/datectrl.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_datetimectrl.o: ../../src/msw/datetimectrl.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_hyperlink.o: ../../src/msw/hyperlink.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_msw_timectrl.o: ../../src/msw/timectrl.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_animatecmn.o: ../../src/common/animatecmn.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advlib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -14800,21 +14800,21 @@ $(OBJS)\advlib_datavcmn.o: ../../src/common/datavcmn.cpp
 $(OBJS)\advlib_gridcmn.o: ../../src/common/gridcmn.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advlib_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_odcombocmn.o: ../../src/common/odcombocmn.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_bannerwindow.o: ../../src/generic/bannerwindow.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\advlib_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_odcombocmn.o: ../../src/common/odcombocmn.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_bannerwindow.o: ../../src/generic/bannerwindow.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advlib_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -14857,51 +14857,51 @@ $(OBJS)\advlib_laywin.o: ../../src/generic/laywin.cpp
 $(OBJS)\advlib_notifmsgg.o: ../../src/generic/notifmsgg.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advlib_odcombo.o: ../../src/generic/odcombo.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_propdlg.o: ../../src/generic/propdlg.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_generic_richtooltip.o: ../../src/generic/richtooltip.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_sashwin.o: ../../src/generic/sashwin.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_splash.o: ../../src/generic/splash.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_generic_timectrl.o: ../../src/generic/timectrl.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_tipdlg.o: ../../src/generic/tipdlg.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_treelist.o: ../../src/generic/treelist.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\advlib_odcombo.o: ../../src/generic/odcombo.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_propdlg.o: ../../src/generic/propdlg.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_richtooltipg.o: ../../src/generic/richtooltipg.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_sashwin.o: ../../src/generic/sashwin.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_splash.o: ../../src/generic/splash.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_generic_timectrl.o: ../../src/generic/timectrl.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_tipdlg.o: ../../src/generic/tipdlg.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_treelist.o: ../../src/generic/treelist.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advlib_wizard.o: ../../src/generic/wizard.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\advlib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advlib_aboutdlg.o: ../../src/msw/aboutdlg.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_notifmsg.o: ../../src/msw/notifmsg.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_msw_richtooltip.o: ../../src/msw/richtooltip.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_sound.o: ../../src/msw/sound.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\advlib_taskbar.o: ../../src/msw/taskbar.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\advlib_aboutdlg.o: ../../src/msw/aboutdlg.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_notifmsg.o: ../../src/msw/notifmsg.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_richtooltip.o: ../../src/msw/richtooltip.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_sound.o: ../../src/msw/sound.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_taskbar.o: ../../src/msw/taskbar.cpp
+	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advlib_joystick.o: ../../src/msw/joystick.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -15340,21 +15340,21 @@ $(OBJS)\xrcdll_xh_stlin.o: ../../src/xrc/xh_stlin.cpp
 $(OBJS)\xrcdll_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp
 	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\xrcdll_xh_text.o: ../../src/xrc/xh_text.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\xrcdll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\xrcdll_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\xrcdll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\xrcdll_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\xrcdll_xh_text.o: ../../src/xrc/xh_text.cpp
+	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\xrcdll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp
+	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\xrcdll_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp
+	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\xrcdll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp
+	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\xrcdll_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp
+	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\xrcdll_xh_tree.o: ../../src/xrc/xh_tree.cpp
 	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -15538,21 +15538,21 @@ $(OBJS)\xrclib_xh_stlin.o: ../../src/xrc/xh_stlin.cpp
 $(OBJS)\xrclib_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\xrclib_xh_text.o: ../../src/xrc/xh_text.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\xrclib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\xrclib_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\xrclib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\xrclib_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\xrclib_xh_text.o: ../../src/xrc/xh_text.cpp
+	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\xrclib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp
+	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\xrclib_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp
+	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\xrclib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp
+	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\xrclib_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp
+	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\xrclib_xh_tree.o: ../../src/xrc/xh_tree.cpp
 	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 748e1e1eeb..f64c8fddc9 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -393,7 +393,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_tarstrm.obj \
 	$(OBJS)\monodll_textbuf.obj \
 	$(OBJS)\monodll_textfile.obj \
-	$(OBJS)\monodll_time.obj \
+	$(OBJS)\monodll_time.obj \
 	$(OBJS)\monodll_timercmn.obj \
 	$(OBJS)\monodll_timerimpl.obj \
 	$(OBJS)\monodll_tokenzr.obj \
@@ -549,7 +549,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_tarstrm.obj \
 	$(OBJS)\monolib_textbuf.obj \
 	$(OBJS)\monolib_textfile.obj \
-	$(OBJS)\monolib_time.obj \
+	$(OBJS)\monolib_time.obj \
 	$(OBJS)\monolib_timercmn.obj \
 	$(OBJS)\monolib_timerimpl.obj \
 	$(OBJS)\monolib_tokenzr.obj \
@@ -701,7 +701,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_tarstrm.obj \
 	$(OBJS)\basedll_textbuf.obj \
 	$(OBJS)\basedll_textfile.obj \
-	$(OBJS)\basedll_time.obj \
+	$(OBJS)\basedll_time.obj \
 	$(OBJS)\basedll_timercmn.obj \
 	$(OBJS)\basedll_timerimpl.obj \
 	$(OBJS)\basedll_tokenzr.obj \
@@ -839,7 +839,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_tarstrm.obj \
 	$(OBJS)\baselib_textbuf.obj \
 	$(OBJS)\baselib_textfile.obj \
-	$(OBJS)\baselib_time.obj \
+	$(OBJS)\baselib_time.obj \
 	$(OBJS)\baselib_timercmn.obj \
 	$(OBJS)\baselib_timerimpl.obj \
 	$(OBJS)\baselib_tokenzr.obj \
@@ -1298,19 +1298,19 @@ XRCDLL_OBJECTS =  \
 	$(OBJS)\xrcdll_xh_split.obj \
 	$(OBJS)\xrcdll_xh_srchctrl.obj \
 	$(OBJS)\xrcdll_xh_statbar.obj \
-	$(OBJS)\xrcdll_xh_stbmp.obj \
-	$(OBJS)\xrcdll_xh_stbox.obj \
-	$(OBJS)\xrcdll_xh_stlin.obj \
-	$(OBJS)\xrcdll_xh_sttxt.obj \
-	$(OBJS)\xrcdll_xh_text.obj \
-	$(OBJS)\xrcdll_xh_tglbtn.obj \
-	$(OBJS)\xrcdll_xh_timectrl.obj \
-	$(OBJS)\xrcdll_xh_toolb.obj \
-	$(OBJS)\xrcdll_xh_toolbk.obj \
-	$(OBJS)\xrcdll_xh_tree.obj \
-	$(OBJS)\xrcdll_xh_treebk.obj \
-	$(OBJS)\xrcdll_xh_unkwn.obj \
-	$(OBJS)\xrcdll_xh_wizrd.obj \
+	$(OBJS)\xrcdll_xh_stbmp.obj \
+	$(OBJS)\xrcdll_xh_stbox.obj \
+	$(OBJS)\xrcdll_xh_stlin.obj \
+	$(OBJS)\xrcdll_xh_sttxt.obj \
+	$(OBJS)\xrcdll_xh_text.obj \
+	$(OBJS)\xrcdll_xh_tglbtn.obj \
+	$(OBJS)\xrcdll_xh_timectrl.obj \
+	$(OBJS)\xrcdll_xh_toolb.obj \
+	$(OBJS)\xrcdll_xh_toolbk.obj \
+	$(OBJS)\xrcdll_xh_tree.obj \
+	$(OBJS)\xrcdll_xh_treebk.obj \
+	$(OBJS)\xrcdll_xh_unkwn.obj \
+	$(OBJS)\xrcdll_xh_wizrd.obj \
 	$(OBJS)\xrcdll_xmlres.obj \
 	$(OBJS)\xrcdll_xmladv.obj \
 	$(OBJS)\xrcdll_xmlrsall.obj
@@ -1378,19 +1378,19 @@ XRCLIB_OBJECTS =  \
 	$(OBJS)\xrclib_xh_split.obj \
 	$(OBJS)\xrclib_xh_srchctrl.obj \
 	$(OBJS)\xrclib_xh_statbar.obj \
-	$(OBJS)\xrclib_xh_stbmp.obj \
-	$(OBJS)\xrclib_xh_stbox.obj \
-	$(OBJS)\xrclib_xh_stlin.obj \
-	$(OBJS)\xrclib_xh_sttxt.obj \
-	$(OBJS)\xrclib_xh_text.obj \
-	$(OBJS)\xrclib_xh_tglbtn.obj \
-	$(OBJS)\xrclib_xh_timectrl.obj \
-	$(OBJS)\xrclib_xh_toolb.obj \
-	$(OBJS)\xrclib_xh_toolbk.obj \
-	$(OBJS)\xrclib_xh_tree.obj \
-	$(OBJS)\xrclib_xh_treebk.obj \
-	$(OBJS)\xrclib_xh_unkwn.obj \
-	$(OBJS)\xrclib_xh_wizrd.obj \
+	$(OBJS)\xrclib_xh_stbmp.obj \
+	$(OBJS)\xrclib_xh_stbox.obj \
+	$(OBJS)\xrclib_xh_stlin.obj \
+	$(OBJS)\xrclib_xh_sttxt.obj \
+	$(OBJS)\xrclib_xh_text.obj \
+	$(OBJS)\xrclib_xh_tglbtn.obj \
+	$(OBJS)\xrclib_xh_timectrl.obj \
+	$(OBJS)\xrclib_xh_toolb.obj \
+	$(OBJS)\xrclib_xh_toolbk.obj \
+	$(OBJS)\xrclib_xh_tree.obj \
+	$(OBJS)\xrclib_xh_treebk.obj \
+	$(OBJS)\xrclib_xh_unkwn.obj \
+	$(OBJS)\xrclib_xh_wizrd.obj \
 	$(OBJS)\xrclib_xmlres.obj \
 	$(OBJS)\xrclib_xmladv.obj \
 	$(OBJS)\xrclib_xmlrsall.obj
@@ -1880,19 +1880,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_xh_split.obj \
 	$(OBJS)\monodll_xh_srchctrl.obj \
 	$(OBJS)\monodll_xh_statbar.obj \
-	$(OBJS)\monodll_xh_stbmp.obj \
-	$(OBJS)\monodll_xh_stbox.obj \
-	$(OBJS)\monodll_xh_stlin.obj \
-	$(OBJS)\monodll_xh_sttxt.obj \
-	$(OBJS)\monodll_xh_text.obj \
-	$(OBJS)\monodll_xh_tglbtn.obj \
-	$(OBJS)\monodll_xh_timectrl.obj \
-	$(OBJS)\monodll_xh_toolb.obj \
-	$(OBJS)\monodll_xh_toolbk.obj \
-	$(OBJS)\monodll_xh_tree.obj \
-	$(OBJS)\monodll_xh_treebk.obj \
-	$(OBJS)\monodll_xh_unkwn.obj \
-	$(OBJS)\monodll_xh_wizrd.obj \
+	$(OBJS)\monodll_xh_stbmp.obj \
+	$(OBJS)\monodll_xh_stbox.obj \
+	$(OBJS)\monodll_xh_stlin.obj \
+	$(OBJS)\monodll_xh_sttxt.obj \
+	$(OBJS)\monodll_xh_text.obj \
+	$(OBJS)\monodll_xh_tglbtn.obj \
+	$(OBJS)\monodll_xh_timectrl.obj \
+	$(OBJS)\monodll_xh_toolb.obj \
+	$(OBJS)\monodll_xh_toolbk.obj \
+	$(OBJS)\monodll_xh_tree.obj \
+	$(OBJS)\monodll_xh_treebk.obj \
+	$(OBJS)\monodll_xh_unkwn.obj \
+	$(OBJS)\monodll_xh_wizrd.obj \
 	$(OBJS)\monodll_xmlres.obj \
 	$(OBJS)\monodll_xmladv.obj \
 	$(OBJS)\monodll_xmlrsall.obj \
@@ -1958,19 +1958,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontenum.obj \
 	$(OBJS)\monodll_fontutil.obj \
 	$(OBJS)\monodll_gdiimage.obj \
-	$(OBJS)\monodll_gdiobj.obj \
-	$(OBJS)\monodll_gdiplus.obj \
-	$(OBJS)\monodll_graphics.obj \
-	$(OBJS)\monodll_icon.obj \
-	$(OBJS)\monodll_imaglist.obj \
-	$(OBJS)\monodll_minifram.obj \
-	$(OBJS)\monodll_nonownedwnd.obj \
-	$(OBJS)\monodll_dataobj.obj \
-	$(OBJS)\monodll_dropsrc.obj \
-	$(OBJS)\monodll_droptgt.obj \
-	$(OBJS)\monodll_oleutils.obj \
-	$(OBJS)\monodll_palette.obj \
-	$(OBJS)\monodll_pen.obj \
+	$(OBJS)\monodll_gdiobj.obj \
+	$(OBJS)\monodll_gdiplus.obj \
+	$(OBJS)\monodll_graphics.obj \
+	$(OBJS)\monodll_icon.obj \
+	$(OBJS)\monodll_imaglist.obj \
+	$(OBJS)\monodll_minifram.obj \
+	$(OBJS)\monodll_nonownedwnd.obj \
+	$(OBJS)\monodll_dataobj.obj \
+	$(OBJS)\monodll_dropsrc.obj \
+	$(OBJS)\monodll_droptgt.obj \
+	$(OBJS)\monodll_oleutils.obj \
+	$(OBJS)\monodll_palette.obj \
+	$(OBJS)\monodll_pen.obj \
 	$(OBJS)\monodll_popupwin.obj \
 	$(OBJS)\monodll_printdlg.obj \
 	$(OBJS)\monodll_printwin.obj \
@@ -2230,19 +2230,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_fontenum.obj \
 	$(OBJS)\monodll_fontutil.obj \
 	$(OBJS)\monodll_gdiimage.obj \
-	$(OBJS)\monodll_gdiobj.obj \
-	$(OBJS)\monodll_gdiplus.obj \
-	$(OBJS)\monodll_graphics.obj \
-	$(OBJS)\monodll_icon.obj \
-	$(OBJS)\monodll_imaglist.obj \
-	$(OBJS)\monodll_minifram.obj \
-	$(OBJS)\monodll_nonownedwnd.obj \
-	$(OBJS)\monodll_dataobj.obj \
-	$(OBJS)\monodll_dropsrc.obj \
-	$(OBJS)\monodll_droptgt.obj \
-	$(OBJS)\monodll_oleutils.obj \
-	$(OBJS)\monodll_palette.obj \
-	$(OBJS)\monodll_pen.obj \
+	$(OBJS)\monodll_gdiobj.obj \
+	$(OBJS)\monodll_gdiplus.obj \
+	$(OBJS)\monodll_graphics.obj \
+	$(OBJS)\monodll_icon.obj \
+	$(OBJS)\monodll_imaglist.obj \
+	$(OBJS)\monodll_minifram.obj \
+	$(OBJS)\monodll_nonownedwnd.obj \
+	$(OBJS)\monodll_dataobj.obj \
+	$(OBJS)\monodll_dropsrc.obj \
+	$(OBJS)\monodll_droptgt.obj \
+	$(OBJS)\monodll_oleutils.obj \
+	$(OBJS)\monodll_palette.obj \
+	$(OBJS)\monodll_pen.obj \
 	$(OBJS)\monodll_popupwin.obj \
 	$(OBJS)\monodll_printdlg.obj \
 	$(OBJS)\monodll_printwin.obj \
@@ -2475,100 +2475,100 @@ ____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_gridcmn.obj \
-	$(OBJS)\monodll_hyperlnkcmn.obj \
-	$(OBJS)\monodll_odcombocmn.obj \
-	$(OBJS)\monodll_richtooltipcmn.obj \
-	$(OBJS)\monodll_aboutdlgg.obj \
-	$(OBJS)\monodll_bannerwindow.obj \
-	$(OBJS)\monodll_bmpcboxg.obj \
-	$(OBJS)\monodll_calctrlg.obj \
-	$(OBJS)\monodll_commandlinkbuttong.obj \
-	$(OBJS)\monodll_datavgen.obj \
+	$(OBJS)\monodll_bmpcboxcmn.obj \
+	$(OBJS)\monodll_calctrlcmn.obj \
+	$(OBJS)\monodll_datavcmn.obj \
+	$(OBJS)\monodll_gridcmn.obj \
+	$(OBJS)\monodll_hyperlnkcmn.obj \
+	$(OBJS)\monodll_odcombocmn.obj \
+	$(OBJS)\monodll_richtooltipcmn.obj \
+	$(OBJS)\monodll_aboutdlgg.obj \
+	$(OBJS)\monodll_bannerwindow.obj \
+	$(OBJS)\monodll_bmpcboxg.obj \
+	$(OBJS)\monodll_calctrlg.obj \
+	$(OBJS)\monodll_commandlinkbuttong.obj \
+	$(OBJS)\monodll_datavgen.obj \
 	$(OBJS)\monodll_datectlg.obj \
 	$(OBJS)\monodll_editlbox.obj \
 	$(OBJS)\monodll_grid.obj \
 	$(OBJS)\monodll_gridctrl.obj \
 	$(OBJS)\monodll_grideditors.obj \
 	$(OBJS)\monodll_gridsel.obj \
-	$(OBJS)\monodll_helpext.obj \
-	$(OBJS)\monodll_hyperlinkg.obj \
-	$(OBJS)\monodll_laywin.obj \
-	$(OBJS)\monodll_notifmsgg.obj \
-	$(OBJS)\monodll_odcombo.obj \
-	$(OBJS)\monodll_propdlg.obj \
-	$(OBJS)\monodll_generic_richtooltip.obj \
-	$(OBJS)\monodll_sashwin.obj \
-	$(OBJS)\monodll_splash.obj \
-	$(OBJS)\monodll_generic_timectrl.obj \
-	$(OBJS)\monodll_tipdlg.obj \
-	$(OBJS)\monodll_treelist.obj \
-	$(OBJS)\monodll_wizard.obj \
-	$(OBJS)\monodll_taskbarcmn.obj \
-	$(OBJS)\monodll_aboutdlg.obj \
-	$(OBJS)\monodll_notifmsg.obj \
-	$(OBJS)\monodll_msw_richtooltip.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_commandlinkbutton.obj \
-	$(OBJS)\monodll_datecontrols.obj \
-	$(OBJS)\monodll_datectrl.obj \
-	$(OBJS)\monodll_datetimectrl.obj \
-	$(OBJS)\monodll_hyperlink.obj \
-	$(OBJS)\monodll_msw_timectrl.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_gridcmn.obj \
-	$(OBJS)\monodll_hyperlnkcmn.obj \
-	$(OBJS)\monodll_odcombocmn.obj \
-	$(OBJS)\monodll_richtooltipcmn.obj \
-	$(OBJS)\monodll_aboutdlgg.obj \
-	$(OBJS)\monodll_bannerwindow.obj \
-	$(OBJS)\monodll_bmpcboxg.obj \
-	$(OBJS)\monodll_calctrlg.obj \
-	$(OBJS)\monodll_commandlinkbuttong.obj \
-	$(OBJS)\monodll_datavgen.obj \
+	$(OBJS)\monodll_helpext.obj \
+	$(OBJS)\monodll_hyperlinkg.obj \
+	$(OBJS)\monodll_laywin.obj \
+	$(OBJS)\monodll_notifmsgg.obj \
+	$(OBJS)\monodll_odcombo.obj \
+	$(OBJS)\monodll_propdlg.obj \
+	$(OBJS)\monodll_richtooltipg.obj \
+	$(OBJS)\monodll_sashwin.obj \
+	$(OBJS)\monodll_splash.obj \
+	$(OBJS)\monodll_generic_timectrl.obj \
+	$(OBJS)\monodll_tipdlg.obj \
+	$(OBJS)\monodll_treelist.obj \
+	$(OBJS)\monodll_wizard.obj \
+	$(OBJS)\monodll_taskbarcmn.obj \
+	$(OBJS)\monodll_aboutdlg.obj \
+	$(OBJS)\monodll_notifmsg.obj \
+	$(OBJS)\monodll_richtooltip.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_commandlinkbutton.obj \
+	$(OBJS)\monodll_datecontrols.obj \
+	$(OBJS)\monodll_datectrl.obj \
+	$(OBJS)\monodll_datetimectrl.obj \
+	$(OBJS)\monodll_hyperlink.obj \
+	$(OBJS)\monodll_msw_timectrl.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_gridcmn.obj \
+	$(OBJS)\monodll_hyperlnkcmn.obj \
+	$(OBJS)\monodll_odcombocmn.obj \
+	$(OBJS)\monodll_richtooltipcmn.obj \
+	$(OBJS)\monodll_aboutdlgg.obj \
+	$(OBJS)\monodll_bannerwindow.obj \
+	$(OBJS)\monodll_bmpcboxg.obj \
+	$(OBJS)\monodll_calctrlg.obj \
+	$(OBJS)\monodll_commandlinkbuttong.obj \
+	$(OBJS)\monodll_datavgen.obj \
 	$(OBJS)\monodll_datectlg.obj \
 	$(OBJS)\monodll_editlbox.obj \
 	$(OBJS)\monodll_grid.obj \
 	$(OBJS)\monodll_gridctrl.obj \
 	$(OBJS)\monodll_grideditors.obj \
 	$(OBJS)\monodll_gridsel.obj \
-	$(OBJS)\monodll_helpext.obj \
-	$(OBJS)\monodll_hyperlinkg.obj \
-	$(OBJS)\monodll_laywin.obj \
-	$(OBJS)\monodll_notifmsgg.obj \
-	$(OBJS)\monodll_odcombo.obj \
-	$(OBJS)\monodll_propdlg.obj \
-	$(OBJS)\monodll_generic_richtooltip.obj \
-	$(OBJS)\monodll_sashwin.obj \
-	$(OBJS)\monodll_splash.obj \
-	$(OBJS)\monodll_generic_timectrl.obj \
-	$(OBJS)\monodll_tipdlg.obj \
-	$(OBJS)\monodll_treelist.obj \
-	$(OBJS)\monodll_wizard.obj \
-	$(OBJS)\monodll_taskbarcmn.obj \
-	$(OBJS)\monodll_aboutdlg.obj \
-	$(OBJS)\monodll_notifmsg.obj \
-	$(OBJS)\monodll_msw_richtooltip.obj \
-	$(OBJS)\monodll_sound.obj \
-	$(OBJS)\monodll_taskbar.obj \
-	$(OBJS)\monodll_joystick.obj \
-	$(OBJS)\monodll_animateg.obj
-!endif
-!if "$(USE_STC)" == "1"
+	$(OBJS)\monodll_helpext.obj \
+	$(OBJS)\monodll_hyperlinkg.obj \
+	$(OBJS)\monodll_laywin.obj \
+	$(OBJS)\monodll_notifmsgg.obj \
+	$(OBJS)\monodll_odcombo.obj \
+	$(OBJS)\monodll_propdlg.obj \
+	$(OBJS)\monodll_richtooltipg.obj \
+	$(OBJS)\monodll_sashwin.obj \
+	$(OBJS)\monodll_splash.obj \
+	$(OBJS)\monodll_generic_timectrl.obj \
+	$(OBJS)\monodll_tipdlg.obj \
+	$(OBJS)\monodll_treelist.obj \
+	$(OBJS)\monodll_wizard.obj \
+	$(OBJS)\monodll_taskbarcmn.obj \
+	$(OBJS)\monodll_aboutdlg.obj \
+	$(OBJS)\monodll_notifmsg.obj \
+	$(OBJS)\monodll_richtooltip.obj \
+	$(OBJS)\monodll_sound.obj \
+	$(OBJS)\monodll_taskbar.obj \
+	$(OBJS)\monodll_joystick.obj \
+	$(OBJS)\monodll_animateg.obj
+!endif
+!if "$(USE_STC)" == "1"
 __wxscintilla_library_link_DEP = $(__wxscintilla)
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"
@@ -2669,19 +2669,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_xh_split.obj \
 	$(OBJS)\monolib_xh_srchctrl.obj \
 	$(OBJS)\monolib_xh_statbar.obj \
-	$(OBJS)\monolib_xh_stbmp.obj \
-	$(OBJS)\monolib_xh_stbox.obj \
-	$(OBJS)\monolib_xh_stlin.obj \
-	$(OBJS)\monolib_xh_sttxt.obj \
-	$(OBJS)\monolib_xh_text.obj \
-	$(OBJS)\monolib_xh_tglbtn.obj \
-	$(OBJS)\monolib_xh_timectrl.obj \
-	$(OBJS)\monolib_xh_toolb.obj \
-	$(OBJS)\monolib_xh_toolbk.obj \
-	$(OBJS)\monolib_xh_tree.obj \
-	$(OBJS)\monolib_xh_treebk.obj \
-	$(OBJS)\monolib_xh_unkwn.obj \
-	$(OBJS)\monolib_xh_wizrd.obj \
+	$(OBJS)\monolib_xh_stbmp.obj \
+	$(OBJS)\monolib_xh_stbox.obj \
+	$(OBJS)\monolib_xh_stlin.obj \
+	$(OBJS)\monolib_xh_sttxt.obj \
+	$(OBJS)\monolib_xh_text.obj \
+	$(OBJS)\monolib_xh_tglbtn.obj \
+	$(OBJS)\monolib_xh_timectrl.obj \
+	$(OBJS)\monolib_xh_toolb.obj \
+	$(OBJS)\monolib_xh_toolbk.obj \
+	$(OBJS)\monolib_xh_tree.obj \
+	$(OBJS)\monolib_xh_treebk.obj \
+	$(OBJS)\monolib_xh_unkwn.obj \
+	$(OBJS)\monolib_xh_wizrd.obj \
 	$(OBJS)\monolib_xmlres.obj \
 	$(OBJS)\monolib_xmladv.obj \
 	$(OBJS)\monolib_xmlrsall.obj \
@@ -2747,19 +2747,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontenum.obj \
 	$(OBJS)\monolib_fontutil.obj \
 	$(OBJS)\monolib_gdiimage.obj \
-	$(OBJS)\monolib_gdiobj.obj \
-	$(OBJS)\monolib_gdiplus.obj \
-	$(OBJS)\monolib_graphics.obj \
-	$(OBJS)\monolib_icon.obj \
-	$(OBJS)\monolib_imaglist.obj \
-	$(OBJS)\monolib_minifram.obj \
-	$(OBJS)\monolib_nonownedwnd.obj \
-	$(OBJS)\monolib_dataobj.obj \
-	$(OBJS)\monolib_dropsrc.obj \
-	$(OBJS)\monolib_droptgt.obj \
-	$(OBJS)\monolib_oleutils.obj \
-	$(OBJS)\monolib_palette.obj \
-	$(OBJS)\monolib_pen.obj \
+	$(OBJS)\monolib_gdiobj.obj \
+	$(OBJS)\monolib_gdiplus.obj \
+	$(OBJS)\monolib_graphics.obj \
+	$(OBJS)\monolib_icon.obj \
+	$(OBJS)\monolib_imaglist.obj \
+	$(OBJS)\monolib_minifram.obj \
+	$(OBJS)\monolib_nonownedwnd.obj \
+	$(OBJS)\monolib_dataobj.obj \
+	$(OBJS)\monolib_dropsrc.obj \
+	$(OBJS)\monolib_droptgt.obj \
+	$(OBJS)\monolib_oleutils.obj \
+	$(OBJS)\monolib_palette.obj \
+	$(OBJS)\monolib_pen.obj \
 	$(OBJS)\monolib_popupwin.obj \
 	$(OBJS)\monolib_printdlg.obj \
 	$(OBJS)\monolib_printwin.obj \
@@ -3019,19 +3019,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_fontenum.obj \
 	$(OBJS)\monolib_fontutil.obj \
 	$(OBJS)\monolib_gdiimage.obj \
-	$(OBJS)\monolib_gdiobj.obj \
-	$(OBJS)\monolib_gdiplus.obj \
-	$(OBJS)\monolib_graphics.obj \
-	$(OBJS)\monolib_icon.obj \
-	$(OBJS)\monolib_imaglist.obj \
-	$(OBJS)\monolib_minifram.obj \
-	$(OBJS)\monolib_nonownedwnd.obj \
-	$(OBJS)\monolib_dataobj.obj \
-	$(OBJS)\monolib_dropsrc.obj \
-	$(OBJS)\monolib_droptgt.obj \
-	$(OBJS)\monolib_oleutils.obj \
-	$(OBJS)\monolib_palette.obj \
-	$(OBJS)\monolib_pen.obj \
+	$(OBJS)\monolib_gdiobj.obj \
+	$(OBJS)\monolib_gdiplus.obj \
+	$(OBJS)\monolib_graphics.obj \
+	$(OBJS)\monolib_icon.obj \
+	$(OBJS)\monolib_imaglist.obj \
+	$(OBJS)\monolib_minifram.obj \
+	$(OBJS)\monolib_nonownedwnd.obj \
+	$(OBJS)\monolib_dataobj.obj \
+	$(OBJS)\monolib_dropsrc.obj \
+	$(OBJS)\monolib_droptgt.obj \
+	$(OBJS)\monolib_oleutils.obj \
+	$(OBJS)\monolib_palette.obj \
+	$(OBJS)\monolib_pen.obj \
 	$(OBJS)\monolib_popupwin.obj \
 	$(OBJS)\monolib_printdlg.obj \
 	$(OBJS)\monolib_printwin.obj \
@@ -3264,100 +3264,100 @@ ____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_gridcmn.obj \
-	$(OBJS)\monolib_hyperlnkcmn.obj \
-	$(OBJS)\monolib_odcombocmn.obj \
-	$(OBJS)\monolib_richtooltipcmn.obj \
-	$(OBJS)\monolib_aboutdlgg.obj \
-	$(OBJS)\monolib_bannerwindow.obj \
-	$(OBJS)\monolib_bmpcboxg.obj \
-	$(OBJS)\monolib_calctrlg.obj \
-	$(OBJS)\monolib_commandlinkbuttong.obj \
-	$(OBJS)\monolib_datavgen.obj \
+	$(OBJS)\monolib_bmpcboxcmn.obj \
+	$(OBJS)\monolib_calctrlcmn.obj \
+	$(OBJS)\monolib_datavcmn.obj \
+	$(OBJS)\monolib_gridcmn.obj \
+	$(OBJS)\monolib_hyperlnkcmn.obj \
+	$(OBJS)\monolib_odcombocmn.obj \
+	$(OBJS)\monolib_richtooltipcmn.obj \
+	$(OBJS)\monolib_aboutdlgg.obj \
+	$(OBJS)\monolib_bannerwindow.obj \
+	$(OBJS)\monolib_bmpcboxg.obj \
+	$(OBJS)\monolib_calctrlg.obj \
+	$(OBJS)\monolib_commandlinkbuttong.obj \
+	$(OBJS)\monolib_datavgen.obj \
 	$(OBJS)\monolib_datectlg.obj \
 	$(OBJS)\monolib_editlbox.obj \
 	$(OBJS)\monolib_grid.obj \
 	$(OBJS)\monolib_gridctrl.obj \
 	$(OBJS)\monolib_grideditors.obj \
 	$(OBJS)\monolib_gridsel.obj \
-	$(OBJS)\monolib_helpext.obj \
-	$(OBJS)\monolib_hyperlinkg.obj \
-	$(OBJS)\monolib_laywin.obj \
-	$(OBJS)\monolib_notifmsgg.obj \
-	$(OBJS)\monolib_odcombo.obj \
-	$(OBJS)\monolib_propdlg.obj \
-	$(OBJS)\monolib_generic_richtooltip.obj \
-	$(OBJS)\monolib_sashwin.obj \
-	$(OBJS)\monolib_splash.obj \
-	$(OBJS)\monolib_generic_timectrl.obj \
-	$(OBJS)\monolib_tipdlg.obj \
-	$(OBJS)\monolib_treelist.obj \
-	$(OBJS)\monolib_wizard.obj \
-	$(OBJS)\monolib_taskbarcmn.obj \
-	$(OBJS)\monolib_aboutdlg.obj \
-	$(OBJS)\monolib_notifmsg.obj \
-	$(OBJS)\monolib_msw_richtooltip.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_commandlinkbutton.obj \
-	$(OBJS)\monolib_datecontrols.obj \
-	$(OBJS)\monolib_datectrl.obj \
-	$(OBJS)\monolib_datetimectrl.obj \
-	$(OBJS)\monolib_hyperlink.obj \
-	$(OBJS)\monolib_msw_timectrl.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_gridcmn.obj \
-	$(OBJS)\monolib_hyperlnkcmn.obj \
-	$(OBJS)\monolib_odcombocmn.obj \
-	$(OBJS)\monolib_richtooltipcmn.obj \
-	$(OBJS)\monolib_aboutdlgg.obj \
-	$(OBJS)\monolib_bannerwindow.obj \
-	$(OBJS)\monolib_bmpcboxg.obj \
-	$(OBJS)\monolib_calctrlg.obj \
-	$(OBJS)\monolib_commandlinkbuttong.obj \
-	$(OBJS)\monolib_datavgen.obj \
+	$(OBJS)\monolib_helpext.obj \
+	$(OBJS)\monolib_hyperlinkg.obj \
+	$(OBJS)\monolib_laywin.obj \
+	$(OBJS)\monolib_notifmsgg.obj \
+	$(OBJS)\monolib_odcombo.obj \
+	$(OBJS)\monolib_propdlg.obj \
+	$(OBJS)\monolib_richtooltipg.obj \
+	$(OBJS)\monolib_sashwin.obj \
+	$(OBJS)\monolib_splash.obj \
+	$(OBJS)\monolib_generic_timectrl.obj \
+	$(OBJS)\monolib_tipdlg.obj \
+	$(OBJS)\monolib_treelist.obj \
+	$(OBJS)\monolib_wizard.obj \
+	$(OBJS)\monolib_taskbarcmn.obj \
+	$(OBJS)\monolib_aboutdlg.obj \
+	$(OBJS)\monolib_notifmsg.obj \
+	$(OBJS)\monolib_richtooltip.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_commandlinkbutton.obj \
+	$(OBJS)\monolib_datecontrols.obj \
+	$(OBJS)\monolib_datectrl.obj \
+	$(OBJS)\monolib_datetimectrl.obj \
+	$(OBJS)\monolib_hyperlink.obj \
+	$(OBJS)\monolib_msw_timectrl.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_gridcmn.obj \
+	$(OBJS)\monolib_hyperlnkcmn.obj \
+	$(OBJS)\monolib_odcombocmn.obj \
+	$(OBJS)\monolib_richtooltipcmn.obj \
+	$(OBJS)\monolib_aboutdlgg.obj \
+	$(OBJS)\monolib_bannerwindow.obj \
+	$(OBJS)\monolib_bmpcboxg.obj \
+	$(OBJS)\monolib_calctrlg.obj \
+	$(OBJS)\monolib_commandlinkbuttong.obj \
+	$(OBJS)\monolib_datavgen.obj \
 	$(OBJS)\monolib_datectlg.obj \
 	$(OBJS)\monolib_editlbox.obj \
 	$(OBJS)\monolib_grid.obj \
 	$(OBJS)\monolib_gridctrl.obj \
 	$(OBJS)\monolib_grideditors.obj \
 	$(OBJS)\monolib_gridsel.obj \
-	$(OBJS)\monolib_helpext.obj \
-	$(OBJS)\monolib_hyperlinkg.obj \
-	$(OBJS)\monolib_laywin.obj \
-	$(OBJS)\monolib_notifmsgg.obj \
-	$(OBJS)\monolib_odcombo.obj \
-	$(OBJS)\monolib_propdlg.obj \
-	$(OBJS)\monolib_generic_richtooltip.obj \
-	$(OBJS)\monolib_sashwin.obj \
-	$(OBJS)\monolib_splash.obj \
-	$(OBJS)\monolib_generic_timectrl.obj \
-	$(OBJS)\monolib_tipdlg.obj \
-	$(OBJS)\monolib_treelist.obj \
-	$(OBJS)\monolib_wizard.obj \
-	$(OBJS)\monolib_taskbarcmn.obj \
-	$(OBJS)\monolib_aboutdlg.obj \
-	$(OBJS)\monolib_notifmsg.obj \
-	$(OBJS)\monolib_msw_richtooltip.obj \
-	$(OBJS)\monolib_sound.obj \
-	$(OBJS)\monolib_taskbar.obj \
-	$(OBJS)\monolib_joystick.obj \
-	$(OBJS)\monolib_animateg.obj
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
+	$(OBJS)\monolib_helpext.obj \
+	$(OBJS)\monolib_hyperlinkg.obj \
+	$(OBJS)\monolib_laywin.obj \
+	$(OBJS)\monolib_notifmsgg.obj \
+	$(OBJS)\monolib_odcombo.obj \
+	$(OBJS)\monolib_propdlg.obj \
+	$(OBJS)\monolib_richtooltipg.obj \
+	$(OBJS)\monolib_sashwin.obj \
+	$(OBJS)\monolib_splash.obj \
+	$(OBJS)\monolib_generic_timectrl.obj \
+	$(OBJS)\monolib_tipdlg.obj \
+	$(OBJS)\monolib_treelist.obj \
+	$(OBJS)\monolib_wizard.obj \
+	$(OBJS)\monolib_taskbarcmn.obj \
+	$(OBJS)\monolib_aboutdlg.obj \
+	$(OBJS)\monolib_notifmsg.obj \
+	$(OBJS)\monolib_richtooltip.obj \
+	$(OBJS)\monolib_sound.obj \
+	$(OBJS)\monolib_taskbar.obj \
+	$(OBJS)\monolib_joystick.obj \
+	$(OBJS)\monolib_animateg.obj
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __basedll___depname = \
 	$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
 !endif
@@ -3479,19 +3479,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontenum.obj \
 	$(OBJS)\coredll_fontutil.obj \
 	$(OBJS)\coredll_gdiimage.obj \
-	$(OBJS)\coredll_gdiobj.obj \
-	$(OBJS)\coredll_gdiplus.obj \
-	$(OBJS)\coredll_graphics.obj \
-	$(OBJS)\coredll_icon.obj \
-	$(OBJS)\coredll_imaglist.obj \
-	$(OBJS)\coredll_minifram.obj \
-	$(OBJS)\coredll_nonownedwnd.obj \
-	$(OBJS)\coredll_dataobj.obj \
-	$(OBJS)\coredll_dropsrc.obj \
-	$(OBJS)\coredll_droptgt.obj \
-	$(OBJS)\coredll_oleutils.obj \
-	$(OBJS)\coredll_palette.obj \
-	$(OBJS)\coredll_pen.obj \
+	$(OBJS)\coredll_gdiobj.obj \
+	$(OBJS)\coredll_gdiplus.obj \
+	$(OBJS)\coredll_graphics.obj \
+	$(OBJS)\coredll_icon.obj \
+	$(OBJS)\coredll_imaglist.obj \
+	$(OBJS)\coredll_minifram.obj \
+	$(OBJS)\coredll_nonownedwnd.obj \
+	$(OBJS)\coredll_dataobj.obj \
+	$(OBJS)\coredll_dropsrc.obj \
+	$(OBJS)\coredll_droptgt.obj \
+	$(OBJS)\coredll_oleutils.obj \
+	$(OBJS)\coredll_palette.obj \
+	$(OBJS)\coredll_pen.obj \
 	$(OBJS)\coredll_popupwin.obj \
 	$(OBJS)\coredll_printdlg.obj \
 	$(OBJS)\coredll_printwin.obj \
@@ -3751,19 +3751,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_fontenum.obj \
 	$(OBJS)\coredll_fontutil.obj \
 	$(OBJS)\coredll_gdiimage.obj \
-	$(OBJS)\coredll_gdiobj.obj \
-	$(OBJS)\coredll_gdiplus.obj \
-	$(OBJS)\coredll_graphics.obj \
-	$(OBJS)\coredll_icon.obj \
-	$(OBJS)\coredll_imaglist.obj \
-	$(OBJS)\coredll_minifram.obj \
-	$(OBJS)\coredll_nonownedwnd.obj \
-	$(OBJS)\coredll_dataobj.obj \
-	$(OBJS)\coredll_dropsrc.obj \
-	$(OBJS)\coredll_droptgt.obj \
-	$(OBJS)\coredll_oleutils.obj \
-	$(OBJS)\coredll_palette.obj \
-	$(OBJS)\coredll_pen.obj \
+	$(OBJS)\coredll_gdiobj.obj \
+	$(OBJS)\coredll_gdiplus.obj \
+	$(OBJS)\coredll_graphics.obj \
+	$(OBJS)\coredll_icon.obj \
+	$(OBJS)\coredll_imaglist.obj \
+	$(OBJS)\coredll_minifram.obj \
+	$(OBJS)\coredll_nonownedwnd.obj \
+	$(OBJS)\coredll_dataobj.obj \
+	$(OBJS)\coredll_dropsrc.obj \
+	$(OBJS)\coredll_droptgt.obj \
+	$(OBJS)\coredll_oleutils.obj \
+	$(OBJS)\coredll_palette.obj \
+	$(OBJS)\coredll_pen.obj \
 	$(OBJS)\coredll_popupwin.obj \
 	$(OBJS)\coredll_printdlg.obj \
 	$(OBJS)\coredll_printwin.obj \
@@ -4027,19 +4027,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontenum.obj \
 	$(OBJS)\corelib_fontutil.obj \
 	$(OBJS)\corelib_gdiimage.obj \
-	$(OBJS)\corelib_gdiobj.obj \
-	$(OBJS)\corelib_gdiplus.obj \
-	$(OBJS)\corelib_graphics.obj \
-	$(OBJS)\corelib_icon.obj \
-	$(OBJS)\corelib_imaglist.obj \
-	$(OBJS)\corelib_minifram.obj \
-	$(OBJS)\corelib_nonownedwnd.obj \
-	$(OBJS)\corelib_dataobj.obj \
-	$(OBJS)\corelib_dropsrc.obj \
-	$(OBJS)\corelib_droptgt.obj \
-	$(OBJS)\corelib_oleutils.obj \
-	$(OBJS)\corelib_palette.obj \
-	$(OBJS)\corelib_pen.obj \
+	$(OBJS)\corelib_gdiobj.obj \
+	$(OBJS)\corelib_gdiplus.obj \
+	$(OBJS)\corelib_graphics.obj \
+	$(OBJS)\corelib_icon.obj \
+	$(OBJS)\corelib_imaglist.obj \
+	$(OBJS)\corelib_minifram.obj \
+	$(OBJS)\corelib_nonownedwnd.obj \
+	$(OBJS)\corelib_dataobj.obj \
+	$(OBJS)\corelib_dropsrc.obj \
+	$(OBJS)\corelib_droptgt.obj \
+	$(OBJS)\corelib_oleutils.obj \
+	$(OBJS)\corelib_palette.obj \
+	$(OBJS)\corelib_pen.obj \
 	$(OBJS)\corelib_popupwin.obj \
 	$(OBJS)\corelib_printdlg.obj \
 	$(OBJS)\corelib_printwin.obj \
@@ -4299,19 +4299,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_fontenum.obj \
 	$(OBJS)\corelib_fontutil.obj \
 	$(OBJS)\corelib_gdiimage.obj \
-	$(OBJS)\corelib_gdiobj.obj \
-	$(OBJS)\corelib_gdiplus.obj \
-	$(OBJS)\corelib_graphics.obj \
-	$(OBJS)\corelib_icon.obj \
-	$(OBJS)\corelib_imaglist.obj \
-	$(OBJS)\corelib_minifram.obj \
-	$(OBJS)\corelib_nonownedwnd.obj \
-	$(OBJS)\corelib_dataobj.obj \
-	$(OBJS)\corelib_dropsrc.obj \
-	$(OBJS)\corelib_droptgt.obj \
-	$(OBJS)\corelib_oleutils.obj \
-	$(OBJS)\corelib_palette.obj \
-	$(OBJS)\corelib_pen.obj \
+	$(OBJS)\corelib_gdiobj.obj \
+	$(OBJS)\corelib_gdiplus.obj \
+	$(OBJS)\corelib_graphics.obj \
+	$(OBJS)\corelib_icon.obj \
+	$(OBJS)\corelib_imaglist.obj \
+	$(OBJS)\corelib_minifram.obj \
+	$(OBJS)\corelib_nonownedwnd.obj \
+	$(OBJS)\corelib_dataobj.obj \
+	$(OBJS)\corelib_dropsrc.obj \
+	$(OBJS)\corelib_droptgt.obj \
+	$(OBJS)\corelib_oleutils.obj \
+	$(OBJS)\corelib_palette.obj \
+	$(OBJS)\corelib_pen.obj \
 	$(OBJS)\corelib_popupwin.obj \
 	$(OBJS)\corelib_printdlg.obj \
 	$(OBJS)\corelib_printwin.obj \
@@ -4572,100 +4572,100 @@ __RUNTIME_LIBS_240 = $(__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_gridcmn.obj \
-	$(OBJS)\advdll_hyperlnkcmn.obj \
-	$(OBJS)\advdll_odcombocmn.obj \
-	$(OBJS)\advdll_richtooltipcmn.obj \
-	$(OBJS)\advdll_aboutdlgg.obj \
-	$(OBJS)\advdll_bannerwindow.obj \
-	$(OBJS)\advdll_bmpcboxg.obj \
-	$(OBJS)\advdll_calctrlg.obj \
-	$(OBJS)\advdll_commandlinkbuttong.obj \
-	$(OBJS)\advdll_datavgen.obj \
+	$(OBJS)\advdll_bmpcboxcmn.obj \
+	$(OBJS)\advdll_calctrlcmn.obj \
+	$(OBJS)\advdll_datavcmn.obj \
+	$(OBJS)\advdll_gridcmn.obj \
+	$(OBJS)\advdll_hyperlnkcmn.obj \
+	$(OBJS)\advdll_odcombocmn.obj \
+	$(OBJS)\advdll_richtooltipcmn.obj \
+	$(OBJS)\advdll_aboutdlgg.obj \
+	$(OBJS)\advdll_bannerwindow.obj \
+	$(OBJS)\advdll_bmpcboxg.obj \
+	$(OBJS)\advdll_calctrlg.obj \
+	$(OBJS)\advdll_commandlinkbuttong.obj \
+	$(OBJS)\advdll_datavgen.obj \
 	$(OBJS)\advdll_datectlg.obj \
 	$(OBJS)\advdll_editlbox.obj \
 	$(OBJS)\advdll_grid.obj \
 	$(OBJS)\advdll_gridctrl.obj \
 	$(OBJS)\advdll_grideditors.obj \
 	$(OBJS)\advdll_gridsel.obj \
-	$(OBJS)\advdll_helpext.obj \
-	$(OBJS)\advdll_hyperlinkg.obj \
-	$(OBJS)\advdll_laywin.obj \
-	$(OBJS)\advdll_notifmsgg.obj \
-	$(OBJS)\advdll_odcombo.obj \
-	$(OBJS)\advdll_propdlg.obj \
-	$(OBJS)\advdll_generic_richtooltip.obj \
-	$(OBJS)\advdll_sashwin.obj \
-	$(OBJS)\advdll_splash.obj \
-	$(OBJS)\advdll_generic_timectrl.obj \
-	$(OBJS)\advdll_tipdlg.obj \
-	$(OBJS)\advdll_treelist.obj \
-	$(OBJS)\advdll_wizard.obj \
-	$(OBJS)\advdll_taskbarcmn.obj \
-	$(OBJS)\advdll_aboutdlg.obj \
-	$(OBJS)\advdll_notifmsg.obj \
-	$(OBJS)\advdll_msw_richtooltip.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_commandlinkbutton.obj \
-	$(OBJS)\advdll_datecontrols.obj \
-	$(OBJS)\advdll_datectrl.obj \
-	$(OBJS)\advdll_datetimectrl.obj \
-	$(OBJS)\advdll_hyperlink.obj \
-	$(OBJS)\advdll_msw_timectrl.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_gridcmn.obj \
-	$(OBJS)\advdll_hyperlnkcmn.obj \
-	$(OBJS)\advdll_odcombocmn.obj \
-	$(OBJS)\advdll_richtooltipcmn.obj \
-	$(OBJS)\advdll_aboutdlgg.obj \
-	$(OBJS)\advdll_bannerwindow.obj \
-	$(OBJS)\advdll_bmpcboxg.obj \
-	$(OBJS)\advdll_calctrlg.obj \
-	$(OBJS)\advdll_commandlinkbuttong.obj \
-	$(OBJS)\advdll_datavgen.obj \
+	$(OBJS)\advdll_helpext.obj \
+	$(OBJS)\advdll_hyperlinkg.obj \
+	$(OBJS)\advdll_laywin.obj \
+	$(OBJS)\advdll_notifmsgg.obj \
+	$(OBJS)\advdll_odcombo.obj \
+	$(OBJS)\advdll_propdlg.obj \
+	$(OBJS)\advdll_richtooltipg.obj \
+	$(OBJS)\advdll_sashwin.obj \
+	$(OBJS)\advdll_splash.obj \
+	$(OBJS)\advdll_generic_timectrl.obj \
+	$(OBJS)\advdll_tipdlg.obj \
+	$(OBJS)\advdll_treelist.obj \
+	$(OBJS)\advdll_wizard.obj \
+	$(OBJS)\advdll_taskbarcmn.obj \
+	$(OBJS)\advdll_aboutdlg.obj \
+	$(OBJS)\advdll_notifmsg.obj \
+	$(OBJS)\advdll_richtooltip.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_commandlinkbutton.obj \
+	$(OBJS)\advdll_datecontrols.obj \
+	$(OBJS)\advdll_datectrl.obj \
+	$(OBJS)\advdll_datetimectrl.obj \
+	$(OBJS)\advdll_hyperlink.obj \
+	$(OBJS)\advdll_msw_timectrl.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_gridcmn.obj \
+	$(OBJS)\advdll_hyperlnkcmn.obj \
+	$(OBJS)\advdll_odcombocmn.obj \
+	$(OBJS)\advdll_richtooltipcmn.obj \
+	$(OBJS)\advdll_aboutdlgg.obj \
+	$(OBJS)\advdll_bannerwindow.obj \
+	$(OBJS)\advdll_bmpcboxg.obj \
+	$(OBJS)\advdll_calctrlg.obj \
+	$(OBJS)\advdll_commandlinkbuttong.obj \
+	$(OBJS)\advdll_datavgen.obj \
 	$(OBJS)\advdll_datectlg.obj \
 	$(OBJS)\advdll_editlbox.obj \
 	$(OBJS)\advdll_grid.obj \
 	$(OBJS)\advdll_gridctrl.obj \
 	$(OBJS)\advdll_grideditors.obj \
 	$(OBJS)\advdll_gridsel.obj \
-	$(OBJS)\advdll_helpext.obj \
-	$(OBJS)\advdll_hyperlinkg.obj \
-	$(OBJS)\advdll_laywin.obj \
-	$(OBJS)\advdll_notifmsgg.obj \
-	$(OBJS)\advdll_odcombo.obj \
-	$(OBJS)\advdll_propdlg.obj \
-	$(OBJS)\advdll_generic_richtooltip.obj \
-	$(OBJS)\advdll_sashwin.obj \
-	$(OBJS)\advdll_splash.obj \
-	$(OBJS)\advdll_generic_timectrl.obj \
-	$(OBJS)\advdll_tipdlg.obj \
-	$(OBJS)\advdll_treelist.obj \
-	$(OBJS)\advdll_wizard.obj \
-	$(OBJS)\advdll_taskbarcmn.obj \
-	$(OBJS)\advdll_aboutdlg.obj \
-	$(OBJS)\advdll_notifmsg.obj \
-	$(OBJS)\advdll_msw_richtooltip.obj \
-	$(OBJS)\advdll_sound.obj \
-	$(OBJS)\advdll_taskbar.obj \
-	$(OBJS)\advdll_joystick.obj \
-	$(OBJS)\advdll_animateg.obj
-!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
+	$(OBJS)\advdll_helpext.obj \
+	$(OBJS)\advdll_hyperlinkg.obj \
+	$(OBJS)\advdll_laywin.obj \
+	$(OBJS)\advdll_notifmsgg.obj \
+	$(OBJS)\advdll_odcombo.obj \
+	$(OBJS)\advdll_propdlg.obj \
+	$(OBJS)\advdll_richtooltipg.obj \
+	$(OBJS)\advdll_sashwin.obj \
+	$(OBJS)\advdll_splash.obj \
+	$(OBJS)\advdll_generic_timectrl.obj \
+	$(OBJS)\advdll_tipdlg.obj \
+	$(OBJS)\advdll_treelist.obj \
+	$(OBJS)\advdll_wizard.obj \
+	$(OBJS)\advdll_taskbarcmn.obj \
+	$(OBJS)\advdll_aboutdlg.obj \
+	$(OBJS)\advdll_notifmsg.obj \
+	$(OBJS)\advdll_richtooltip.obj \
+	$(OBJS)\advdll_sound.obj \
+	$(OBJS)\advdll_taskbar.obj \
+	$(OBJS)\advdll_joystick.obj \
+	$(OBJS)\advdll_animateg.obj
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
 __advlib___depname = \
 	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
 !endif
@@ -4678,100 +4678,100 @@ __RUNTIME_LIBS_255 = $(__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_gridcmn.obj \
-	$(OBJS)\advlib_hyperlnkcmn.obj \
-	$(OBJS)\advlib_odcombocmn.obj \
-	$(OBJS)\advlib_richtooltipcmn.obj \
-	$(OBJS)\advlib_aboutdlgg.obj \
-	$(OBJS)\advlib_bannerwindow.obj \
-	$(OBJS)\advlib_bmpcboxg.obj \
-	$(OBJS)\advlib_calctrlg.obj \
-	$(OBJS)\advlib_commandlinkbuttong.obj \
-	$(OBJS)\advlib_datavgen.obj \
+	$(OBJS)\advlib_bmpcboxcmn.obj \
+	$(OBJS)\advlib_calctrlcmn.obj \
+	$(OBJS)\advlib_datavcmn.obj \
+	$(OBJS)\advlib_gridcmn.obj \
+	$(OBJS)\advlib_hyperlnkcmn.obj \
+	$(OBJS)\advlib_odcombocmn.obj \
+	$(OBJS)\advlib_richtooltipcmn.obj \
+	$(OBJS)\advlib_aboutdlgg.obj \
+	$(OBJS)\advlib_bannerwindow.obj \
+	$(OBJS)\advlib_bmpcboxg.obj \
+	$(OBJS)\advlib_calctrlg.obj \
+	$(OBJS)\advlib_commandlinkbuttong.obj \
+	$(OBJS)\advlib_datavgen.obj \
 	$(OBJS)\advlib_datectlg.obj \
 	$(OBJS)\advlib_editlbox.obj \
 	$(OBJS)\advlib_grid.obj \
 	$(OBJS)\advlib_gridctrl.obj \
 	$(OBJS)\advlib_grideditors.obj \
 	$(OBJS)\advlib_gridsel.obj \
-	$(OBJS)\advlib_helpext.obj \
-	$(OBJS)\advlib_hyperlinkg.obj \
-	$(OBJS)\advlib_laywin.obj \
-	$(OBJS)\advlib_notifmsgg.obj \
-	$(OBJS)\advlib_odcombo.obj \
-	$(OBJS)\advlib_propdlg.obj \
-	$(OBJS)\advlib_generic_richtooltip.obj \
-	$(OBJS)\advlib_sashwin.obj \
-	$(OBJS)\advlib_splash.obj \
-	$(OBJS)\advlib_generic_timectrl.obj \
-	$(OBJS)\advlib_tipdlg.obj \
-	$(OBJS)\advlib_treelist.obj \
-	$(OBJS)\advlib_wizard.obj \
-	$(OBJS)\advlib_taskbarcmn.obj \
-	$(OBJS)\advlib_aboutdlg.obj \
-	$(OBJS)\advlib_notifmsg.obj \
-	$(OBJS)\advlib_msw_richtooltip.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_commandlinkbutton.obj \
-	$(OBJS)\advlib_datecontrols.obj \
-	$(OBJS)\advlib_datectrl.obj \
-	$(OBJS)\advlib_datetimectrl.obj \
-	$(OBJS)\advlib_hyperlink.obj \
-	$(OBJS)\advlib_msw_timectrl.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_gridcmn.obj \
-	$(OBJS)\advlib_hyperlnkcmn.obj \
-	$(OBJS)\advlib_odcombocmn.obj \
-	$(OBJS)\advlib_richtooltipcmn.obj \
-	$(OBJS)\advlib_aboutdlgg.obj \
-	$(OBJS)\advlib_bannerwindow.obj \
-	$(OBJS)\advlib_bmpcboxg.obj \
-	$(OBJS)\advlib_calctrlg.obj \
-	$(OBJS)\advlib_commandlinkbuttong.obj \
-	$(OBJS)\advlib_datavgen.obj \
+	$(OBJS)\advlib_helpext.obj \
+	$(OBJS)\advlib_hyperlinkg.obj \
+	$(OBJS)\advlib_laywin.obj \
+	$(OBJS)\advlib_notifmsgg.obj \
+	$(OBJS)\advlib_odcombo.obj \
+	$(OBJS)\advlib_propdlg.obj \
+	$(OBJS)\advlib_richtooltipg.obj \
+	$(OBJS)\advlib_sashwin.obj \
+	$(OBJS)\advlib_splash.obj \
+	$(OBJS)\advlib_generic_timectrl.obj \
+	$(OBJS)\advlib_tipdlg.obj \
+	$(OBJS)\advlib_treelist.obj \
+	$(OBJS)\advlib_wizard.obj \
+	$(OBJS)\advlib_taskbarcmn.obj \
+	$(OBJS)\advlib_aboutdlg.obj \
+	$(OBJS)\advlib_notifmsg.obj \
+	$(OBJS)\advlib_richtooltip.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_commandlinkbutton.obj \
+	$(OBJS)\advlib_datecontrols.obj \
+	$(OBJS)\advlib_datectrl.obj \
+	$(OBJS)\advlib_datetimectrl.obj \
+	$(OBJS)\advlib_hyperlink.obj \
+	$(OBJS)\advlib_msw_timectrl.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_gridcmn.obj \
+	$(OBJS)\advlib_hyperlnkcmn.obj \
+	$(OBJS)\advlib_odcombocmn.obj \
+	$(OBJS)\advlib_richtooltipcmn.obj \
+	$(OBJS)\advlib_aboutdlgg.obj \
+	$(OBJS)\advlib_bannerwindow.obj \
+	$(OBJS)\advlib_bmpcboxg.obj \
+	$(OBJS)\advlib_calctrlg.obj \
+	$(OBJS)\advlib_commandlinkbuttong.obj \
+	$(OBJS)\advlib_datavgen.obj \
 	$(OBJS)\advlib_datectlg.obj \
 	$(OBJS)\advlib_editlbox.obj \
 	$(OBJS)\advlib_grid.obj \
 	$(OBJS)\advlib_gridctrl.obj \
 	$(OBJS)\advlib_grideditors.obj \
 	$(OBJS)\advlib_gridsel.obj \
-	$(OBJS)\advlib_helpext.obj \
-	$(OBJS)\advlib_hyperlinkg.obj \
-	$(OBJS)\advlib_laywin.obj \
-	$(OBJS)\advlib_notifmsgg.obj \
-	$(OBJS)\advlib_odcombo.obj \
-	$(OBJS)\advlib_propdlg.obj \
-	$(OBJS)\advlib_generic_richtooltip.obj \
-	$(OBJS)\advlib_sashwin.obj \
-	$(OBJS)\advlib_splash.obj \
-	$(OBJS)\advlib_generic_timectrl.obj \
-	$(OBJS)\advlib_tipdlg.obj \
-	$(OBJS)\advlib_treelist.obj \
-	$(OBJS)\advlib_wizard.obj \
-	$(OBJS)\advlib_taskbarcmn.obj \
-	$(OBJS)\advlib_aboutdlg.obj \
-	$(OBJS)\advlib_notifmsg.obj \
-	$(OBJS)\advlib_msw_richtooltip.obj \
-	$(OBJS)\advlib_sound.obj \
-	$(OBJS)\advlib_taskbar.obj \
-	$(OBJS)\advlib_joystick.obj \
-	$(OBJS)\advlib_animateg.obj
-!endif
-!if "$(SHARED)" == "1"
+	$(OBJS)\advlib_helpext.obj \
+	$(OBJS)\advlib_hyperlinkg.obj \
+	$(OBJS)\advlib_laywin.obj \
+	$(OBJS)\advlib_notifmsgg.obj \
+	$(OBJS)\advlib_odcombo.obj \
+	$(OBJS)\advlib_propdlg.obj \
+	$(OBJS)\advlib_richtooltipg.obj \
+	$(OBJS)\advlib_sashwin.obj \
+	$(OBJS)\advlib_splash.obj \
+	$(OBJS)\advlib_generic_timectrl.obj \
+	$(OBJS)\advlib_tipdlg.obj \
+	$(OBJS)\advlib_treelist.obj \
+	$(OBJS)\advlib_wizard.obj \
+	$(OBJS)\advlib_taskbarcmn.obj \
+	$(OBJS)\advlib_aboutdlg.obj \
+	$(OBJS)\advlib_notifmsg.obj \
+	$(OBJS)\advlib_richtooltip.obj \
+	$(OBJS)\advlib_sound.obj \
+	$(OBJS)\advlib_taskbar.obj \
+	$(OBJS)\advlib_joystick.obj \
+	$(OBJS)\advlib_animateg.obj
+!endif
+!if "$(SHARED)" == "1"
 ____wxadv_namedll_DEP = $(__advdll___depname)
 !endif
 !if "$(SHARED)" == "0"
@@ -6856,9 +6856,9 @@ $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
 $(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textfile.cpp
 
-$(OBJS)\monodll_time.obj: ..\..\src\common\time.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\time.cpp
-
+$(OBJS)\monodll_time.obj: ..\..\src\common\time.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\time.cpp
+
 $(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timercmn.cpp
 
@@ -7345,27 +7345,27 @@ $(OBJS)\monodll_calctrl.obj: ..\..\src\msw\calctrl.cpp
 $(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.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
-
-$(OBJS)\monodll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
-
-$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
-
-$(OBJS)\monodll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
-
-$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
-
-$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.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
+
+$(OBJS)\monodll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
+
+$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+
+$(OBJS)\monodll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp
+
+$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
+
+$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
+
 $(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp
 
@@ -7624,21 +7624,21 @@ $(OBJS)\monodll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\monodll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp
 
-$(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
-
-$(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
-
-$(OBJS)\monodll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
-
-$(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
-
-$(OBJS)\monodll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
-
+$(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
+
+$(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
+
+$(OBJS)\monodll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
+
+$(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\monodll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
 
@@ -7912,23 +7912,23 @@ $(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
 !endif
 
@@ -8882,23 +8882,23 @@ $(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
 !endif
 
@@ -8977,38 +8977,38 @@ $(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_generic_richtooltip.obj: ..\..\src\generic\richtooltip.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\richtooltip.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splash.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splash.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treelist.cpp
 !endif
 
@@ -9027,23 +9027,23 @@ $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_msw_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp
 !endif
 
@@ -9261,9 +9261,9 @@ $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
 $(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textfile.cpp
 
-$(OBJS)\monolib_time.obj: ..\..\src\common\time.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\time.cpp
-
+$(OBJS)\monolib_time.obj: ..\..\src\common\time.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\time.cpp
+
 $(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp
 
@@ -9750,27 +9750,27 @@ $(OBJS)\monolib_calctrl.obj: ..\..\src\msw\calctrl.cpp
 $(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.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
-
-$(OBJS)\monolib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
-
-$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
-
-$(OBJS)\monolib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
-
-$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
-
-$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.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
+
+$(OBJS)\monolib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
+
+$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+
+$(OBJS)\monolib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp
+
+$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
+
+$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
+
 $(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp
 
@@ -10029,21 +10029,21 @@ $(OBJS)\monolib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\monolib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp
 
-$(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
-
-$(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
-
-$(OBJS)\monolib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
-
-$(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
-
-$(OBJS)\monolib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
-
+$(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
+
+$(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
+
+$(OBJS)\monolib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
+
+$(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\monolib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
 
@@ -10317,23 +10317,23 @@ $(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
 !endif
 
@@ -11287,23 +11287,23 @@ $(OBJS)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
 !endif
 
@@ -11382,38 +11382,38 @@ $(OBJS)\monolib_odcombo.obj: ..\..\src\generic\odcombo.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_generic_richtooltip.obj: ..\..\src\generic\richtooltip.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richtooltip.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splash.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splash.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp
 !endif
 
@@ -11432,23 +11432,23 @@ $(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_msw_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp
 !endif
 
@@ -11666,9 +11666,9 @@ $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
 $(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textfile.cpp
 
-$(OBJS)\basedll_time.obj: ..\..\src\common\time.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\time.cpp
-
+$(OBJS)\basedll_time.obj: ..\..\src\common\time.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\time.cpp
+
 $(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp
 
@@ -12005,9 +12005,9 @@ $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
 $(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textfile.cpp
 
-$(OBJS)\baselib_time.obj: ..\..\src\common\time.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\time.cpp
-
+$(OBJS)\baselib_time.obj: ..\..\src\common\time.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\time.cpp
+
 $(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp
 
@@ -12695,23 +12695,23 @@ $(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
 !endif
 
@@ -14103,23 +14103,23 @@ $(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
 !endif
 
@@ -15058,27 +15058,27 @@ $(OBJS)\advdll_calctrl.obj: ..\..\src\msw\calctrl.cpp
 $(OBJS)\advdll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.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_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
-
-$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
-
-$(OBJS)\advdll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.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_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_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
+
+$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+
+$(OBJS)\advdll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.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
 
@@ -15088,21 +15088,21 @@ $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 $(OBJS)\advdll_gridcmn.obj: ..\..\src\common\gridcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp
 
-$(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
-
-$(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
-
-$(OBJS)\advdll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
-
-$(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
-
-$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
-
+$(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
+
+$(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+
+$(OBJS)\advdll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
+
+$(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+
+$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
+
 $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
 
@@ -15145,51 +15145,51 @@ $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
 $(OBJS)\advdll_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp
 
-$(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp
-
-$(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp
-
-$(OBJS)\advdll_generic_richtooltip.obj: ..\..\src\generic\richtooltip.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\richtooltip.cpp
-
-$(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp
-
-$(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp
-
-$(OBJS)\advdll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp
-
-$(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
-
-$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp
-
+$(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp
+
+$(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp
+
+$(OBJS)\advdll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp
+
+$(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp
+
+$(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp
+
+$(OBJS)\advdll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+
+$(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+
+$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp
+
 $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\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_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
-
-$(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
-
-$(OBJS)\advdll_msw_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
-
-$(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp
-
-$(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp
-
+$(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+
+$(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+
+$(OBJS)\advdll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+
+$(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+
+$(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+
 $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
 
@@ -15208,27 +15208,27 @@ $(OBJS)\advlib_calctrl.obj: ..\..\src\msw\calctrl.cpp
 $(OBJS)\advlib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.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_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
-
-$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
-
-$(OBJS)\advlib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.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_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_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp
+
+$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
+
+$(OBJS)\advlib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.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
 
@@ -15238,21 +15238,21 @@ $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
 $(OBJS)\advlib_gridcmn.obj: ..\..\src\common\gridcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp
 
-$(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
-
-$(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
-
-$(OBJS)\advlib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
-
-$(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
-
-$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
-
+$(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp
+
+$(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp
+
+$(OBJS)\advlib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp
+
+$(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+
+$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
+
 $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
 
@@ -15295,51 +15295,51 @@ $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
 $(OBJS)\advlib_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp
 
-$(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp
-
-$(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp
-
-$(OBJS)\advlib_generic_richtooltip.obj: ..\..\src\generic\richtooltip.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\richtooltip.cpp
-
-$(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp
-
-$(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp
-
-$(OBJS)\advlib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp
-
-$(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
-
-$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp
-
+$(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp
+
+$(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp
+
+$(OBJS)\advlib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp
+
+$(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp
+
+$(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp
+
+$(OBJS)\advlib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp
+
+$(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+
+$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp
+
 $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\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_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
-
-$(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
-
-$(OBJS)\advlib_msw_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
-
-$(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
-
-$(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp
-
+$(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+
+$(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
+
+$(OBJS)\advlib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp
+
+$(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+
+$(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+
 $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
 
@@ -15778,21 +15778,21 @@ $(OBJS)\xrcdll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\xrcdll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp
 
-$(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
-
-$(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
-
-$(OBJS)\xrcdll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
-
-$(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
-
-$(OBJS)\xrcdll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
-
+$(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
+
+$(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
+
+$(OBJS)\xrcdll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
+
+$(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\xrcdll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
 
@@ -15976,21 +15976,21 @@ $(OBJS)\xrclib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\xrclib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp
 
-$(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
-
-$(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
-
-$(OBJS)\xrclib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
-
-$(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
-
-$(OBJS)\xrclib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
-
+$(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp
+
+$(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp
+
+$(OBJS)\xrclib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp
+
+$(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\xrclib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp
 
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 86026d1817..b03ef51786 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -189,19 +189,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_xh_split.obj &
 	$(OBJS)\monodll_xh_srchctrl.obj &
 	$(OBJS)\monodll_xh_statbar.obj &
-	$(OBJS)\monodll_xh_stbmp.obj &
-	$(OBJS)\monodll_xh_stbox.obj &
-	$(OBJS)\monodll_xh_stlin.obj &
-	$(OBJS)\monodll_xh_sttxt.obj &
-	$(OBJS)\monodll_xh_text.obj &
-	$(OBJS)\monodll_xh_tglbtn.obj &
-	$(OBJS)\monodll_xh_timectrl.obj &
-	$(OBJS)\monodll_xh_toolb.obj &
-	$(OBJS)\monodll_xh_toolbk.obj &
-	$(OBJS)\monodll_xh_tree.obj &
-	$(OBJS)\monodll_xh_treebk.obj &
-	$(OBJS)\monodll_xh_unkwn.obj &
-	$(OBJS)\monodll_xh_wizrd.obj &
+	$(OBJS)\monodll_xh_stbmp.obj &
+	$(OBJS)\monodll_xh_stbox.obj &
+	$(OBJS)\monodll_xh_stlin.obj &
+	$(OBJS)\monodll_xh_sttxt.obj &
+	$(OBJS)\monodll_xh_text.obj &
+	$(OBJS)\monodll_xh_tglbtn.obj &
+	$(OBJS)\monodll_xh_timectrl.obj &
+	$(OBJS)\monodll_xh_toolb.obj &
+	$(OBJS)\monodll_xh_toolbk.obj &
+	$(OBJS)\monodll_xh_tree.obj &
+	$(OBJS)\monodll_xh_treebk.obj &
+	$(OBJS)\monodll_xh_unkwn.obj &
+	$(OBJS)\monodll_xh_wizrd.obj &
 	$(OBJS)\monodll_xmlres.obj &
 	$(OBJS)\monodll_xmladv.obj &
 	$(OBJS)\monodll_xmlrsall.obj &
@@ -269,19 +269,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_fontenum.obj &
 	$(OBJS)\monodll_fontutil.obj &
 	$(OBJS)\monodll_gdiimage.obj &
-	$(OBJS)\monodll_gdiobj.obj &
-	$(OBJS)\monodll_gdiplus.obj &
-	$(OBJS)\monodll_graphics.obj &
-	$(OBJS)\monodll_icon.obj &
-	$(OBJS)\monodll_imaglist.obj &
-	$(OBJS)\monodll_minifram.obj &
-	$(OBJS)\monodll_nonownedwnd.obj &
-	$(OBJS)\monodll_dataobj.obj &
-	$(OBJS)\monodll_dropsrc.obj &
-	$(OBJS)\monodll_droptgt.obj &
-	$(OBJS)\monodll_oleutils.obj &
-	$(OBJS)\monodll_palette.obj &
-	$(OBJS)\monodll_pen.obj &
+	$(OBJS)\monodll_gdiobj.obj &
+	$(OBJS)\monodll_gdiplus.obj &
+	$(OBJS)\monodll_graphics.obj &
+	$(OBJS)\monodll_icon.obj &
+	$(OBJS)\monodll_imaglist.obj &
+	$(OBJS)\monodll_minifram.obj &
+	$(OBJS)\monodll_nonownedwnd.obj &
+	$(OBJS)\monodll_dataobj.obj &
+	$(OBJS)\monodll_dropsrc.obj &
+	$(OBJS)\monodll_droptgt.obj &
+	$(OBJS)\monodll_oleutils.obj &
+	$(OBJS)\monodll_palette.obj &
+	$(OBJS)\monodll_pen.obj &
 	$(OBJS)\monodll_popupwin.obj &
 	$(OBJS)\monodll_printdlg.obj &
 	$(OBJS)\monodll_printwin.obj &
@@ -543,19 +543,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_fontenum.obj &
 	$(OBJS)\monodll_fontutil.obj &
 	$(OBJS)\monodll_gdiimage.obj &
-	$(OBJS)\monodll_gdiobj.obj &
-	$(OBJS)\monodll_gdiplus.obj &
-	$(OBJS)\monodll_graphics.obj &
-	$(OBJS)\monodll_icon.obj &
-	$(OBJS)\monodll_imaglist.obj &
-	$(OBJS)\monodll_minifram.obj &
-	$(OBJS)\monodll_nonownedwnd.obj &
-	$(OBJS)\monodll_dataobj.obj &
-	$(OBJS)\monodll_dropsrc.obj &
-	$(OBJS)\monodll_droptgt.obj &
-	$(OBJS)\monodll_oleutils.obj &
-	$(OBJS)\monodll_palette.obj &
-	$(OBJS)\monodll_pen.obj &
+	$(OBJS)\monodll_gdiobj.obj &
+	$(OBJS)\monodll_gdiplus.obj &
+	$(OBJS)\monodll_graphics.obj &
+	$(OBJS)\monodll_icon.obj &
+	$(OBJS)\monodll_imaglist.obj &
+	$(OBJS)\monodll_minifram.obj &
+	$(OBJS)\monodll_nonownedwnd.obj &
+	$(OBJS)\monodll_dataobj.obj &
+	$(OBJS)\monodll_dropsrc.obj &
+	$(OBJS)\monodll_droptgt.obj &
+	$(OBJS)\monodll_oleutils.obj &
+	$(OBJS)\monodll_palette.obj &
+	$(OBJS)\monodll_pen.obj &
 	$(OBJS)\monodll_popupwin.obj &
 	$(OBJS)\monodll_printdlg.obj &
 	$(OBJS)\monodll_printwin.obj &
@@ -790,100 +790,100 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =
 !ifeq WXUNIV 0
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_animatecmn.obj &
-	$(OBJS)\monodll_bmpcboxcmn.obj &
-	$(OBJS)\monodll_calctrlcmn.obj &
-	$(OBJS)\monodll_datavcmn.obj &
-	$(OBJS)\monodll_gridcmn.obj &
-	$(OBJS)\monodll_hyperlnkcmn.obj &
-	$(OBJS)\monodll_odcombocmn.obj &
-	$(OBJS)\monodll_richtooltipcmn.obj &
-	$(OBJS)\monodll_aboutdlgg.obj &
-	$(OBJS)\monodll_bannerwindow.obj &
-	$(OBJS)\monodll_bmpcboxg.obj &
-	$(OBJS)\monodll_calctrlg.obj &
-	$(OBJS)\monodll_commandlinkbuttong.obj &
-	$(OBJS)\monodll_datavgen.obj &
+	$(OBJS)\monodll_bmpcboxcmn.obj &
+	$(OBJS)\monodll_calctrlcmn.obj &
+	$(OBJS)\monodll_datavcmn.obj &
+	$(OBJS)\monodll_gridcmn.obj &
+	$(OBJS)\monodll_hyperlnkcmn.obj &
+	$(OBJS)\monodll_odcombocmn.obj &
+	$(OBJS)\monodll_richtooltipcmn.obj &
+	$(OBJS)\monodll_aboutdlgg.obj &
+	$(OBJS)\monodll_bannerwindow.obj &
+	$(OBJS)\monodll_bmpcboxg.obj &
+	$(OBJS)\monodll_calctrlg.obj &
+	$(OBJS)\monodll_commandlinkbuttong.obj &
+	$(OBJS)\monodll_datavgen.obj &
 	$(OBJS)\monodll_datectlg.obj &
 	$(OBJS)\monodll_editlbox.obj &
 	$(OBJS)\monodll_grid.obj &
 	$(OBJS)\monodll_gridctrl.obj &
 	$(OBJS)\monodll_grideditors.obj &
 	$(OBJS)\monodll_gridsel.obj &
-	$(OBJS)\monodll_helpext.obj &
-	$(OBJS)\monodll_hyperlinkg.obj &
-	$(OBJS)\monodll_laywin.obj &
-	$(OBJS)\monodll_notifmsgg.obj &
-	$(OBJS)\monodll_odcombo.obj &
-	$(OBJS)\monodll_propdlg.obj &
-	$(OBJS)\monodll_generic_richtooltip.obj &
-	$(OBJS)\monodll_sashwin.obj &
-	$(OBJS)\monodll_splash.obj &
-	$(OBJS)\monodll_generic_timectrl.obj &
-	$(OBJS)\monodll_tipdlg.obj &
-	$(OBJS)\monodll_treelist.obj &
-	$(OBJS)\monodll_wizard.obj &
-	$(OBJS)\monodll_taskbarcmn.obj &
-	$(OBJS)\monodll_aboutdlg.obj &
-	$(OBJS)\monodll_notifmsg.obj &
-	$(OBJS)\monodll_msw_richtooltip.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_commandlinkbutton.obj &
-	$(OBJS)\monodll_datecontrols.obj &
-	$(OBJS)\monodll_datectrl.obj &
-	$(OBJS)\monodll_datetimectrl.obj &
-	$(OBJS)\monodll_hyperlink.obj &
-	$(OBJS)\monodll_msw_timectrl.obj
-!endif
-!ifeq WXUNIV 1
-____ADVANCED_SRC_FILENAMES_OBJECTS =  &
-	$(OBJS)\monodll_animatecmn.obj &
-	$(OBJS)\monodll_bmpcboxcmn.obj &
-	$(OBJS)\monodll_calctrlcmn.obj &
-	$(OBJS)\monodll_datavcmn.obj &
-	$(OBJS)\monodll_gridcmn.obj &
-	$(OBJS)\monodll_hyperlnkcmn.obj &
-	$(OBJS)\monodll_odcombocmn.obj &
-	$(OBJS)\monodll_richtooltipcmn.obj &
-	$(OBJS)\monodll_aboutdlgg.obj &
-	$(OBJS)\monodll_bannerwindow.obj &
-	$(OBJS)\monodll_bmpcboxg.obj &
-	$(OBJS)\monodll_calctrlg.obj &
-	$(OBJS)\monodll_commandlinkbuttong.obj &
-	$(OBJS)\monodll_datavgen.obj &
+	$(OBJS)\monodll_helpext.obj &
+	$(OBJS)\monodll_hyperlinkg.obj &
+	$(OBJS)\monodll_laywin.obj &
+	$(OBJS)\monodll_notifmsgg.obj &
+	$(OBJS)\monodll_odcombo.obj &
+	$(OBJS)\monodll_propdlg.obj &
+	$(OBJS)\monodll_richtooltipg.obj &
+	$(OBJS)\monodll_sashwin.obj &
+	$(OBJS)\monodll_splash.obj &
+	$(OBJS)\monodll_generic_timectrl.obj &
+	$(OBJS)\monodll_tipdlg.obj &
+	$(OBJS)\monodll_treelist.obj &
+	$(OBJS)\monodll_wizard.obj &
+	$(OBJS)\monodll_taskbarcmn.obj &
+	$(OBJS)\monodll_aboutdlg.obj &
+	$(OBJS)\monodll_notifmsg.obj &
+	$(OBJS)\monodll_richtooltip.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_commandlinkbutton.obj &
+	$(OBJS)\monodll_datecontrols.obj &
+	$(OBJS)\monodll_datectrl.obj &
+	$(OBJS)\monodll_datetimectrl.obj &
+	$(OBJS)\monodll_hyperlink.obj &
+	$(OBJS)\monodll_msw_timectrl.obj
+!endif
+!ifeq WXUNIV 1
+____ADVANCED_SRC_FILENAMES_OBJECTS =  &
+	$(OBJS)\monodll_animatecmn.obj &
+	$(OBJS)\monodll_bmpcboxcmn.obj &
+	$(OBJS)\monodll_calctrlcmn.obj &
+	$(OBJS)\monodll_datavcmn.obj &
+	$(OBJS)\monodll_gridcmn.obj &
+	$(OBJS)\monodll_hyperlnkcmn.obj &
+	$(OBJS)\monodll_odcombocmn.obj &
+	$(OBJS)\monodll_richtooltipcmn.obj &
+	$(OBJS)\monodll_aboutdlgg.obj &
+	$(OBJS)\monodll_bannerwindow.obj &
+	$(OBJS)\monodll_bmpcboxg.obj &
+	$(OBJS)\monodll_calctrlg.obj &
+	$(OBJS)\monodll_commandlinkbuttong.obj &
+	$(OBJS)\monodll_datavgen.obj &
 	$(OBJS)\monodll_datectlg.obj &
 	$(OBJS)\monodll_editlbox.obj &
 	$(OBJS)\monodll_grid.obj &
 	$(OBJS)\monodll_gridctrl.obj &
 	$(OBJS)\monodll_grideditors.obj &
 	$(OBJS)\monodll_gridsel.obj &
-	$(OBJS)\monodll_helpext.obj &
-	$(OBJS)\monodll_hyperlinkg.obj &
-	$(OBJS)\monodll_laywin.obj &
-	$(OBJS)\monodll_notifmsgg.obj &
-	$(OBJS)\monodll_odcombo.obj &
-	$(OBJS)\monodll_propdlg.obj &
-	$(OBJS)\monodll_generic_richtooltip.obj &
-	$(OBJS)\monodll_sashwin.obj &
-	$(OBJS)\monodll_splash.obj &
-	$(OBJS)\monodll_generic_timectrl.obj &
-	$(OBJS)\monodll_tipdlg.obj &
-	$(OBJS)\monodll_treelist.obj &
-	$(OBJS)\monodll_wizard.obj &
-	$(OBJS)\monodll_taskbarcmn.obj &
-	$(OBJS)\monodll_aboutdlg.obj &
-	$(OBJS)\monodll_notifmsg.obj &
-	$(OBJS)\monodll_msw_richtooltip.obj &
-	$(OBJS)\monodll_sound.obj &
-	$(OBJS)\monodll_taskbar.obj &
-	$(OBJS)\monodll_joystick.obj &
-	$(OBJS)\monodll_animateg.obj
-!endif
-__wxscintilla_library_link_DEP =
+	$(OBJS)\monodll_helpext.obj &
+	$(OBJS)\monodll_hyperlinkg.obj &
+	$(OBJS)\monodll_laywin.obj &
+	$(OBJS)\monodll_notifmsgg.obj &
+	$(OBJS)\monodll_odcombo.obj &
+	$(OBJS)\monodll_propdlg.obj &
+	$(OBJS)\monodll_richtooltipg.obj &
+	$(OBJS)\monodll_sashwin.obj &
+	$(OBJS)\monodll_splash.obj &
+	$(OBJS)\monodll_generic_timectrl.obj &
+	$(OBJS)\monodll_tipdlg.obj &
+	$(OBJS)\monodll_treelist.obj &
+	$(OBJS)\monodll_wizard.obj &
+	$(OBJS)\monodll_taskbarcmn.obj &
+	$(OBJS)\monodll_aboutdlg.obj &
+	$(OBJS)\monodll_notifmsg.obj &
+	$(OBJS)\monodll_richtooltip.obj &
+	$(OBJS)\monodll_sound.obj &
+	$(OBJS)\monodll_taskbar.obj &
+	$(OBJS)\monodll_joystick.obj &
+	$(OBJS)\monodll_animateg.obj
+!endif
+__wxscintilla_library_link_DEP =
 !ifeq USE_STC 1
 __wxscintilla_library_link_DEP = $(__wxscintilla)
 !endif
@@ -983,19 +983,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_xh_split.obj &
 	$(OBJS)\monolib_xh_srchctrl.obj &
 	$(OBJS)\monolib_xh_statbar.obj &
-	$(OBJS)\monolib_xh_stbmp.obj &
-	$(OBJS)\monolib_xh_stbox.obj &
-	$(OBJS)\monolib_xh_stlin.obj &
-	$(OBJS)\monolib_xh_sttxt.obj &
-	$(OBJS)\monolib_xh_text.obj &
-	$(OBJS)\monolib_xh_tglbtn.obj &
-	$(OBJS)\monolib_xh_timectrl.obj &
-	$(OBJS)\monolib_xh_toolb.obj &
-	$(OBJS)\monolib_xh_toolbk.obj &
-	$(OBJS)\monolib_xh_tree.obj &
-	$(OBJS)\monolib_xh_treebk.obj &
-	$(OBJS)\monolib_xh_unkwn.obj &
-	$(OBJS)\monolib_xh_wizrd.obj &
+	$(OBJS)\monolib_xh_stbmp.obj &
+	$(OBJS)\monolib_xh_stbox.obj &
+	$(OBJS)\monolib_xh_stlin.obj &
+	$(OBJS)\monolib_xh_sttxt.obj &
+	$(OBJS)\monolib_xh_text.obj &
+	$(OBJS)\monolib_xh_tglbtn.obj &
+	$(OBJS)\monolib_xh_timectrl.obj &
+	$(OBJS)\monolib_xh_toolb.obj &
+	$(OBJS)\monolib_xh_toolbk.obj &
+	$(OBJS)\monolib_xh_tree.obj &
+	$(OBJS)\monolib_xh_treebk.obj &
+	$(OBJS)\monolib_xh_unkwn.obj &
+	$(OBJS)\monolib_xh_wizrd.obj &
 	$(OBJS)\monolib_xmlres.obj &
 	$(OBJS)\monolib_xmladv.obj &
 	$(OBJS)\monolib_xmlrsall.obj &
@@ -1063,19 +1063,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_fontenum.obj &
 	$(OBJS)\monolib_fontutil.obj &
 	$(OBJS)\monolib_gdiimage.obj &
-	$(OBJS)\monolib_gdiobj.obj &
-	$(OBJS)\monolib_gdiplus.obj &
-	$(OBJS)\monolib_graphics.obj &
-	$(OBJS)\monolib_icon.obj &
-	$(OBJS)\monolib_imaglist.obj &
-	$(OBJS)\monolib_minifram.obj &
-	$(OBJS)\monolib_nonownedwnd.obj &
-	$(OBJS)\monolib_dataobj.obj &
-	$(OBJS)\monolib_dropsrc.obj &
-	$(OBJS)\monolib_droptgt.obj &
-	$(OBJS)\monolib_oleutils.obj &
-	$(OBJS)\monolib_palette.obj &
-	$(OBJS)\monolib_pen.obj &
+	$(OBJS)\monolib_gdiobj.obj &
+	$(OBJS)\monolib_gdiplus.obj &
+	$(OBJS)\monolib_graphics.obj &
+	$(OBJS)\monolib_icon.obj &
+	$(OBJS)\monolib_imaglist.obj &
+	$(OBJS)\monolib_minifram.obj &
+	$(OBJS)\monolib_nonownedwnd.obj &
+	$(OBJS)\monolib_dataobj.obj &
+	$(OBJS)\monolib_dropsrc.obj &
+	$(OBJS)\monolib_droptgt.obj &
+	$(OBJS)\monolib_oleutils.obj &
+	$(OBJS)\monolib_palette.obj &
+	$(OBJS)\monolib_pen.obj &
 	$(OBJS)\monolib_popupwin.obj &
 	$(OBJS)\monolib_printdlg.obj &
 	$(OBJS)\monolib_printwin.obj &
@@ -1337,19 +1337,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_fontenum.obj &
 	$(OBJS)\monolib_fontutil.obj &
 	$(OBJS)\monolib_gdiimage.obj &
-	$(OBJS)\monolib_gdiobj.obj &
-	$(OBJS)\monolib_gdiplus.obj &
-	$(OBJS)\monolib_graphics.obj &
-	$(OBJS)\monolib_icon.obj &
-	$(OBJS)\monolib_imaglist.obj &
-	$(OBJS)\monolib_minifram.obj &
-	$(OBJS)\monolib_nonownedwnd.obj &
-	$(OBJS)\monolib_dataobj.obj &
-	$(OBJS)\monolib_dropsrc.obj &
-	$(OBJS)\monolib_droptgt.obj &
-	$(OBJS)\monolib_oleutils.obj &
-	$(OBJS)\monolib_palette.obj &
-	$(OBJS)\monolib_pen.obj &
+	$(OBJS)\monolib_gdiobj.obj &
+	$(OBJS)\monolib_gdiplus.obj &
+	$(OBJS)\monolib_graphics.obj &
+	$(OBJS)\monolib_icon.obj &
+	$(OBJS)\monolib_imaglist.obj &
+	$(OBJS)\monolib_minifram.obj &
+	$(OBJS)\monolib_nonownedwnd.obj &
+	$(OBJS)\monolib_dataobj.obj &
+	$(OBJS)\monolib_dropsrc.obj &
+	$(OBJS)\monolib_droptgt.obj &
+	$(OBJS)\monolib_oleutils.obj &
+	$(OBJS)\monolib_palette.obj &
+	$(OBJS)\monolib_pen.obj &
 	$(OBJS)\monolib_popupwin.obj &
 	$(OBJS)\monolib_printdlg.obj &
 	$(OBJS)\monolib_printwin.obj &
@@ -1584,100 +1584,100 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =
 !ifeq 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_gridcmn.obj &
-	$(OBJS)\monolib_hyperlnkcmn.obj &
-	$(OBJS)\monolib_odcombocmn.obj &
-	$(OBJS)\monolib_richtooltipcmn.obj &
-	$(OBJS)\monolib_aboutdlgg.obj &
-	$(OBJS)\monolib_bannerwindow.obj &
-	$(OBJS)\monolib_bmpcboxg.obj &
-	$(OBJS)\monolib_calctrlg.obj &
-	$(OBJS)\monolib_commandlinkbuttong.obj &
-	$(OBJS)\monolib_datavgen.obj &
+	$(OBJS)\monolib_bmpcboxcmn.obj &
+	$(OBJS)\monolib_calctrlcmn.obj &
+	$(OBJS)\monolib_datavcmn.obj &
+	$(OBJS)\monolib_gridcmn.obj &
+	$(OBJS)\monolib_hyperlnkcmn.obj &
+	$(OBJS)\monolib_odcombocmn.obj &
+	$(OBJS)\monolib_richtooltipcmn.obj &
+	$(OBJS)\monolib_aboutdlgg.obj &
+	$(OBJS)\monolib_bannerwindow.obj &
+	$(OBJS)\monolib_bmpcboxg.obj &
+	$(OBJS)\monolib_calctrlg.obj &
+	$(OBJS)\monolib_commandlinkbuttong.obj &
+	$(OBJS)\monolib_datavgen.obj &
 	$(OBJS)\monolib_datectlg.obj &
 	$(OBJS)\monolib_editlbox.obj &
 	$(OBJS)\monolib_grid.obj &
 	$(OBJS)\monolib_gridctrl.obj &
 	$(OBJS)\monolib_grideditors.obj &
 	$(OBJS)\monolib_gridsel.obj &
-	$(OBJS)\monolib_helpext.obj &
-	$(OBJS)\monolib_hyperlinkg.obj &
-	$(OBJS)\monolib_laywin.obj &
-	$(OBJS)\monolib_notifmsgg.obj &
-	$(OBJS)\monolib_odcombo.obj &
-	$(OBJS)\monolib_propdlg.obj &
-	$(OBJS)\monolib_generic_richtooltip.obj &
-	$(OBJS)\monolib_sashwin.obj &
-	$(OBJS)\monolib_splash.obj &
-	$(OBJS)\monolib_generic_timectrl.obj &
-	$(OBJS)\monolib_tipdlg.obj &
-	$(OBJS)\monolib_treelist.obj &
-	$(OBJS)\monolib_wizard.obj &
-	$(OBJS)\monolib_taskbarcmn.obj &
-	$(OBJS)\monolib_aboutdlg.obj &
-	$(OBJS)\monolib_notifmsg.obj &
-	$(OBJS)\monolib_msw_richtooltip.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_commandlinkbutton.obj &
-	$(OBJS)\monolib_datecontrols.obj &
-	$(OBJS)\monolib_datectrl.obj &
-	$(OBJS)\monolib_datetimectrl.obj &
-	$(OBJS)\monolib_hyperlink.obj &
-	$(OBJS)\monolib_msw_timectrl.obj
-!endif
-!ifeq 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_gridcmn.obj &
-	$(OBJS)\monolib_hyperlnkcmn.obj &
-	$(OBJS)\monolib_odcombocmn.obj &
-	$(OBJS)\monolib_richtooltipcmn.obj &
-	$(OBJS)\monolib_aboutdlgg.obj &
-	$(OBJS)\monolib_bannerwindow.obj &
-	$(OBJS)\monolib_bmpcboxg.obj &
-	$(OBJS)\monolib_calctrlg.obj &
-	$(OBJS)\monolib_commandlinkbuttong.obj &
-	$(OBJS)\monolib_datavgen.obj &
+	$(OBJS)\monolib_helpext.obj &
+	$(OBJS)\monolib_hyperlinkg.obj &
+	$(OBJS)\monolib_laywin.obj &
+	$(OBJS)\monolib_notifmsgg.obj &
+	$(OBJS)\monolib_odcombo.obj &
+	$(OBJS)\monolib_propdlg.obj &
+	$(OBJS)\monolib_richtooltipg.obj &
+	$(OBJS)\monolib_sashwin.obj &
+	$(OBJS)\monolib_splash.obj &
+	$(OBJS)\monolib_generic_timectrl.obj &
+	$(OBJS)\monolib_tipdlg.obj &
+	$(OBJS)\monolib_treelist.obj &
+	$(OBJS)\monolib_wizard.obj &
+	$(OBJS)\monolib_taskbarcmn.obj &
+	$(OBJS)\monolib_aboutdlg.obj &
+	$(OBJS)\monolib_notifmsg.obj &
+	$(OBJS)\monolib_richtooltip.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_commandlinkbutton.obj &
+	$(OBJS)\monolib_datecontrols.obj &
+	$(OBJS)\monolib_datectrl.obj &
+	$(OBJS)\monolib_datetimectrl.obj &
+	$(OBJS)\monolib_hyperlink.obj &
+	$(OBJS)\monolib_msw_timectrl.obj
+!endif
+!ifeq 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_gridcmn.obj &
+	$(OBJS)\monolib_hyperlnkcmn.obj &
+	$(OBJS)\monolib_odcombocmn.obj &
+	$(OBJS)\monolib_richtooltipcmn.obj &
+	$(OBJS)\monolib_aboutdlgg.obj &
+	$(OBJS)\monolib_bannerwindow.obj &
+	$(OBJS)\monolib_bmpcboxg.obj &
+	$(OBJS)\monolib_calctrlg.obj &
+	$(OBJS)\monolib_commandlinkbuttong.obj &
+	$(OBJS)\monolib_datavgen.obj &
 	$(OBJS)\monolib_datectlg.obj &
 	$(OBJS)\monolib_editlbox.obj &
 	$(OBJS)\monolib_grid.obj &
 	$(OBJS)\monolib_gridctrl.obj &
 	$(OBJS)\monolib_grideditors.obj &
 	$(OBJS)\monolib_gridsel.obj &
-	$(OBJS)\monolib_helpext.obj &
-	$(OBJS)\monolib_hyperlinkg.obj &
-	$(OBJS)\monolib_laywin.obj &
-	$(OBJS)\monolib_notifmsgg.obj &
-	$(OBJS)\monolib_odcombo.obj &
-	$(OBJS)\monolib_propdlg.obj &
-	$(OBJS)\monolib_generic_richtooltip.obj &
-	$(OBJS)\monolib_sashwin.obj &
-	$(OBJS)\monolib_splash.obj &
-	$(OBJS)\monolib_generic_timectrl.obj &
-	$(OBJS)\monolib_tipdlg.obj &
-	$(OBJS)\monolib_treelist.obj &
-	$(OBJS)\monolib_wizard.obj &
-	$(OBJS)\monolib_taskbarcmn.obj &
-	$(OBJS)\monolib_aboutdlg.obj &
-	$(OBJS)\monolib_notifmsg.obj &
-	$(OBJS)\monolib_msw_richtooltip.obj &
-	$(OBJS)\monolib_sound.obj &
-	$(OBJS)\monolib_taskbar.obj &
-	$(OBJS)\monolib_joystick.obj &
-	$(OBJS)\monolib_animateg.obj
-!endif
-__basedll___depname =
+	$(OBJS)\monolib_helpext.obj &
+	$(OBJS)\monolib_hyperlinkg.obj &
+	$(OBJS)\monolib_laywin.obj &
+	$(OBJS)\monolib_notifmsgg.obj &
+	$(OBJS)\monolib_odcombo.obj &
+	$(OBJS)\monolib_propdlg.obj &
+	$(OBJS)\monolib_richtooltipg.obj &
+	$(OBJS)\monolib_sashwin.obj &
+	$(OBJS)\monolib_splash.obj &
+	$(OBJS)\monolib_generic_timectrl.obj &
+	$(OBJS)\monolib_tipdlg.obj &
+	$(OBJS)\monolib_treelist.obj &
+	$(OBJS)\monolib_wizard.obj &
+	$(OBJS)\monolib_taskbarcmn.obj &
+	$(OBJS)\monolib_aboutdlg.obj &
+	$(OBJS)\monolib_notifmsg.obj &
+	$(OBJS)\monolib_richtooltip.obj &
+	$(OBJS)\monolib_sound.obj &
+	$(OBJS)\monolib_taskbar.obj &
+	$(OBJS)\monolib_joystick.obj &
+	$(OBJS)\monolib_animateg.obj
+!endif
+__basedll___depname =
 !ifeq MONOLITHIC 0
 !ifeq SHARED 1
 __basedll___depname = &
@@ -1756,19 +1756,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_fontenum.obj &
 	$(OBJS)\coredll_fontutil.obj &
 	$(OBJS)\coredll_gdiimage.obj &
-	$(OBJS)\coredll_gdiobj.obj &
-	$(OBJS)\coredll_gdiplus.obj &
-	$(OBJS)\coredll_graphics.obj &
-	$(OBJS)\coredll_icon.obj &
-	$(OBJS)\coredll_imaglist.obj &
-	$(OBJS)\coredll_minifram.obj &
-	$(OBJS)\coredll_nonownedwnd.obj &
-	$(OBJS)\coredll_dataobj.obj &
-	$(OBJS)\coredll_dropsrc.obj &
-	$(OBJS)\coredll_droptgt.obj &
-	$(OBJS)\coredll_oleutils.obj &
-	$(OBJS)\coredll_palette.obj &
-	$(OBJS)\coredll_pen.obj &
+	$(OBJS)\coredll_gdiobj.obj &
+	$(OBJS)\coredll_gdiplus.obj &
+	$(OBJS)\coredll_graphics.obj &
+	$(OBJS)\coredll_icon.obj &
+	$(OBJS)\coredll_imaglist.obj &
+	$(OBJS)\coredll_minifram.obj &
+	$(OBJS)\coredll_nonownedwnd.obj &
+	$(OBJS)\coredll_dataobj.obj &
+	$(OBJS)\coredll_dropsrc.obj &
+	$(OBJS)\coredll_droptgt.obj &
+	$(OBJS)\coredll_oleutils.obj &
+	$(OBJS)\coredll_palette.obj &
+	$(OBJS)\coredll_pen.obj &
 	$(OBJS)\coredll_popupwin.obj &
 	$(OBJS)\coredll_printdlg.obj &
 	$(OBJS)\coredll_printwin.obj &
@@ -2030,19 +2030,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_fontenum.obj &
 	$(OBJS)\coredll_fontutil.obj &
 	$(OBJS)\coredll_gdiimage.obj &
-	$(OBJS)\coredll_gdiobj.obj &
-	$(OBJS)\coredll_gdiplus.obj &
-	$(OBJS)\coredll_graphics.obj &
-	$(OBJS)\coredll_icon.obj &
-	$(OBJS)\coredll_imaglist.obj &
-	$(OBJS)\coredll_minifram.obj &
-	$(OBJS)\coredll_nonownedwnd.obj &
-	$(OBJS)\coredll_dataobj.obj &
-	$(OBJS)\coredll_dropsrc.obj &
-	$(OBJS)\coredll_droptgt.obj &
-	$(OBJS)\coredll_oleutils.obj &
-	$(OBJS)\coredll_palette.obj &
-	$(OBJS)\coredll_pen.obj &
+	$(OBJS)\coredll_gdiobj.obj &
+	$(OBJS)\coredll_gdiplus.obj &
+	$(OBJS)\coredll_graphics.obj &
+	$(OBJS)\coredll_icon.obj &
+	$(OBJS)\coredll_imaglist.obj &
+	$(OBJS)\coredll_minifram.obj &
+	$(OBJS)\coredll_nonownedwnd.obj &
+	$(OBJS)\coredll_dataobj.obj &
+	$(OBJS)\coredll_dropsrc.obj &
+	$(OBJS)\coredll_droptgt.obj &
+	$(OBJS)\coredll_oleutils.obj &
+	$(OBJS)\coredll_palette.obj &
+	$(OBJS)\coredll_pen.obj &
 	$(OBJS)\coredll_popupwin.obj &
 	$(OBJS)\coredll_printdlg.obj &
 	$(OBJS)\coredll_printwin.obj &
@@ -2308,19 +2308,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_fontenum.obj &
 	$(OBJS)\corelib_fontutil.obj &
 	$(OBJS)\corelib_gdiimage.obj &
-	$(OBJS)\corelib_gdiobj.obj &
-	$(OBJS)\corelib_gdiplus.obj &
-	$(OBJS)\corelib_graphics.obj &
-	$(OBJS)\corelib_icon.obj &
-	$(OBJS)\corelib_imaglist.obj &
-	$(OBJS)\corelib_minifram.obj &
-	$(OBJS)\corelib_nonownedwnd.obj &
-	$(OBJS)\corelib_dataobj.obj &
-	$(OBJS)\corelib_dropsrc.obj &
-	$(OBJS)\corelib_droptgt.obj &
-	$(OBJS)\corelib_oleutils.obj &
-	$(OBJS)\corelib_palette.obj &
-	$(OBJS)\corelib_pen.obj &
+	$(OBJS)\corelib_gdiobj.obj &
+	$(OBJS)\corelib_gdiplus.obj &
+	$(OBJS)\corelib_graphics.obj &
+	$(OBJS)\corelib_icon.obj &
+	$(OBJS)\corelib_imaglist.obj &
+	$(OBJS)\corelib_minifram.obj &
+	$(OBJS)\corelib_nonownedwnd.obj &
+	$(OBJS)\corelib_dataobj.obj &
+	$(OBJS)\corelib_dropsrc.obj &
+	$(OBJS)\corelib_droptgt.obj &
+	$(OBJS)\corelib_oleutils.obj &
+	$(OBJS)\corelib_palette.obj &
+	$(OBJS)\corelib_pen.obj &
 	$(OBJS)\corelib_popupwin.obj &
 	$(OBJS)\corelib_printdlg.obj &
 	$(OBJS)\corelib_printwin.obj &
@@ -2582,19 +2582,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_fontenum.obj &
 	$(OBJS)\corelib_fontutil.obj &
 	$(OBJS)\corelib_gdiimage.obj &
-	$(OBJS)\corelib_gdiobj.obj &
-	$(OBJS)\corelib_gdiplus.obj &
-	$(OBJS)\corelib_graphics.obj &
-	$(OBJS)\corelib_icon.obj &
-	$(OBJS)\corelib_imaglist.obj &
-	$(OBJS)\corelib_minifram.obj &
-	$(OBJS)\corelib_nonownedwnd.obj &
-	$(OBJS)\corelib_dataobj.obj &
-	$(OBJS)\corelib_dropsrc.obj &
-	$(OBJS)\corelib_droptgt.obj &
-	$(OBJS)\corelib_oleutils.obj &
-	$(OBJS)\corelib_palette.obj &
-	$(OBJS)\corelib_pen.obj &
+	$(OBJS)\corelib_gdiobj.obj &
+	$(OBJS)\corelib_gdiplus.obj &
+	$(OBJS)\corelib_graphics.obj &
+	$(OBJS)\corelib_icon.obj &
+	$(OBJS)\corelib_imaglist.obj &
+	$(OBJS)\corelib_minifram.obj &
+	$(OBJS)\corelib_nonownedwnd.obj &
+	$(OBJS)\corelib_dataobj.obj &
+	$(OBJS)\corelib_dropsrc.obj &
+	$(OBJS)\corelib_droptgt.obj &
+	$(OBJS)\corelib_oleutils.obj &
+	$(OBJS)\corelib_palette.obj &
+	$(OBJS)\corelib_pen.obj &
 	$(OBJS)\corelib_popupwin.obj &
 	$(OBJS)\corelib_printdlg.obj &
 	$(OBJS)\corelib_printwin.obj &
@@ -2846,100 +2846,100 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =
 !ifeq 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_gridcmn.obj &
-	$(OBJS)\advdll_hyperlnkcmn.obj &
-	$(OBJS)\advdll_odcombocmn.obj &
-	$(OBJS)\advdll_richtooltipcmn.obj &
-	$(OBJS)\advdll_aboutdlgg.obj &
-	$(OBJS)\advdll_bannerwindow.obj &
-	$(OBJS)\advdll_bmpcboxg.obj &
-	$(OBJS)\advdll_calctrlg.obj &
-	$(OBJS)\advdll_commandlinkbuttong.obj &
-	$(OBJS)\advdll_datavgen.obj &
+	$(OBJS)\advdll_bmpcboxcmn.obj &
+	$(OBJS)\advdll_calctrlcmn.obj &
+	$(OBJS)\advdll_datavcmn.obj &
+	$(OBJS)\advdll_gridcmn.obj &
+	$(OBJS)\advdll_hyperlnkcmn.obj &
+	$(OBJS)\advdll_odcombocmn.obj &
+	$(OBJS)\advdll_richtooltipcmn.obj &
+	$(OBJS)\advdll_aboutdlgg.obj &
+	$(OBJS)\advdll_bannerwindow.obj &
+	$(OBJS)\advdll_bmpcboxg.obj &
+	$(OBJS)\advdll_calctrlg.obj &
+	$(OBJS)\advdll_commandlinkbuttong.obj &
+	$(OBJS)\advdll_datavgen.obj &
 	$(OBJS)\advdll_datectlg.obj &
 	$(OBJS)\advdll_editlbox.obj &
 	$(OBJS)\advdll_grid.obj &
 	$(OBJS)\advdll_gridctrl.obj &
 	$(OBJS)\advdll_grideditors.obj &
 	$(OBJS)\advdll_gridsel.obj &
-	$(OBJS)\advdll_helpext.obj &
-	$(OBJS)\advdll_hyperlinkg.obj &
-	$(OBJS)\advdll_laywin.obj &
-	$(OBJS)\advdll_notifmsgg.obj &
-	$(OBJS)\advdll_odcombo.obj &
-	$(OBJS)\advdll_propdlg.obj &
-	$(OBJS)\advdll_generic_richtooltip.obj &
-	$(OBJS)\advdll_sashwin.obj &
-	$(OBJS)\advdll_splash.obj &
-	$(OBJS)\advdll_generic_timectrl.obj &
-	$(OBJS)\advdll_tipdlg.obj &
-	$(OBJS)\advdll_treelist.obj &
-	$(OBJS)\advdll_wizard.obj &
-	$(OBJS)\advdll_taskbarcmn.obj &
-	$(OBJS)\advdll_aboutdlg.obj &
-	$(OBJS)\advdll_notifmsg.obj &
-	$(OBJS)\advdll_msw_richtooltip.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_commandlinkbutton.obj &
-	$(OBJS)\advdll_datecontrols.obj &
-	$(OBJS)\advdll_datectrl.obj &
-	$(OBJS)\advdll_datetimectrl.obj &
-	$(OBJS)\advdll_hyperlink.obj &
-	$(OBJS)\advdll_msw_timectrl.obj
-!endif
-!ifeq 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_gridcmn.obj &
-	$(OBJS)\advdll_hyperlnkcmn.obj &
-	$(OBJS)\advdll_odcombocmn.obj &
-	$(OBJS)\advdll_richtooltipcmn.obj &
-	$(OBJS)\advdll_aboutdlgg.obj &
-	$(OBJS)\advdll_bannerwindow.obj &
-	$(OBJS)\advdll_bmpcboxg.obj &
-	$(OBJS)\advdll_calctrlg.obj &
-	$(OBJS)\advdll_commandlinkbuttong.obj &
-	$(OBJS)\advdll_datavgen.obj &
+	$(OBJS)\advdll_helpext.obj &
+	$(OBJS)\advdll_hyperlinkg.obj &
+	$(OBJS)\advdll_laywin.obj &
+	$(OBJS)\advdll_notifmsgg.obj &
+	$(OBJS)\advdll_odcombo.obj &
+	$(OBJS)\advdll_propdlg.obj &
+	$(OBJS)\advdll_richtooltipg.obj &
+	$(OBJS)\advdll_sashwin.obj &
+	$(OBJS)\advdll_splash.obj &
+	$(OBJS)\advdll_generic_timectrl.obj &
+	$(OBJS)\advdll_tipdlg.obj &
+	$(OBJS)\advdll_treelist.obj &
+	$(OBJS)\advdll_wizard.obj &
+	$(OBJS)\advdll_taskbarcmn.obj &
+	$(OBJS)\advdll_aboutdlg.obj &
+	$(OBJS)\advdll_notifmsg.obj &
+	$(OBJS)\advdll_richtooltip.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_commandlinkbutton.obj &
+	$(OBJS)\advdll_datecontrols.obj &
+	$(OBJS)\advdll_datectrl.obj &
+	$(OBJS)\advdll_datetimectrl.obj &
+	$(OBJS)\advdll_hyperlink.obj &
+	$(OBJS)\advdll_msw_timectrl.obj
+!endif
+!ifeq 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_gridcmn.obj &
+	$(OBJS)\advdll_hyperlnkcmn.obj &
+	$(OBJS)\advdll_odcombocmn.obj &
+	$(OBJS)\advdll_richtooltipcmn.obj &
+	$(OBJS)\advdll_aboutdlgg.obj &
+	$(OBJS)\advdll_bannerwindow.obj &
+	$(OBJS)\advdll_bmpcboxg.obj &
+	$(OBJS)\advdll_calctrlg.obj &
+	$(OBJS)\advdll_commandlinkbuttong.obj &
+	$(OBJS)\advdll_datavgen.obj &
 	$(OBJS)\advdll_datectlg.obj &
 	$(OBJS)\advdll_editlbox.obj &
 	$(OBJS)\advdll_grid.obj &
 	$(OBJS)\advdll_gridctrl.obj &
 	$(OBJS)\advdll_grideditors.obj &
 	$(OBJS)\advdll_gridsel.obj &
-	$(OBJS)\advdll_helpext.obj &
-	$(OBJS)\advdll_hyperlinkg.obj &
-	$(OBJS)\advdll_laywin.obj &
-	$(OBJS)\advdll_notifmsgg.obj &
-	$(OBJS)\advdll_odcombo.obj &
-	$(OBJS)\advdll_propdlg.obj &
-	$(OBJS)\advdll_generic_richtooltip.obj &
-	$(OBJS)\advdll_sashwin.obj &
-	$(OBJS)\advdll_splash.obj &
-	$(OBJS)\advdll_generic_timectrl.obj &
-	$(OBJS)\advdll_tipdlg.obj &
-	$(OBJS)\advdll_treelist.obj &
-	$(OBJS)\advdll_wizard.obj &
-	$(OBJS)\advdll_taskbarcmn.obj &
-	$(OBJS)\advdll_aboutdlg.obj &
-	$(OBJS)\advdll_notifmsg.obj &
-	$(OBJS)\advdll_msw_richtooltip.obj &
-	$(OBJS)\advdll_sound.obj &
-	$(OBJS)\advdll_taskbar.obj &
-	$(OBJS)\advdll_joystick.obj &
-	$(OBJS)\advdll_animateg.obj
-!endif
-__advlib___depname =
+	$(OBJS)\advdll_helpext.obj &
+	$(OBJS)\advdll_hyperlinkg.obj &
+	$(OBJS)\advdll_laywin.obj &
+	$(OBJS)\advdll_notifmsgg.obj &
+	$(OBJS)\advdll_odcombo.obj &
+	$(OBJS)\advdll_propdlg.obj &
+	$(OBJS)\advdll_richtooltipg.obj &
+	$(OBJS)\advdll_sashwin.obj &
+	$(OBJS)\advdll_splash.obj &
+	$(OBJS)\advdll_generic_timectrl.obj &
+	$(OBJS)\advdll_tipdlg.obj &
+	$(OBJS)\advdll_treelist.obj &
+	$(OBJS)\advdll_wizard.obj &
+	$(OBJS)\advdll_taskbarcmn.obj &
+	$(OBJS)\advdll_aboutdlg.obj &
+	$(OBJS)\advdll_notifmsg.obj &
+	$(OBJS)\advdll_richtooltip.obj &
+	$(OBJS)\advdll_sound.obj &
+	$(OBJS)\advdll_taskbar.obj &
+	$(OBJS)\advdll_joystick.obj &
+	$(OBJS)\advdll_animateg.obj
+!endif
+__advlib___depname =
 !ifeq MONOLITHIC 0
 !ifeq SHARED 0
 !ifeq USE_GUI 1
@@ -2952,100 +2952,100 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =
 !ifeq 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_gridcmn.obj &
-	$(OBJS)\advlib_hyperlnkcmn.obj &
-	$(OBJS)\advlib_odcombocmn.obj &
-	$(OBJS)\advlib_richtooltipcmn.obj &
-	$(OBJS)\advlib_aboutdlgg.obj &
-	$(OBJS)\advlib_bannerwindow.obj &
-	$(OBJS)\advlib_bmpcboxg.obj &
-	$(OBJS)\advlib_calctrlg.obj &
-	$(OBJS)\advlib_commandlinkbuttong.obj &
-	$(OBJS)\advlib_datavgen.obj &
+	$(OBJS)\advlib_bmpcboxcmn.obj &
+	$(OBJS)\advlib_calctrlcmn.obj &
+	$(OBJS)\advlib_datavcmn.obj &
+	$(OBJS)\advlib_gridcmn.obj &
+	$(OBJS)\advlib_hyperlnkcmn.obj &
+	$(OBJS)\advlib_odcombocmn.obj &
+	$(OBJS)\advlib_richtooltipcmn.obj &
+	$(OBJS)\advlib_aboutdlgg.obj &
+	$(OBJS)\advlib_bannerwindow.obj &
+	$(OBJS)\advlib_bmpcboxg.obj &
+	$(OBJS)\advlib_calctrlg.obj &
+	$(OBJS)\advlib_commandlinkbuttong.obj &
+	$(OBJS)\advlib_datavgen.obj &
 	$(OBJS)\advlib_datectlg.obj &
 	$(OBJS)\advlib_editlbox.obj &
 	$(OBJS)\advlib_grid.obj &
 	$(OBJS)\advlib_gridctrl.obj &
 	$(OBJS)\advlib_grideditors.obj &
 	$(OBJS)\advlib_gridsel.obj &
-	$(OBJS)\advlib_helpext.obj &
-	$(OBJS)\advlib_hyperlinkg.obj &
-	$(OBJS)\advlib_laywin.obj &
-	$(OBJS)\advlib_notifmsgg.obj &
-	$(OBJS)\advlib_odcombo.obj &
-	$(OBJS)\advlib_propdlg.obj &
-	$(OBJS)\advlib_generic_richtooltip.obj &
-	$(OBJS)\advlib_sashwin.obj &
-	$(OBJS)\advlib_splash.obj &
-	$(OBJS)\advlib_generic_timectrl.obj &
-	$(OBJS)\advlib_tipdlg.obj &
-	$(OBJS)\advlib_treelist.obj &
-	$(OBJS)\advlib_wizard.obj &
-	$(OBJS)\advlib_taskbarcmn.obj &
-	$(OBJS)\advlib_aboutdlg.obj &
-	$(OBJS)\advlib_notifmsg.obj &
-	$(OBJS)\advlib_msw_richtooltip.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_commandlinkbutton.obj &
-	$(OBJS)\advlib_datecontrols.obj &
-	$(OBJS)\advlib_datectrl.obj &
-	$(OBJS)\advlib_datetimectrl.obj &
-	$(OBJS)\advlib_hyperlink.obj &
-	$(OBJS)\advlib_msw_timectrl.obj
-!endif
-!ifeq 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_gridcmn.obj &
-	$(OBJS)\advlib_hyperlnkcmn.obj &
-	$(OBJS)\advlib_odcombocmn.obj &
-	$(OBJS)\advlib_richtooltipcmn.obj &
-	$(OBJS)\advlib_aboutdlgg.obj &
-	$(OBJS)\advlib_bannerwindow.obj &
-	$(OBJS)\advlib_bmpcboxg.obj &
-	$(OBJS)\advlib_calctrlg.obj &
-	$(OBJS)\advlib_commandlinkbuttong.obj &
-	$(OBJS)\advlib_datavgen.obj &
+	$(OBJS)\advlib_helpext.obj &
+	$(OBJS)\advlib_hyperlinkg.obj &
+	$(OBJS)\advlib_laywin.obj &
+	$(OBJS)\advlib_notifmsgg.obj &
+	$(OBJS)\advlib_odcombo.obj &
+	$(OBJS)\advlib_propdlg.obj &
+	$(OBJS)\advlib_richtooltipg.obj &
+	$(OBJS)\advlib_sashwin.obj &
+	$(OBJS)\advlib_splash.obj &
+	$(OBJS)\advlib_generic_timectrl.obj &
+	$(OBJS)\advlib_tipdlg.obj &
+	$(OBJS)\advlib_treelist.obj &
+	$(OBJS)\advlib_wizard.obj &
+	$(OBJS)\advlib_taskbarcmn.obj &
+	$(OBJS)\advlib_aboutdlg.obj &
+	$(OBJS)\advlib_notifmsg.obj &
+	$(OBJS)\advlib_richtooltip.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_commandlinkbutton.obj &
+	$(OBJS)\advlib_datecontrols.obj &
+	$(OBJS)\advlib_datectrl.obj &
+	$(OBJS)\advlib_datetimectrl.obj &
+	$(OBJS)\advlib_hyperlink.obj &
+	$(OBJS)\advlib_msw_timectrl.obj
+!endif
+!ifeq 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_gridcmn.obj &
+	$(OBJS)\advlib_hyperlnkcmn.obj &
+	$(OBJS)\advlib_odcombocmn.obj &
+	$(OBJS)\advlib_richtooltipcmn.obj &
+	$(OBJS)\advlib_aboutdlgg.obj &
+	$(OBJS)\advlib_bannerwindow.obj &
+	$(OBJS)\advlib_bmpcboxg.obj &
+	$(OBJS)\advlib_calctrlg.obj &
+	$(OBJS)\advlib_commandlinkbuttong.obj &
+	$(OBJS)\advlib_datavgen.obj &
 	$(OBJS)\advlib_datectlg.obj &
 	$(OBJS)\advlib_editlbox.obj &
 	$(OBJS)\advlib_grid.obj &
 	$(OBJS)\advlib_gridctrl.obj &
 	$(OBJS)\advlib_grideditors.obj &
 	$(OBJS)\advlib_gridsel.obj &
-	$(OBJS)\advlib_helpext.obj &
-	$(OBJS)\advlib_hyperlinkg.obj &
-	$(OBJS)\advlib_laywin.obj &
-	$(OBJS)\advlib_notifmsgg.obj &
-	$(OBJS)\advlib_odcombo.obj &
-	$(OBJS)\advlib_propdlg.obj &
-	$(OBJS)\advlib_generic_richtooltip.obj &
-	$(OBJS)\advlib_sashwin.obj &
-	$(OBJS)\advlib_splash.obj &
-	$(OBJS)\advlib_generic_timectrl.obj &
-	$(OBJS)\advlib_tipdlg.obj &
-	$(OBJS)\advlib_treelist.obj &
-	$(OBJS)\advlib_wizard.obj &
-	$(OBJS)\advlib_taskbarcmn.obj &
-	$(OBJS)\advlib_aboutdlg.obj &
-	$(OBJS)\advlib_notifmsg.obj &
-	$(OBJS)\advlib_msw_richtooltip.obj &
-	$(OBJS)\advlib_sound.obj &
-	$(OBJS)\advlib_taskbar.obj &
-	$(OBJS)\advlib_joystick.obj &
-	$(OBJS)\advlib_animateg.obj
-!endif
-____wxadv_namedll_DEP =
+	$(OBJS)\advlib_helpext.obj &
+	$(OBJS)\advlib_hyperlinkg.obj &
+	$(OBJS)\advlib_laywin.obj &
+	$(OBJS)\advlib_notifmsgg.obj &
+	$(OBJS)\advlib_odcombo.obj &
+	$(OBJS)\advlib_propdlg.obj &
+	$(OBJS)\advlib_richtooltipg.obj &
+	$(OBJS)\advlib_sashwin.obj &
+	$(OBJS)\advlib_splash.obj &
+	$(OBJS)\advlib_generic_timectrl.obj &
+	$(OBJS)\advlib_tipdlg.obj &
+	$(OBJS)\advlib_treelist.obj &
+	$(OBJS)\advlib_wizard.obj &
+	$(OBJS)\advlib_taskbarcmn.obj &
+	$(OBJS)\advlib_aboutdlg.obj &
+	$(OBJS)\advlib_notifmsg.obj &
+	$(OBJS)\advlib_richtooltip.obj &
+	$(OBJS)\advlib_sound.obj &
+	$(OBJS)\advlib_taskbar.obj &
+	$(OBJS)\advlib_joystick.obj &
+	$(OBJS)\advlib_animateg.obj
+!endif
+____wxadv_namedll_DEP =
 !ifeq SHARED 1
 ____wxadv_namedll_DEP = $(__advdll___depname)
 !endif
@@ -3911,7 +3911,7 @@ MONODLL_OBJECTS =  &
 	$(OBJS)\monodll_tarstrm.obj &
 	$(OBJS)\monodll_textbuf.obj &
 	$(OBJS)\monodll_textfile.obj &
-	$(OBJS)\monodll_time.obj &
+	$(OBJS)\monodll_time.obj &
 	$(OBJS)\monodll_timercmn.obj &
 	$(OBJS)\monodll_timerimpl.obj &
 	$(OBJS)\monodll_tokenzr.obj &
@@ -4059,7 +4059,7 @@ MONOLIB_OBJECTS =  &
 	$(OBJS)\monolib_tarstrm.obj &
 	$(OBJS)\monolib_textbuf.obj &
 	$(OBJS)\monolib_textfile.obj &
-	$(OBJS)\monolib_time.obj &
+	$(OBJS)\monolib_time.obj &
 	$(OBJS)\monolib_timercmn.obj &
 	$(OBJS)\monolib_timerimpl.obj &
 	$(OBJS)\monolib_tokenzr.obj &
@@ -4205,7 +4205,7 @@ BASEDLL_OBJECTS =  &
 	$(OBJS)\basedll_tarstrm.obj &
 	$(OBJS)\basedll_textbuf.obj &
 	$(OBJS)\basedll_textfile.obj &
-	$(OBJS)\basedll_time.obj &
+	$(OBJS)\basedll_time.obj &
 	$(OBJS)\basedll_timercmn.obj &
 	$(OBJS)\basedll_timerimpl.obj &
 	$(OBJS)\basedll_tokenzr.obj &
@@ -4336,7 +4336,7 @@ BASELIB_OBJECTS =  &
 	$(OBJS)\baselib_tarstrm.obj &
 	$(OBJS)\baselib_textbuf.obj &
 	$(OBJS)\baselib_textfile.obj &
-	$(OBJS)\baselib_time.obj &
+	$(OBJS)\baselib_time.obj &
 	$(OBJS)\baselib_timercmn.obj &
 	$(OBJS)\baselib_timerimpl.obj &
 	$(OBJS)\baselib_tokenzr.obj &
@@ -4736,19 +4736,19 @@ XRCDLL_OBJECTS =  &
 	$(OBJS)\xrcdll_xh_split.obj &
 	$(OBJS)\xrcdll_xh_srchctrl.obj &
 	$(OBJS)\xrcdll_xh_statbar.obj &
-	$(OBJS)\xrcdll_xh_stbmp.obj &
-	$(OBJS)\xrcdll_xh_stbox.obj &
-	$(OBJS)\xrcdll_xh_stlin.obj &
-	$(OBJS)\xrcdll_xh_sttxt.obj &
-	$(OBJS)\xrcdll_xh_text.obj &
-	$(OBJS)\xrcdll_xh_tglbtn.obj &
-	$(OBJS)\xrcdll_xh_timectrl.obj &
-	$(OBJS)\xrcdll_xh_toolb.obj &
-	$(OBJS)\xrcdll_xh_toolbk.obj &
-	$(OBJS)\xrcdll_xh_tree.obj &
-	$(OBJS)\xrcdll_xh_treebk.obj &
-	$(OBJS)\xrcdll_xh_unkwn.obj &
-	$(OBJS)\xrcdll_xh_wizrd.obj &
+	$(OBJS)\xrcdll_xh_stbmp.obj &
+	$(OBJS)\xrcdll_xh_stbox.obj &
+	$(OBJS)\xrcdll_xh_stlin.obj &
+	$(OBJS)\xrcdll_xh_sttxt.obj &
+	$(OBJS)\xrcdll_xh_text.obj &
+	$(OBJS)\xrcdll_xh_tglbtn.obj &
+	$(OBJS)\xrcdll_xh_timectrl.obj &
+	$(OBJS)\xrcdll_xh_toolb.obj &
+	$(OBJS)\xrcdll_xh_toolbk.obj &
+	$(OBJS)\xrcdll_xh_tree.obj &
+	$(OBJS)\xrcdll_xh_treebk.obj &
+	$(OBJS)\xrcdll_xh_unkwn.obj &
+	$(OBJS)\xrcdll_xh_wizrd.obj &
 	$(OBJS)\xrcdll_xmlres.obj &
 	$(OBJS)\xrcdll_xmladv.obj &
 	$(OBJS)\xrcdll_xmlrsall.obj
@@ -4812,19 +4812,19 @@ XRCLIB_OBJECTS =  &
 	$(OBJS)\xrclib_xh_split.obj &
 	$(OBJS)\xrclib_xh_srchctrl.obj &
 	$(OBJS)\xrclib_xh_statbar.obj &
-	$(OBJS)\xrclib_xh_stbmp.obj &
-	$(OBJS)\xrclib_xh_stbox.obj &
-	$(OBJS)\xrclib_xh_stlin.obj &
-	$(OBJS)\xrclib_xh_sttxt.obj &
-	$(OBJS)\xrclib_xh_text.obj &
-	$(OBJS)\xrclib_xh_tglbtn.obj &
-	$(OBJS)\xrclib_xh_timectrl.obj &
-	$(OBJS)\xrclib_xh_toolb.obj &
-	$(OBJS)\xrclib_xh_toolbk.obj &
-	$(OBJS)\xrclib_xh_tree.obj &
-	$(OBJS)\xrclib_xh_treebk.obj &
-	$(OBJS)\xrclib_xh_unkwn.obj &
-	$(OBJS)\xrclib_xh_wizrd.obj &
+	$(OBJS)\xrclib_xh_stbmp.obj &
+	$(OBJS)\xrclib_xh_stbox.obj &
+	$(OBJS)\xrclib_xh_stlin.obj &
+	$(OBJS)\xrclib_xh_sttxt.obj &
+	$(OBJS)\xrclib_xh_text.obj &
+	$(OBJS)\xrclib_xh_tglbtn.obj &
+	$(OBJS)\xrclib_xh_timectrl.obj &
+	$(OBJS)\xrclib_xh_toolb.obj &
+	$(OBJS)\xrclib_xh_toolbk.obj &
+	$(OBJS)\xrclib_xh_tree.obj &
+	$(OBJS)\xrclib_xh_treebk.obj &
+	$(OBJS)\xrclib_xh_unkwn.obj &
+	$(OBJS)\xrclib_xh_wizrd.obj &
 	$(OBJS)\xrclib_xmlres.obj &
 	$(OBJS)\xrclib_xmladv.obj &
 	$(OBJS)\xrclib_xmlrsall.obj
@@ -6689,9 +6689,9 @@ $(OBJS)\monodll_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
 $(OBJS)\monodll_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
+$(OBJS)\monodll_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -7178,27 +7178,27 @@ $(OBJS)\monodll_calctrl.obj :  .AUTODEPEND ..\..\src\msw\calctrl.cpp
 $(OBJS)\monodll_commandlinkbutton.obj :  .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_mediactrl_am.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
+$(OBJS)\monodll_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_mediactrl_am.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_mediactrl_wmp10.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -7457,21 +7457,21 @@ $(OBJS)\monodll_xh_stlin.obj :  .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\monodll_xh_sttxt.obj :  .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
-$(OBJS)\monodll_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
-$(OBJS)\monodll_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
+$(OBJS)\monodll_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -7745,23 +7745,23 @@ $(OBJS)\monodll_imaglist.obj :  .AUTODEPEND ..\..\src\msw\imaglist.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monodll_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
@@ -8715,23 +8715,23 @@ $(OBJS)\monodll_hyperlnkcmn.obj :  .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monodll_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
@@ -8810,38 +8810,38 @@ $(OBJS)\monodll_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_generic_richtooltip.obj :  .AUTODEPEND ..\..\src\generic\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monodll_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_richtooltipg.obj :  .AUTODEPEND ..\..\src\generic\richtooltipg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
@@ -8860,23 +8860,23 @@ $(OBJS)\monodll_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_msw_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monodll_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monodll_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
@@ -9094,9 +9094,9 @@ $(OBJS)\monolib_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
 $(OBJS)\monolib_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
+$(OBJS)\monolib_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -9583,27 +9583,27 @@ $(OBJS)\monolib_calctrl.obj :  .AUTODEPEND ..\..\src\msw\calctrl.cpp
 $(OBJS)\monolib_commandlinkbutton.obj :  .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_mediactrl_am.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
+$(OBJS)\monolib_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_mediactrl_am.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_mediactrl_wmp10.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -9862,21 +9862,21 @@ $(OBJS)\monolib_xh_stlin.obj :  .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\monolib_xh_sttxt.obj :  .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
-$(OBJS)\monolib_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
-$(OBJS)\monolib_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
+$(OBJS)\monolib_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -10150,23 +10150,23 @@ $(OBJS)\monolib_imaglist.obj :  .AUTODEPEND ..\..\src\msw\imaglist.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monolib_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
@@ -11120,23 +11120,23 @@ $(OBJS)\monolib_hyperlnkcmn.obj :  .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monolib_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
@@ -11215,38 +11215,38 @@ $(OBJS)\monolib_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_generic_richtooltip.obj :  .AUTODEPEND ..\..\src\generic\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monolib_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_richtooltipg.obj :  .AUTODEPEND ..\..\src\generic\richtooltipg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
@@ -11265,23 +11265,23 @@ $(OBJS)\monolib_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_msw_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\monolib_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
+!ifeq USE_GUI 1
+$(OBJS)\monolib_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
@@ -11499,9 +11499,9 @@ $(OBJS)\basedll_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
 $(OBJS)\basedll_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
-$(OBJS)\basedll_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
-
+$(OBJS)\basedll_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
+
 $(OBJS)\basedll_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<
 
@@ -11838,9 +11838,9 @@ $(OBJS)\baselib_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
 $(OBJS)\baselib_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
-$(OBJS)\baselib_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
-
+$(OBJS)\baselib_time.obj :  .AUTODEPEND ..\..\src\common\time.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
+
 $(OBJS)\baselib_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<
 
@@ -12528,23 +12528,23 @@ $(OBJS)\coredll_imaglist.obj :  .AUTODEPEND ..\..\src\msw\imaglist.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\coredll_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\coredll_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\coredll_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\coredll_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
+!ifeq USE_GUI 1
+$(OBJS)\coredll_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\coredll_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\coredll_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\coredll_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
@@ -13936,23 +13936,23 @@ $(OBJS)\corelib_imaglist.obj :  .AUTODEPEND ..\..\src\msw\imaglist.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\corelib_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\corelib_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\corelib_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
-$(OBJS)\corelib_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
+!ifeq USE_GUI 1
+$(OBJS)\corelib_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\corelib_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\corelib_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\corelib_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
@@ -14891,27 +14891,27 @@ $(OBJS)\advdll_calctrl.obj :  .AUTODEPEND ..\..\src\msw\calctrl.cpp
 $(OBJS)\advdll_commandlinkbutton.obj :  .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
-$(OBJS)\advdll_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_bmpcboxcmn.obj :  .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
+$(OBJS)\advdll_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_bmpcboxcmn.obj :  .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
@@ -14921,21 +14921,21 @@ $(OBJS)\advdll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
 $(OBJS)\advdll_gridcmn.obj :  .AUTODEPEND ..\..\src\common\gridcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
-$(OBJS)\advdll_hyperlnkcmn.obj :  .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
+$(OBJS)\advdll_hyperlnkcmn.obj :  .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
@@ -14978,51 +14978,51 @@ $(OBJS)\advdll_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
 $(OBJS)\advdll_notifmsgg.obj :  .AUTODEPEND ..\..\src\generic\notifmsgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
-$(OBJS)\advdll_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_generic_richtooltip.obj :  .AUTODEPEND ..\..\src\generic\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
+$(OBJS)\advdll_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_richtooltipg.obj :  .AUTODEPEND ..\..\src\generic\richtooltipg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
 $(OBJS)\advdll_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
-$(OBJS)\advdll_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_msw_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
-$(OBJS)\advdll_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
+$(OBJS)\advdll_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
@@ -15041,27 +15041,27 @@ $(OBJS)\advlib_calctrl.obj :  .AUTODEPEND ..\..\src\msw\calctrl.cpp
 $(OBJS)\advlib_commandlinkbutton.obj :  .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
-$(OBJS)\advlib_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_bmpcboxcmn.obj :  .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
+$(OBJS)\advlib_datecontrols.obj :  .AUTODEPEND ..\..\src\msw\datecontrols.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_bmpcboxcmn.obj :  .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
@@ -15071,21 +15071,21 @@ $(OBJS)\advlib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
 $(OBJS)\advlib_gridcmn.obj :  .AUTODEPEND ..\..\src\common\gridcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
-$(OBJS)\advlib_hyperlnkcmn.obj :  .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
+$(OBJS)\advlib_hyperlnkcmn.obj :  .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
@@ -15128,51 +15128,51 @@ $(OBJS)\advlib_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
 $(OBJS)\advlib_notifmsgg.obj :  .AUTODEPEND ..\..\src\generic\notifmsgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
-$(OBJS)\advlib_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_generic_richtooltip.obj :  .AUTODEPEND ..\..\src\generic\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
+$(OBJS)\advlib_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_richtooltipg.obj :  .AUTODEPEND ..\..\src\generic\richtooltipg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
 $(OBJS)\advlib_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
-$(OBJS)\advlib_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_msw_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
-$(OBJS)\advlib_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
+$(OBJS)\advlib_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
@@ -15611,21 +15611,21 @@ $(OBJS)\xrcdll_xh_stlin.obj :  .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\xrcdll_xh_sttxt.obj :  .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
-$(OBJS)\xrcdll_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
-$(OBJS)\xrcdll_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
-
+$(OBJS)\xrcdll_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
+$(OBJS)\xrcdll_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
+$(OBJS)\xrcdll_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
+$(OBJS)\xrcdll_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
+$(OBJS)\xrcdll_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
 $(OBJS)\xrcdll_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
@@ -15809,21 +15809,21 @@ $(OBJS)\xrclib_xh_stlin.obj :  .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp
 $(OBJS)\xrclib_xh_sttxt.obj :  .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
-$(OBJS)\xrclib_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
-$(OBJS)\xrclib_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
-
+$(OBJS)\xrclib_xh_text.obj :  .AUTODEPEND ..\..\src\xrc\xh_text.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
+$(OBJS)\xrclib_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
+$(OBJS)\xrclib_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
+$(OBJS)\xrclib_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
+$(OBJS)\xrclib_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
 $(OBJS)\xrclib_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp
index 8c23b15b10..3d3e3810ef 100644
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -272,22 +272,22 @@ SOURCE=..\..\src\common\gridcmn.cpp
 
 SOURCE=..\..\src\common\hyperlnkcmn.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\odcombocmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\richtooltipcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\taskbarcmn.cpp
-# End Source File
-# End Group
-# Begin Group "MSW Sources"
-
-# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\src\common\odcombocmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\richtooltipcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\taskbarcmn.cpp
+# End Source File
+# End Group
+# Begin Group "MSW Sources"
+
+# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=..\..\src\msw\aboutdlg.cpp
@@ -463,53 +463,53 @@ SOURCE=..\..\src\msw\datectrl.cpp
 
 !ELSEIF  "$(CFG)" == "adv - Win32 Debug"
 
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\datetimectrl.cpp
-
-!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Release"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Debug"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\hyperlink.cpp
-
-!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"
-
-# PROP Exclude_From_Build 1
-
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\datetimectrl.cpp
+
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"
+
+
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"
+
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\hyperlink.cpp
+
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
@@ -541,65 +541,65 @@ SOURCE=..\..\src\msw\hyperlink.cpp
 
 SOURCE=..\..\src\msw\joystick.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\notifmsg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\richtooltip.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\sound.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\taskbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\timectrl.cpp
-
-!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Release"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 Debug"
-
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\version.rc
-
-!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"
-
-
-!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
+# Begin Source File
+
+SOURCE=..\..\src\msw\notifmsg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\richtooltip.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\sound.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\taskbar.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\timectrl.cpp
+
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"
+
+
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"
+
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\version.rc
+
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
 
 
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"
@@ -703,34 +703,34 @@ SOURCE=..\..\src\generic\notifmsgg.cpp
 
 SOURCE=..\..\src\generic\odcombo.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\propdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\richtooltip.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\sashwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\splash.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\timectrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\tipdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\treelist.cpp
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\propdlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\richtooltipg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\sashwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\splash.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\timectrl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\tipdlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\treelist.cpp
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\src\generic\wizard.cpp
@@ -897,22 +897,22 @@ SOURCE=..\..\include\wx\msw\calctrl.h
 
 SOURCE=..\..\include\wx\msw\commandlinkbutton.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\datectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\datetimectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\genrcdefs.h
-
-!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\datetimectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\genrcdefs.h
+
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
 
 "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
 	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
@@ -1006,22 +1006,22 @@ SOURCE=..\..\include\wx\msw\notifmsg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\sound.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\taskbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\timectrl.h
-# End Source File
-# End Group
-# Begin Group "Generic Headers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
+SOURCE=..\..\include\wx\msw\sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\taskbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\timectrl.h
+# End Source File
+# End Group
+# Begin Group "Generic Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\aboutdlgg.h
 # End Source File
 # Begin Source File
@@ -1092,22 +1092,22 @@ SOURCE=..\..\include\wx\generic\propdlg.h
 
 SOURCE=..\..\include\wx\generic\sashwin.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\splash.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\timectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\wizard.h
-# End Source File
-# End Group
-# Begin Group "Common Headers"
-
-# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\splash.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\timectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\wizard.h
+# End Source File
+# End Group
+# Begin Group "Common Headers"
+
+# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=..\..\include\wx\aboutdlg.h
@@ -1140,22 +1140,22 @@ SOURCE=..\..\include\wx\dataview.h
 
 SOURCE=..\..\include\wx\datectrl.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dateevt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\datetimectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dcbuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dvrenderers.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dateevt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\datetimectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dcbuffer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dvrenderers.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\editlbox.h
@@ -1184,42 +1184,42 @@ SOURCE=..\..\include\wx\notifmsg.h
 
 SOURCE=..\..\include\wx\odcombo.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\propdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtooltip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\sashwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\sound.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\propdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtooltip.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\sashwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\sound.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\splash.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\taskbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\timectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\tipdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\treelist.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\taskbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\timectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\tipdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\treelist.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\wizard.h
diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index c00ef57ce8..9a7b582b4e 100644
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -531,10 +531,10 @@ SOURCE=..\..\src\common\textfile.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\common\time.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\src\common\time.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\timercmn.cpp
 # End Source File
 # Begin Source File
@@ -1229,22 +1229,22 @@ SOURCE=..\..\include\wx\dynload.h
 
 SOURCE=..\..\include\wx\encconv.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\event.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\eventfilter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\evtloop.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\except.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\event.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\eventfilter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\evtloop.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\except.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\features.h
@@ -1567,10 +1567,10 @@ SOURCE=..\..\include\wx\thread.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\time.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\time.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\timer.h
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 7cd78d10d8..202ce086d9 100644
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -2028,22 +2028,22 @@ SOURCE=..\..\src\msw\nativewin.cpp
 
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\nonownedwnd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\notebook.cpp
-
-!IF  "$(CFG)" == "core - Win32 DLL Universal Release"
-
-# PROP Exclude_From_Build 1
-
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\nonownedwnd.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\notebook.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
 # PROP Exclude_From_Build 1
@@ -5003,42 +5003,42 @@ SOURCE=..\..\include\wx\msw\control.h
 
 SOURCE=..\..\include\wx\msw\ctrlsub.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\cursor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\custombgwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\ole\dataform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\ole\dataobj.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\cursor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\custombgwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\dataform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\dataobj.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\msw\ole\dataobj2.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\datectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\datetimectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\dc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\dcclient.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\datetimectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dcclient.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\msw\dcmemory.h
@@ -5278,22 +5278,22 @@ SOURCE=..\..\include\wx\msw\missing.h
 
 SOURCE=..\..\include\wx\msw\msgdlg.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\msvcrt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\nonownedwnd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\notebook.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\notifmsg.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\msvcrt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\nonownedwnd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\notebook.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\notifmsg.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\msw\ole\oleutils.h
@@ -5406,22 +5406,22 @@ SOURCE=..\..\include\wx\msw\textctrl.h
 
 SOURCE=..\..\include\wx\msw\textentry.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\tglbtn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\timectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\toolbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\tooltip.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\tglbtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\timectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\toolbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\tooltip.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\msw\toplevel.h
@@ -5444,14 +5444,14 @@ SOURCE=..\..\include\wx\msw\uxthemep.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\webview_ie.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\webviewhistoryitem_ie.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\msw\webview_ie.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\webviewhistoryitem_ie.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\window.h
 # End Source File
 # End Group
@@ -5506,22 +5506,22 @@ SOURCE=..\..\include\wx\generic\colrdlgg.h
 
 SOURCE=..\..\include\wx\generic\combo.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\ctrlsub.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\custombgwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\dataview.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\datectrl.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\ctrlsub.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\custombgwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\dataview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\datectrl.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\generic\dcpsg.h
@@ -5694,22 +5694,22 @@ SOURCE=..\..\include\wx\generic\stattextg.h
 
 SOURCE=..\..\include\wx\generic\statusbr.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\textdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\timectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\treectlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\wizard.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\textdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\timectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\treectlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\wizard.h
+# End Source File
 # End Group
 # Begin Group "wxUniv Headers"
 
@@ -5754,22 +5754,22 @@ SOURCE=..\..\include\wx\univ\colschem.h
 
 SOURCE=..\..\include\wx\univ\combobox.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\univ\control.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\univ\custombgwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\univ\dialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\univ\frame.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\control.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\custombgwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\dialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\frame.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\univ\gauge.h
@@ -6162,42 +6162,42 @@ SOURCE=..\..\include\wx\cshelp.h
 
 SOURCE=..\..\include\wx\ctrlsub.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\cursor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\custombgwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dataobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dataview.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\cursor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\custombgwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dataobj.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dataview.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\datectrl.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dateevt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\datetimectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dcbuffer.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dateevt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\datetimectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dcbuffer.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\dcclient.h
@@ -6798,22 +6798,22 @@ SOURCE=..\..\include\wx\richtext\richtextsymboldlg.h
 
 SOURCE=..\..\include\wx\richtext\richtextuicustomization.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextxml.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtooltip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\sashwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\scopeguard.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextxml.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtooltip.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\sashwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\scopeguard.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\scrolbar.h
@@ -6922,22 +6922,22 @@ SOURCE=..\..\include\wx\textentry.h
 
 SOURCE=..\..\include\wx\textwrapper.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\tglbtn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\timectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\tipdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\tipwin.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\tglbtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\timectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\tipdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\tipwin.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\ribbon\toolbar.h
@@ -7020,14 +7020,14 @@ SOURCE=..\..\include\wx\vscroll.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\webview.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\webviewarchivehandler.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\webview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\webviewarchivehandler.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\persist\window.h
 # End Source File
 # Begin Source File
@@ -7278,22 +7278,22 @@ SOURCE=..\..\include\wx\xrc\xh_sttxt.h
 
 SOURCE=..\..\include\wx\xrc\xh_text.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_tglbtn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_timectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_toolb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_toolbk.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_tglbtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_timectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_toolb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_toolbk.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\xrc\xh_tree.h
diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj
index 0c8e869b8b..d7ddcf3352 100644
--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -595,21 +595,21 @@
 				RelativePath="..\..\src\common\gridcmn.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\common\hyperlnkcmn.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\common\odcombocmn.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\common\richtooltipcmn.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\common\taskbarcmn.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="MSW Sources"
-			UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
+				RelativePath="..\..\src\common\hyperlnkcmn.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\odcombocmn.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\richtooltipcmn.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\taskbarcmn.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="MSW Sources"
+			UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
 			<File
 				RelativePath="..\..\src\msw\aboutdlg.cpp">
 			</File>
@@ -683,33 +683,18 @@
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\datetimectrl.cpp">
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\hyperlink.cpp">
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\datetimectrl.cpp">
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="DLL Universal Debug|Win32"
@@ -719,114 +704,81 @@
 					ExcludedFromBuild="TRUE"/>
 			</File>
 			<File
-				RelativePath="..\..\src\msw\joystick.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\msw\notifmsg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\msw\richtooltip.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\msw_richtooltip.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\msw_richtooltip.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivud\adv\msw_richtooltip.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivu\adv\msw_richtooltip.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\msw_richtooltip.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\msw_richtooltip.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivuddll\adv\msw_richtooltip.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivudll\adv\msw_richtooltip.obj"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\sound.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\msw\taskbar.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\msw\timectrl.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\msw_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\msw_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\msw_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\msw_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\version.rc">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="Release|Win32"
+				RelativePath="..\..\src\msw\hyperlink.cpp">
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\joystick.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\msw\notifmsg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\msw\richtooltip.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\msw\sound.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\msw\taskbar.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\msw\timectrl.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\adv\msw_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\adv\msw_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\adv\msw_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\adv\msw_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\version.rc">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="Universal Debug|Win32"
@@ -891,126 +843,78 @@
 				RelativePath="..\..\src\generic\notifmsgg.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\odcombo.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\propdlg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\richtooltip.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\generic_richtooltip.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\generic_richtooltip.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivud\adv\generic_richtooltip.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivu\adv\generic_richtooltip.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\generic_richtooltip.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\generic_richtooltip.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivuddll\adv\generic_richtooltip.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivudll\adv\generic_richtooltip.obj"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\sashwin.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\splash.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\timectrl.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivud\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivu\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivuddll\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivudll\adv\generic_timectrl.obj"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\tipdlg.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\generic\treelist.cpp">
-			</File>
-			<File
+				RelativePath="..\..\src\generic\odcombo.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\propdlg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\richtooltipg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\sashwin.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\splash.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\timectrl.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\tipdlg.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\generic\treelist.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src\generic\wizard.cpp">
 			</File>
 		</Filter>
@@ -1114,21 +1018,21 @@
 				RelativePath="..\..\include\wx\msw\calctrl.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\commandlinkbutton.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datetimectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\genrcdefs.h">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+				RelativePath="..\..\include\wx\msw\commandlinkbutton.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datetimectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\genrcdefs.h">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
 						Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>
@@ -1206,21 +1110,21 @@
 			<File
 				RelativePath="..\..\include\wx\msw\notifmsg.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\sound.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\taskbar.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\timectrl.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Generic Headers"
-			UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">
-			<File
-				RelativePath="..\..\include\wx\generic\aboutdlgg.h">
+			<File
+				RelativePath="..\..\include\wx\msw\sound.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\taskbar.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\timectrl.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Generic Headers"
+			UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">
+			<File
+				RelativePath="..\..\include\wx\generic\aboutdlgg.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\animate.h">
@@ -1271,21 +1175,21 @@
 				RelativePath="..\..\include\wx\generic\propdlg.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\sashwin.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\splash.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\timectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\wizard.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Common Headers"
-			UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
+				RelativePath="..\..\include\wx\generic\sashwin.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\splash.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\timectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\wizard.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Common Headers"
+			UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
 			<File
 				RelativePath="..\..\include\wx\aboutdlg.h">
 			</File>
@@ -1308,21 +1212,21 @@
 				RelativePath="..\..\include\wx\dataview.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\datectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dateevt.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\datetimectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dcbuffer.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dvrenderers.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\datectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dateevt.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\datetimectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dcbuffer.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dvrenderers.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\editlbox.h">
 			</File>
 			<File
@@ -1341,36 +1245,36 @@
 				RelativePath="..\..\include\wx\notifmsg.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\odcombo.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\propdlg.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\richtooltip.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\sashwin.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\sound.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\splash.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\taskbar.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\timectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tipdlg.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\treelist.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\odcombo.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\propdlg.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtooltip.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\sashwin.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\sound.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\splash.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\taskbar.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\timectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\tipdlg.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\treelist.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\wizard.h">
 			</File>
 		</Filter>
diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj
index d00673452a..a65ea6d32a 100644
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -838,9 +838,9 @@
 				RelativePath="..\..\src\common\textfile.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\common\time.cpp">
-			</File>
-			<File
+				RelativePath="..\..\src\common\time.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src\common\timercmn.cpp">
 			</File>
 			<File
@@ -1345,21 +1345,21 @@
 				RelativePath="..\..\include\wx\dynload.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\encconv.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\event.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\eventfilter.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\evtloop.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\except.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\encconv.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\event.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\eventfilter.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\evtloop.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\except.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\features.h">
 			</File>
 			<File
@@ -1600,9 +1600,9 @@
 				RelativePath="..\..\include\wx\thread.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\time.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\time.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\timer.h">
 			</File>
 			<File
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 319379098d..a8f792507c 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1889,21 +1889,21 @@
 					ExcludedFromBuild="TRUE"/>
 				<FileConfiguration
 					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="TRUE"/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="TRUE"/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\nonownedwnd.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\msw\notebook.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\core\msw_notebook.obj"/>
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\nonownedwnd.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\msw\notebook.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\core\msw_notebook.obj"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32">
@@ -4313,36 +4313,36 @@
 				RelativePath="..\..\include\wx\msw\control.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\ctrlsub.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\cursor.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\custombgwin.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\ole\dataform.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\ole\dataobj.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\ole\dataobj2.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datetimectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\dc.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\dcclient.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\ctrlsub.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\cursor.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\custombgwin.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ole\dataform.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ole\dataobj.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ole\dataobj2.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datetimectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\dc.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\dcclient.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\dcmemory.h">
 			</File>
 			<File
@@ -4529,21 +4529,21 @@
 				RelativePath="..\..\include\wx\msw\missing.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\msgdlg.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\msvcrt.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\nonownedwnd.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\notebook.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\notifmsg.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\msgdlg.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\msvcrt.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\nonownedwnd.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\notebook.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\notifmsg.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\ole\oleutils.h">
 			</File>
 			<File
@@ -4625,21 +4625,21 @@
 				RelativePath="..\..\include\wx\msw\textctrl.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\textentry.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\tglbtn.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\timectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\toolbar.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\tooltip.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\textentry.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\tglbtn.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\timectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\toolbar.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\tooltip.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\toplevel.h">
 			</File>
 			<File
@@ -4655,12 +4655,12 @@
 				RelativePath="..\..\include\wx\msw\uxthemep.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\webview_ie.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\webview_ie.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\window.h">
 			</File>
 		</Filter>
@@ -4701,21 +4701,21 @@
 				RelativePath="..\..\include\wx\generic\colrdlgg.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\combo.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\ctrlsub.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\custombgwin.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\dataview.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\datectrl.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\generic\combo.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\ctrlsub.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\custombgwin.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\dataview.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\datectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\generic\dcpsg.h">
 			</File>
 			<File
@@ -4842,21 +4842,21 @@
 				RelativePath="..\..\include\wx\generic\stattextg.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\generic\statusbr.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\textdlgg.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\timectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\treectlg.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\wizard.h">
-			</File>
-		</Filter>
+				RelativePath="..\..\include\wx\generic\statusbr.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\textdlgg.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\timectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\treectlg.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\wizard.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="wxUniv Headers"
 			UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}">
@@ -4888,21 +4888,21 @@
 				RelativePath="..\..\include\wx\univ\colschem.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\univ\combobox.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\control.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\custombgwin.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\dialog.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\frame.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\univ\combobox.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\control.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\custombgwin.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\dialog.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\frame.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\univ\gauge.h">
 			</File>
 			<File
@@ -5196,36 +5196,36 @@
 				RelativePath="..\..\include\wx\cshelp.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\ctrlsub.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\cursor.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\custombgwin.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dataobj.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dataview.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\datectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dateevt.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\datetimectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dc.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dcbuffer.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\ctrlsub.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\cursor.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\custombgwin.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dataobj.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dataview.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\datectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dateevt.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\datetimectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dc.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dcbuffer.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\dcclient.h">
 			</File>
 			<File
@@ -5673,21 +5673,21 @@
 				RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\richtext\richtextuicustomization.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\richtext\richtextxml.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\richtooltip.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\sashwin.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\scopeguard.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\richtext\richtextuicustomization.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextxml.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtooltip.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\sashwin.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\scopeguard.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\scrolbar.h">
 			</File>
 			<File
@@ -5766,21 +5766,21 @@
 				RelativePath="..\..\include\wx\textentry.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\textwrapper.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tglbtn.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\timectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tipdlg.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tipwin.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\textwrapper.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\tglbtn.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\timectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\tipdlg.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\tipwin.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\ribbon\toolbar.h">
 			</File>
 			<File
@@ -5841,12 +5841,12 @@
 				RelativePath="..\..\include\wx\vscroll.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\webview.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\webviewarchivehandler.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\webview.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\webviewarchivehandler.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\persist\window.h">
 			</File>
 			<File
@@ -6033,21 +6033,21 @@
 				RelativePath="..\..\include\wx\xrc\xh_sttxt.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_text.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_timectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_toolb.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_toolbk.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\xrc\xh_text.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_timectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_toolb.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_toolbk.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\xrc\xh_tree.h">
 			</File>
 			<File
diff --git a/build/msw/wx_vc7_xrc.vcproj b/build/msw/wx_vc7_xrc.vcproj
index 5fde1d7ac9..0ad7748cb9 100644
--- a/build/msw/wx_vc7_xrc.vcproj
+++ b/build/msw/wx_vc7_xrc.vcproj
@@ -934,21 +934,21 @@
 				RelativePath="..\..\include\wx\xrc\xh_sttxt.h">
 			</File>
 			<File
-				RelativePath="..\..\include\wx\xrc\xh_text.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_timectrl.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_toolb.h">
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_toolbk.h">
-			</File>
-			<File
+				RelativePath="..\..\include\wx\xrc\xh_text.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_timectrl.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_toolb.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_toolbk.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\xrc\xh_tree.h">
 			</File>
 			<File
@@ -1128,21 +1128,21 @@
 				RelativePath="..\..\src\xrc\xh_sttxt.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\xrc\xh_text.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\xrc\xh_tglbtn.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\xrc\xh_timectrl.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\xrc\xh_toolb.cpp">
-			</File>
-			<File
-				RelativePath="..\..\src\xrc\xh_toolbk.cpp">
-			</File>
-			<File
+				RelativePath="..\..\src\xrc\xh_text.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\xrc\xh_tglbtn.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\xrc\xh_timectrl.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\xrc\xh_toolb.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\xrc\xh_toolbk.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src\xrc\xh_tree.cpp">
 			</File>
 			<File
diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj
index ffc90f0d82..ae08fda577 100644
--- a/build/msw/wx_vc8_adv.vcproj
+++ b/build/msw/wx_vc8_adv.vcproj
@@ -829,22 +829,22 @@
 			<File
 				RelativePath="..\..\src\common\hyperlnkcmn.cpp"
 				>
-			</File>
-			<File
-				RelativePath="..\..\src\common\odcombocmn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\common\richtooltipcmn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\common\taskbarcmn.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="MSW Sources"
+			</File>
+			<File
+				RelativePath="..\..\src\common\odcombocmn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\richtooltipcmn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\taskbarcmn.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="MSW Sources"
 			UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"
 			>
 			<File
@@ -946,38 +946,38 @@
 					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\datetimectrl.cpp"
-				>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\hyperlink.cpp"
-				>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\datetimectrl.cpp"
+				>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\hyperlink.cpp"
+				>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
@@ -994,146 +994,82 @@
 			<File
 				RelativePath="..\..\src\msw\joystick.cpp"
 				>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\notifmsg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\richtooltip.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivud\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivu\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivuddll\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivudll\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\sound.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\taskbar.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\timectrl.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\version.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\notifmsg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\richtooltip.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\sound.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\taskbar.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\timectrl.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\adv\msw_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\adv\msw_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\adv\msw_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\adv\msw_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\version.rc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="true"
@@ -1223,162 +1159,98 @@
 			<File
 				RelativePath="..\..\src\generic\odcombo.cpp"
 				>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\propdlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\richtooltip.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivud\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivu\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivuddll\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivudll\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\sashwin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\splash.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\timectrl.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivud\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivu\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivuddll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivudll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\tipdlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\treelist.cpp"
-				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\propdlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\richtooltipg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\sashwin.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\splash.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\timectrl.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\tipdlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\treelist.cpp"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\wizard.cpp"
@@ -1517,22 +1389,22 @@
 			<File
 				RelativePath="..\..\include\wx\msw\commandlinkbutton.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datetimectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\genrcdefs.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datetimectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\genrcdefs.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
@@ -1632,22 +1504,22 @@
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\sound.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\taskbar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\timectrl.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Generic Headers"
-			UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
-			>
-			<File
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\taskbar.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\timectrl.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Generic Headers"
+			UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
+			>
+			<File
 				RelativePath="..\..\include\wx\generic\aboutdlgg.h"
 				>
 			</File>
@@ -1718,22 +1590,22 @@
 			<File
 				RelativePath="..\..\include\wx\generic\sashwin.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\splash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\timectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\wizard.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Common Headers"
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\splash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\timectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\wizard.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Common Headers"
 			UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"
 			>
 			<File
@@ -1767,22 +1639,22 @@
 			<File
 				RelativePath="..\..\include\wx\datectrl.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dateevt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\datetimectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dcbuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dvrenderers.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dateevt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\datetimectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dcbuffer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dvrenderers.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\editlbox.h"
@@ -1811,42 +1683,42 @@
 			<File
 				RelativePath="..\..\include\wx\odcombo.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\propdlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\richtooltip.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\sashwin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\sound.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\propdlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtooltip.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\sashwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\sound.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\splash.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\taskbar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\timectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tipdlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\treelist.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\taskbar.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\timectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\tipdlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\treelist.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\wizard.h"
diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index 1e83f9b5ab..268ba0971c 100644
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -1151,10 +1151,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\common\time.cpp"
-				>
-			</File>
-			<File
+				RelativePath="..\..\src\common\time.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\common\timercmn.cpp"
 				>
 			</File>
@@ -1816,22 +1816,22 @@
 			<File
 				RelativePath="..\..\include\wx\encconv.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\event.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\eventfilter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\evtloop.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\except.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\event.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\eventfilter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\evtloop.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\except.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\features.h"
@@ -2154,10 +2154,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\time.h"
-				>
-			</File>
-			<File
+				RelativePath="..\..\include\wx\time.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\wx\timer.h"
 				>
 			</File>
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index a653721643..bd23086eef 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -2554,22 +2554,22 @@
 					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\nonownedwnd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\notebook.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\nonownedwnd.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\notebook.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
 						Name="VCCLCompilerTool"
 						ObjectFile="vc_mswud\core\msw_notebook.obj"
 					/>
@@ -5782,42 +5782,42 @@
 			<File
 				RelativePath="..\..\include\wx\msw\ctrlsub.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\cursor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\custombgwin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\ole\dataform.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\ole\dataobj.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\cursor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\custombgwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ole\dataform.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ole\dataobj.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\dataobj2.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datetimectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\dc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\dcclient.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datetimectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\dc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\dcclient.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\dcmemory.h"
@@ -6062,22 +6062,22 @@
 			<File
 				RelativePath="..\..\include\wx\msw\msgdlg.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\msvcrt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\nonownedwnd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\notebook.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\notifmsg.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\msvcrt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\nonownedwnd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\notebook.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\notifmsg.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\oleutils.h"
@@ -6190,22 +6190,22 @@
 			<File
 				RelativePath="..\..\include\wx\msw\textentry.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\tglbtn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\timectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\toolbar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\tooltip.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\tglbtn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\timectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\toolbar.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\tooltip.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\toplevel.h"
@@ -6228,14 +6228,14 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\webview_ie.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h"
-				>
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\webview_ie.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\window.h"
 				>
 			</File>
@@ -6291,22 +6291,22 @@
 			<File
 				RelativePath="..\..\include\wx\generic\combo.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\ctrlsub.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\custombgwin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\dataview.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\datectrl.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\ctrlsub.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\custombgwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\dataview.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\datectrl.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\dcpsg.h"
@@ -6479,22 +6479,22 @@
 			<File
 				RelativePath="..\..\include\wx\generic\statusbr.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\textdlgg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\timectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\treectlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\wizard.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\textdlgg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\timectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\treectlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\wizard.h"
+				>
 			</File>
 		</Filter>
 		<Filter
@@ -6540,22 +6540,22 @@
 			<File
 				RelativePath="..\..\include\wx\univ\combobox.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\control.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\custombgwin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\dialog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\frame.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\control.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\custombgwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\dialog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\frame.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\univ\gauge.h"
@@ -6950,42 +6950,42 @@
 			<File
 				RelativePath="..\..\include\wx\ctrlsub.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\cursor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\custombgwin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dataobj.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dataview.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\cursor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\custombgwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dataobj.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dataview.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\datectrl.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dateevt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\datetimectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dcbuffer.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dateevt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\datetimectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dcbuffer.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\dcclient.h"
@@ -7586,22 +7586,22 @@
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextuicustomization.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\richtext\richtextxml.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\richtooltip.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\sashwin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\scopeguard.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextxml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtooltip.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\sashwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\scopeguard.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\scrolbar.h"
@@ -7710,22 +7710,22 @@
 			<File
 				RelativePath="..\..\include\wx\textwrapper.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tglbtn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\timectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tipdlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tipwin.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\tglbtn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\timectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\tipdlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\tipwin.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\ribbon\toolbar.h"
@@ -7808,14 +7808,14 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\webview.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\webviewarchivehandler.h"
-				>
-			</File>
-			<File
+				RelativePath="..\..\include\wx\webview.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\webviewarchivehandler.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\wx\persist\window.h"
 				>
 			</File>
@@ -8066,22 +8066,22 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_text.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_toolb.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_toolbk.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_toolb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_toolbk.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_tree.h"
diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj
index 82ee966b34..196f1482fa 100644
--- a/build/msw/wx_vc8_xrc.vcproj
+++ b/build/msw/wx_vc8_xrc.vcproj
@@ -1269,22 +1269,22 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_text.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_toolb.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_toolbk.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_toolb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_toolbk.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_tree.h"
@@ -1527,22 +1527,22 @@
 			<File
 				RelativePath="..\..\src\xrc\xh_text.cpp"
 				>
-			</File>
-			<File
-				RelativePath="..\..\src\xrc\xh_tglbtn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\xrc\xh_timectrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\xrc\xh_toolb.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\xrc\xh_toolbk.cpp"
-				>
+			</File>
+			<File
+				RelativePath="..\..\src\xrc\xh_tglbtn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\xrc\xh_timectrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\xrc\xh_toolb.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\xrc\xh_toolbk.cpp"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_tree.cpp"
diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj
index 24233502bc..79edd375e9 100644
--- a/build/msw/wx_vc9_adv.vcproj
+++ b/build/msw/wx_vc9_adv.vcproj
@@ -825,22 +825,22 @@
 			<File
 				RelativePath="..\..\src\common\hyperlnkcmn.cpp"
 				>
-			</File>
-			<File
-				RelativePath="..\..\src\common\odcombocmn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\common\richtooltipcmn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\common\taskbarcmn.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="MSW Sources"
+			</File>
+			<File
+				RelativePath="..\..\src\common\odcombocmn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\richtooltipcmn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\taskbarcmn.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="MSW Sources"
 			UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"
 			>
 			<File
@@ -942,38 +942,38 @@
 					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\datetimectrl.cpp"
-				>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\hyperlink.cpp"
-				>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\datetimectrl.cpp"
+				>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\hyperlink.cpp"
+				>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
 				<FileConfiguration
 					Name="Universal Release|Win32"
 					ExcludedFromBuild="true"
@@ -990,146 +990,82 @@
 			<File
 				RelativePath="..\..\src\msw\joystick.cpp"
 				>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\notifmsg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\richtooltip.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivud\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivu\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivuddll\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivudll\adv\msw_richtooltip.obj"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\sound.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\taskbar.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\timectrl.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\msw_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\version.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\notifmsg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\richtooltip.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\sound.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\taskbar.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\timectrl.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\adv\msw_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\adv\msw_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\adv\msw_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\adv\msw_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\version.rc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+				/>
 				<FileConfiguration
 					Name="Release|Win32"
 					ExcludedFromBuild="true"
@@ -1219,162 +1155,98 @@
 			<File
 				RelativePath="..\..\src\generic\odcombo.cpp"
 				>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\propdlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\richtooltip.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivud\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivu\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivuddll\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivudll\adv\generic_richtooltip.obj"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\sashwin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\splash.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\timectrl.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswud\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswu\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivud\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivu\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswuddll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswudll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivuddll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="vc_mswunivudll\adv\generic_timectrl.obj"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\tipdlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\generic\treelist.cpp"
-				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\propdlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\richtooltipg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\sashwin.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\splash.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\timectrl.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\adv\generic_timectrl.obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\tipdlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\generic\treelist.cpp"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\wizard.cpp"
@@ -1513,22 +1385,22 @@
 			<File
 				RelativePath="..\..\include\wx\msw\commandlinkbutton.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datetimectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\genrcdefs.h"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datetimectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\genrcdefs.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
 						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"
@@ -1628,22 +1500,22 @@
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\sound.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\taskbar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\timectrl.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Generic Headers"
-			UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
-			>
-			<File
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\taskbar.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\timectrl.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Generic Headers"
+			UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
+			>
+			<File
 				RelativePath="..\..\include\wx\generic\aboutdlgg.h"
 				>
 			</File>
@@ -1714,22 +1586,22 @@
 			<File
 				RelativePath="..\..\include\wx\generic\sashwin.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\splash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\timectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\wizard.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Common Headers"
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\splash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\timectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\wizard.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Common Headers"
 			UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"
 			>
 			<File
@@ -1763,22 +1635,22 @@
 			<File
 				RelativePath="..\..\include\wx\datectrl.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dateevt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\datetimectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dcbuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dvrenderers.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dateevt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\datetimectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dcbuffer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dvrenderers.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\editlbox.h"
@@ -1807,42 +1679,42 @@
 			<File
 				RelativePath="..\..\include\wx\odcombo.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\propdlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\richtooltip.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\sashwin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\sound.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\propdlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtooltip.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\sashwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\sound.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\splash.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\taskbar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\timectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tipdlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\treelist.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\taskbar.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\timectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\tipdlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\treelist.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\wizard.h"
diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj
index 24847c9d03..078db70378 100644
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -1147,10 +1147,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\common\time.cpp"
-				>
-			</File>
-			<File
+				RelativePath="..\..\src\common\time.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\common\timercmn.cpp"
 				>
 			</File>
@@ -1812,22 +1812,22 @@
 			<File
 				RelativePath="..\..\include\wx\encconv.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\event.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\eventfilter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\evtloop.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\except.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\event.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\eventfilter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\evtloop.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\except.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\features.h"
@@ -2150,10 +2150,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\time.h"
-				>
-			</File>
-			<File
+				RelativePath="..\..\include\wx\time.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\wx\timer.h"
 				>
 			</File>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 262997a05b..860a305e05 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -2550,22 +2550,22 @@
 					Name="DLL Universal Debug|Win32"
 					ExcludedFromBuild="true"
 				/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					ExcludedFromBuild="true"
-				/>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\nonownedwnd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\msw\notebook.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"
+				/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\nonownedwnd.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\notebook.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
 						Name="VCCLCompilerTool"
 						ObjectFile="vc_mswud\core\msw_notebook.obj"
 					/>
@@ -5778,42 +5778,42 @@
 			<File
 				RelativePath="..\..\include\wx\msw\ctrlsub.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\cursor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\custombgwin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\ole\dataform.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\ole\dataobj.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\cursor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\custombgwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ole\dataform.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\ole\dataobj.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\dataobj2.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\datetimectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\dc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\dcclient.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\datetimectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\dc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\dcclient.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\dcmemory.h"
@@ -6058,22 +6058,22 @@
 			<File
 				RelativePath="..\..\include\wx\msw\msgdlg.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\msvcrt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\nonownedwnd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\notebook.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\notifmsg.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\msvcrt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\nonownedwnd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\notebook.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\notifmsg.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\ole\oleutils.h"
@@ -6186,22 +6186,22 @@
 			<File
 				RelativePath="..\..\include\wx\msw\textentry.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\tglbtn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\timectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\toolbar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\tooltip.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\tglbtn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\timectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\toolbar.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\tooltip.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\toplevel.h"
@@ -6224,14 +6224,14 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\msw\webview_ie.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h"
-				>
-			</File>
-			<File
+				RelativePath="..\..\include\wx\msw\webview_ie.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\window.h"
 				>
 			</File>
@@ -6287,22 +6287,22 @@
 			<File
 				RelativePath="..\..\include\wx\generic\combo.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\ctrlsub.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\custombgwin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\dataview.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\datectrl.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\ctrlsub.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\custombgwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\dataview.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\datectrl.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\dcpsg.h"
@@ -6475,22 +6475,22 @@
 			<File
 				RelativePath="..\..\include\wx\generic\statusbr.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\textdlgg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\timectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\treectlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\wizard.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\textdlgg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\timectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\treectlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\wizard.h"
+				>
 			</File>
 		</Filter>
 		<Filter
@@ -6536,22 +6536,22 @@
 			<File
 				RelativePath="..\..\include\wx\univ\combobox.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\control.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\custombgwin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\dialog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\frame.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\control.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\custombgwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\dialog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\frame.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\univ\gauge.h"
@@ -6946,42 +6946,42 @@
 			<File
 				RelativePath="..\..\include\wx\ctrlsub.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\cursor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\custombgwin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dataobj.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dataview.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\cursor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\custombgwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dataobj.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dataview.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\datectrl.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dateevt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\datetimectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\dcbuffer.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dateevt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\datetimectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\dcbuffer.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\dcclient.h"
@@ -7582,22 +7582,22 @@
 			<File
 				RelativePath="..\..\include\wx\richtext\richtextuicustomization.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\richtext\richtextxml.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\richtooltip.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\sashwin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\scopeguard.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtext\richtextxml.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\richtooltip.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\sashwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\scopeguard.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\scrolbar.h"
@@ -7706,22 +7706,22 @@
 			<File
 				RelativePath="..\..\include\wx\textwrapper.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tglbtn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\timectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tipdlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\tipwin.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\tglbtn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\timectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\tipdlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\tipwin.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\ribbon\toolbar.h"
@@ -7804,14 +7804,14 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\wx\webview.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\webviewarchivehandler.h"
-				>
-			</File>
-			<File
+				RelativePath="..\..\include\wx\webview.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\webviewarchivehandler.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\wx\persist\window.h"
 				>
 			</File>
@@ -8062,22 +8062,22 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_text.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_toolb.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_toolbk.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_toolb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_toolbk.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_tree.h"
diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj
index 4a464e4dbb..3f2bd2847a 100644
--- a/build/msw/wx_vc9_xrc.vcproj
+++ b/build/msw/wx_vc9_xrc.vcproj
@@ -1265,22 +1265,22 @@
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_text.h"
 				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_toolb.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\wx\xrc\xh_toolbk.h"
-				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_timectrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_toolb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\wx\xrc\xh_toolbk.h"
+				>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\xrc\xh_tree.h"
@@ -1523,22 +1523,22 @@
 			<File
 				RelativePath="..\..\src\xrc\xh_text.cpp"
 				>
-			</File>
-			<File
-				RelativePath="..\..\src\xrc\xh_tglbtn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\xrc\xh_timectrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\xrc\xh_toolb.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\xrc\xh_toolbk.cpp"
-				>
+			</File>
+			<File
+				RelativePath="..\..\src\xrc\xh_tglbtn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\xrc\xh_timectrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\xrc\xh_toolb.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\xrc\xh_toolbk.cpp"
+				>
 			</File>
 			<File
 				RelativePath="..\..\src\xrc\xh_tree.cpp"
diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp
index 26dead016f..a0c0fcbb00 100644
--- a/build/msw/wx_xrc.dsp
+++ b/build/msw/wx_xrc.dsp
@@ -748,22 +748,22 @@ SOURCE=..\..\include\wx\xrc\xh_sttxt.h
 
 SOURCE=..\..\include\wx\xrc\xh_text.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_tglbtn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_timectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_toolb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_toolbk.h
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_tglbtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_timectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_toolb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_toolbk.h
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\include\wx\xrc\xh_tree.h
@@ -1004,22 +1004,22 @@ SOURCE=..\..\src\xrc\xh_sttxt.cpp
 
 SOURCE=..\..\src\xrc\xh_text.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\src\xrc\xh_tglbtn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\xrc\xh_timectrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\xrc\xh_toolb.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\xrc\xh_toolbk.cpp
-# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\xrc\xh_tglbtn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\xrc\xh_timectrl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\xrc\xh_toolb.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\xrc\xh_toolbk.cpp
+# End Source File
 # Begin Source File
 
 SOURCE=..\..\src\xrc\xh_tree.cpp
diff --git a/src/generic/richtooltip.cpp b/src/generic/richtooltipg.cpp
similarity index 99%
rename from src/generic/richtooltip.cpp
rename to src/generic/richtooltipg.cpp
index 7cb677aad7..2cbce1e6fd 100644
--- a/src/generic/richtooltip.cpp
+++ b/src/generic/richtooltipg.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        src/generic/richtooltip.cpp
+// Name:        src/generic/richtooltipg.cpp
 // Purpose:     Implementation of wxRichToolTip.
 // Author:      Vadim Zeitlin
 // Created:     2011-10-07