Rename src/generic/richtooltip.cpp to src/generic/richtooltipg.cpp.

author Vadim Zeitlin <vadim@wxwidgets.org>

Fri, 2 Dec 2011 00:56:44 +0000 (00:56 +0000)

committer Vadim Zeitlin <vadim@wxwidgets.org>

Fri, 2 Dec 2011 00:56:44 +0000 (00:56 +0000)
author Vadim Zeitlin <vadim@wxwidgets.org>
Fri, 2 Dec 2011 00:56:44 +0000 (00:56 +0000)
committer Vadim Zeitlin <vadim@wxwidgets.org>
Fri, 2 Dec 2011 00:56:44 +0000 (00:56 +0000)
diff --git a/Makefile.in b/Makefile.in

index 70083bcab2f8ddf07a5e56dbbcee5dac766c48d9..80dbefb426f0380c85aadb868526e2c7b676b9aa 100644 (file)
--- 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 f8aa57fcc15e361f9ceb2b935af6346a4f2b6d17..d4a6dab336f029a118586767548ec998d8f382d5 100644 (file)
--- 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 a74195709eae2aac6cc02c8c00914cc93317d465..351d72227d9f73eaa790cebbc0966e65714337b0 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -390,7 +390,7 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_tarstrm.obj \\r
         $(OBJS)\monodll_textbuf.obj \\r
         $(OBJS)\monodll_textfile.obj \\r
-       $(OBJS)\monodll_time.obj \
+       $(OBJS)\monodll_time.obj \\r
         $(OBJS)\monodll_timercmn.obj \\r
         $(OBJS)\monodll_timerimpl.obj \\r
         $(OBJS)\monodll_tokenzr.obj \\r
@@ -539,7 +539,7 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_tarstrm.obj \\r
         $(OBJS)\monolib_textbuf.obj \\r
         $(OBJS)\monolib_textfile.obj \\r
-       $(OBJS)\monolib_time.obj \
+       $(OBJS)\monolib_time.obj \\r
         $(OBJS)\monolib_timercmn.obj \\r
         $(OBJS)\monolib_timerimpl.obj \\r
         $(OBJS)\monolib_tokenzr.obj \\r
@@ -686,7 +686,7 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_tarstrm.obj \\r
         $(OBJS)\basedll_textbuf.obj \\r
         $(OBJS)\basedll_textfile.obj \\r
-       $(OBJS)\basedll_time.obj \
+       $(OBJS)\basedll_time.obj \\r
         $(OBJS)\basedll_timercmn.obj \\r
         $(OBJS)\basedll_timerimpl.obj \\r
         $(OBJS)\basedll_tokenzr.obj \\r
@@ -817,7 +817,7 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_tarstrm.obj \\r
         $(OBJS)\baselib_textbuf.obj \\r
         $(OBJS)\baselib_textfile.obj \\r
-       $(OBJS)\baselib_time.obj \
+       $(OBJS)\baselib_time.obj \\r
         $(OBJS)\baselib_timercmn.obj \\r
         $(OBJS)\baselib_timerimpl.obj \\r
         $(OBJS)\baselib_tokenzr.obj \\r
@@ -1217,19 +1217,19 @@ XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_xh_split.obj \\r
         $(OBJS)\xrcdll_xh_srchctrl.obj \\r
         $(OBJS)\xrcdll_xh_statbar.obj \\r
-       $(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 \\r
+       $(OBJS)\xrcdll_xh_stbox.obj \\r
+       $(OBJS)\xrcdll_xh_stlin.obj \\r
+       $(OBJS)\xrcdll_xh_sttxt.obj \\r
+       $(OBJS)\xrcdll_xh_text.obj \\r
+       $(OBJS)\xrcdll_xh_tglbtn.obj \\r
+       $(OBJS)\xrcdll_xh_timectrl.obj \\r
+       $(OBJS)\xrcdll_xh_toolb.obj \\r
+       $(OBJS)\xrcdll_xh_toolbk.obj \\r
+       $(OBJS)\xrcdll_xh_tree.obj \\r
+       $(OBJS)\xrcdll_xh_treebk.obj \\r
+       $(OBJS)\xrcdll_xh_unkwn.obj \\r
+       $(OBJS)\xrcdll_xh_wizrd.obj \\r
         $(OBJS)\xrcdll_xmlres.obj \\r
         $(OBJS)\xrcdll_xmladv.obj \\r
         $(OBJS)\xrcdll_xmlrsall.obj\r
@@ -1293,19 +1293,19 @@ XRCLIB_OBJECTS =  \
         $(OBJS)\xrclib_xh_split.obj \\r
         $(OBJS)\xrclib_xh_srchctrl.obj \\r
         $(OBJS)\xrclib_xh_statbar.obj \\r
-       $(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 \\r
+       $(OBJS)\xrclib_xh_stbox.obj \\r
+       $(OBJS)\xrclib_xh_stlin.obj \\r
+       $(OBJS)\xrclib_xh_sttxt.obj \\r
+       $(OBJS)\xrclib_xh_text.obj \\r
+       $(OBJS)\xrclib_xh_tglbtn.obj \\r
+       $(OBJS)\xrclib_xh_timectrl.obj \\r
+       $(OBJS)\xrclib_xh_toolb.obj \\r
+       $(OBJS)\xrclib_xh_toolbk.obj \\r
+       $(OBJS)\xrclib_xh_tree.obj \\r
+       $(OBJS)\xrclib_xh_treebk.obj \\r
+       $(OBJS)\xrclib_xh_unkwn.obj \\r
+       $(OBJS)\xrclib_xh_wizrd.obj \\r
         $(OBJS)\xrclib_xmlres.obj \\r
         $(OBJS)\xrclib_xmladv.obj \\r
         $(OBJS)\xrclib_xmlrsall.obj\r
@@ -1666,19 +1666,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_xh_split.obj \\r
         $(OBJS)\monodll_xh_srchctrl.obj \\r
         $(OBJS)\monodll_xh_statbar.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_xh_stbox.obj \\r
+       $(OBJS)\monodll_xh_stlin.obj \\r
+       $(OBJS)\monodll_xh_sttxt.obj \\r
+       $(OBJS)\monodll_xh_text.obj \\r
+       $(OBJS)\monodll_xh_tglbtn.obj \\r
+       $(OBJS)\monodll_xh_timectrl.obj \\r
+       $(OBJS)\monodll_xh_toolb.obj \\r
+       $(OBJS)\monodll_xh_toolbk.obj \\r
+       $(OBJS)\monodll_xh_tree.obj \\r
+       $(OBJS)\monodll_xh_treebk.obj \\r
+       $(OBJS)\monodll_xh_unkwn.obj \\r
+       $(OBJS)\monodll_xh_wizrd.obj \\r
         $(OBJS)\monodll_xmlres.obj \\r
         $(OBJS)\monodll_xmladv.obj \\r
         $(OBJS)\monodll_xmlrsall.obj \\r
@@ -1744,19 +1744,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_fontenum.obj \\r
         $(OBJS)\monodll_fontutil.obj \\r
         $(OBJS)\monodll_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_gdiplus.obj \\r
+       $(OBJS)\monodll_graphics.obj \\r
+       $(OBJS)\monodll_icon.obj \\r
+       $(OBJS)\monodll_imaglist.obj \\r
+       $(OBJS)\monodll_minifram.obj \\r
+       $(OBJS)\monodll_nonownedwnd.obj \\r
+       $(OBJS)\monodll_dataobj.obj \\r
+       $(OBJS)\monodll_dropsrc.obj \\r
+       $(OBJS)\monodll_droptgt.obj \\r
+       $(OBJS)\monodll_oleutils.obj \\r
+       $(OBJS)\monodll_palette.obj \\r
+       $(OBJS)\monodll_pen.obj \\r
         $(OBJS)\monodll_popupwin.obj \\r
         $(OBJS)\monodll_printdlg.obj \\r
         $(OBJS)\monodll_printwin.obj \\r
@@ -2016,19 +2016,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_fontenum.obj \\r
         $(OBJS)\monodll_fontutil.obj \\r
         $(OBJS)\monodll_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_gdiplus.obj \\r
+       $(OBJS)\monodll_graphics.obj \\r
+       $(OBJS)\monodll_icon.obj \\r
+       $(OBJS)\monodll_imaglist.obj \\r
+       $(OBJS)\monodll_minifram.obj \\r
+       $(OBJS)\monodll_nonownedwnd.obj \\r
+       $(OBJS)\monodll_dataobj.obj \\r
+       $(OBJS)\monodll_dropsrc.obj \\r
+       $(OBJS)\monodll_droptgt.obj \\r
+       $(OBJS)\monodll_oleutils.obj \\r
+       $(OBJS)\monodll_palette.obj \\r
+       $(OBJS)\monodll_pen.obj \\r
         $(OBJS)\monodll_popupwin.obj \\r
         $(OBJS)\monodll_printdlg.obj \\r
         $(OBJS)\monodll_printwin.obj \\r
@@ -2261,100 +2261,100 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
  !if "$(WXUNIV)" == "0"\r
  ____ADVANCED_SRC_FILENAMES_OBJECTS =  \\r
         $(OBJS)\monodll_animatecmn.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_calctrlcmn.obj \\r
+       $(OBJS)\monodll_datavcmn.obj \\r
+       $(OBJS)\monodll_gridcmn.obj \\r
+       $(OBJS)\monodll_hyperlnkcmn.obj \\r
+       $(OBJS)\monodll_odcombocmn.obj \\r
+       $(OBJS)\monodll_richtooltipcmn.obj \\r
+       $(OBJS)\monodll_aboutdlgg.obj \\r
+       $(OBJS)\monodll_bannerwindow.obj \\r
+       $(OBJS)\monodll_bmpcboxg.obj \\r
+       $(OBJS)\monodll_calctrlg.obj \\r
+       $(OBJS)\monodll_commandlinkbuttong.obj \\r
+       $(OBJS)\monodll_datavgen.obj \\r
         $(OBJS)\monodll_datectlg.obj \\r
         $(OBJS)\monodll_editlbox.obj \\r
         $(OBJS)\monodll_grid.obj \\r
         $(OBJS)\monodll_gridctrl.obj \\r
         $(OBJS)\monodll_grideditors.obj \\r
         $(OBJS)\monodll_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_hyperlinkg.obj \\r
+       $(OBJS)\monodll_laywin.obj \\r
+       $(OBJS)\monodll_notifmsgg.obj \\r
+       $(OBJS)\monodll_odcombo.obj \\r
+       $(OBJS)\monodll_propdlg.obj \\r
+       $(OBJS)\monodll_richtooltipg.obj \\r
+       $(OBJS)\monodll_sashwin.obj \\r
+       $(OBJS)\monodll_splash.obj \\r
+       $(OBJS)\monodll_generic_timectrl.obj \\r
+       $(OBJS)\monodll_tipdlg.obj \\r
+       $(OBJS)\monodll_treelist.obj \\r
+       $(OBJS)\monodll_wizard.obj \\r
+       $(OBJS)\monodll_taskbarcmn.obj \\r
+       $(OBJS)\monodll_aboutdlg.obj \\r
+       $(OBJS)\monodll_notifmsg.obj \\r
+       $(OBJS)\monodll_richtooltip.obj \\r
+       $(OBJS)\monodll_sound.obj \\r
+       $(OBJS)\monodll_taskbar.obj \\r
+       $(OBJS)\monodll_joystick.obj \\r
+       $(OBJS)\monodll_animateg.obj \\r
+       $(OBJS)\monodll_bmpcbox.obj \\r
+       $(OBJS)\monodll_calctrl.obj \\r
+       $(OBJS)\monodll_commandlinkbutton.obj \\r
+       $(OBJS)\monodll_datecontrols.obj \\r
+       $(OBJS)\monodll_datectrl.obj \\r
+       $(OBJS)\monodll_datetimectrl.obj \\r
+       $(OBJS)\monodll_hyperlink.obj \\r
+       $(OBJS)\monodll_msw_timectrl.obj\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+____ADVANCED_SRC_FILENAMES_OBJECTS =  \\r
+       $(OBJS)\monodll_animatecmn.obj \\r
+       $(OBJS)\monodll_bmpcboxcmn.obj \\r
+       $(OBJS)\monodll_calctrlcmn.obj \\r
+       $(OBJS)\monodll_datavcmn.obj \\r
+       $(OBJS)\monodll_gridcmn.obj \\r
+       $(OBJS)\monodll_hyperlnkcmn.obj \\r
+       $(OBJS)\monodll_odcombocmn.obj \\r
+       $(OBJS)\monodll_richtooltipcmn.obj \\r
+       $(OBJS)\monodll_aboutdlgg.obj \\r
+       $(OBJS)\monodll_bannerwindow.obj \\r
+       $(OBJS)\monodll_bmpcboxg.obj \\r
+       $(OBJS)\monodll_calctrlg.obj \\r
+       $(OBJS)\monodll_commandlinkbuttong.obj \\r
+       $(OBJS)\monodll_datavgen.obj \\r
         $(OBJS)\monodll_datectlg.obj \\r
         $(OBJS)\monodll_editlbox.obj \\r
         $(OBJS)\monodll_grid.obj \\r
         $(OBJS)\monodll_gridctrl.obj \\r
         $(OBJS)\monodll_grideditors.obj \\r
         $(OBJS)\monodll_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_hyperlinkg.obj \\r
+       $(OBJS)\monodll_laywin.obj \\r
+       $(OBJS)\monodll_notifmsgg.obj \\r
+       $(OBJS)\monodll_odcombo.obj \\r
+       $(OBJS)\monodll_propdlg.obj \\r
+       $(OBJS)\monodll_richtooltipg.obj \\r
+       $(OBJS)\monodll_sashwin.obj \\r
+       $(OBJS)\monodll_splash.obj \\r
+       $(OBJS)\monodll_generic_timectrl.obj \\r
+       $(OBJS)\monodll_tipdlg.obj \\r
+       $(OBJS)\monodll_treelist.obj \\r
+       $(OBJS)\monodll_wizard.obj \\r
+       $(OBJS)\monodll_taskbarcmn.obj \\r
+       $(OBJS)\monodll_aboutdlg.obj \\r
+       $(OBJS)\monodll_notifmsg.obj \\r
+       $(OBJS)\monodll_richtooltip.obj \\r
+       $(OBJS)\monodll_sound.obj \\r
+       $(OBJS)\monodll_taskbar.obj \\r
+       $(OBJS)\monodll_joystick.obj \\r
+       $(OBJS)\monodll_animateg.obj\r
+!endif\r
+!if "$(USE_STC)" == "1"\r
  __wxscintilla_library_link_DEP = $(__wxscintilla)\r
  !endif\r
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"\r
@@ -2449,19 +2449,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_xh_split.obj \\r
         $(OBJS)\monolib_xh_srchctrl.obj \\r
         $(OBJS)\monolib_xh_statbar.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_xh_stbox.obj \\r
+       $(OBJS)\monolib_xh_stlin.obj \\r
+       $(OBJS)\monolib_xh_sttxt.obj \\r
+       $(OBJS)\monolib_xh_text.obj \\r
+       $(OBJS)\monolib_xh_tglbtn.obj \\r
+       $(OBJS)\monolib_xh_timectrl.obj \\r
+       $(OBJS)\monolib_xh_toolb.obj \\r
+       $(OBJS)\monolib_xh_toolbk.obj \\r
+       $(OBJS)\monolib_xh_tree.obj \\r
+       $(OBJS)\monolib_xh_treebk.obj \\r
+       $(OBJS)\monolib_xh_unkwn.obj \\r
+       $(OBJS)\monolib_xh_wizrd.obj \\r
         $(OBJS)\monolib_xmlres.obj \\r
         $(OBJS)\monolib_xmladv.obj \\r
         $(OBJS)\monolib_xmlrsall.obj \\r
@@ -2527,19 +2527,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_fontenum.obj \\r
         $(OBJS)\monolib_fontutil.obj \\r
         $(OBJS)\monolib_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_gdiplus.obj \\r
+       $(OBJS)\monolib_graphics.obj \\r
+       $(OBJS)\monolib_icon.obj \\r
+       $(OBJS)\monolib_imaglist.obj \\r
+       $(OBJS)\monolib_minifram.obj \\r
+       $(OBJS)\monolib_nonownedwnd.obj \\r
+       $(OBJS)\monolib_dataobj.obj \\r
+       $(OBJS)\monolib_dropsrc.obj \\r
+       $(OBJS)\monolib_droptgt.obj \\r
+       $(OBJS)\monolib_oleutils.obj \\r
+       $(OBJS)\monolib_palette.obj \\r
+       $(OBJS)\monolib_pen.obj \\r
         $(OBJS)\monolib_popupwin.obj \\r
         $(OBJS)\monolib_printdlg.obj \\r
         $(OBJS)\monolib_printwin.obj \\r
@@ -2799,19 +2799,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_fontenum.obj \\r
         $(OBJS)\monolib_fontutil.obj \\r
         $(OBJS)\monolib_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_gdiplus.obj \\r
+       $(OBJS)\monolib_graphics.obj \\r
+       $(OBJS)\monolib_icon.obj \\r
+       $(OBJS)\monolib_imaglist.obj \\r
+       $(OBJS)\monolib_minifram.obj \\r
+       $(OBJS)\monolib_nonownedwnd.obj \\r
+       $(OBJS)\monolib_dataobj.obj \\r
+       $(OBJS)\monolib_dropsrc.obj \\r
+       $(OBJS)\monolib_droptgt.obj \\r
+       $(OBJS)\monolib_oleutils.obj \\r
+       $(OBJS)\monolib_palette.obj \\r
+       $(OBJS)\monolib_pen.obj \\r
         $(OBJS)\monolib_popupwin.obj \\r
         $(OBJS)\monolib_printdlg.obj \\r
         $(OBJS)\monolib_printwin.obj \\r
@@ -3044,100 +3044,100 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
  !if "$(WXUNIV)" == "0"\r
  ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \\r
         $(OBJS)\monolib_animatecmn.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_calctrlcmn.obj \\r
+       $(OBJS)\monolib_datavcmn.obj \\r
+       $(OBJS)\monolib_gridcmn.obj \\r
+       $(OBJS)\monolib_hyperlnkcmn.obj \\r
+       $(OBJS)\monolib_odcombocmn.obj \\r
+       $(OBJS)\monolib_richtooltipcmn.obj \\r
+       $(OBJS)\monolib_aboutdlgg.obj \\r
+       $(OBJS)\monolib_bannerwindow.obj \\r
+       $(OBJS)\monolib_bmpcboxg.obj \\r
+       $(OBJS)\monolib_calctrlg.obj \\r
+       $(OBJS)\monolib_commandlinkbuttong.obj \\r
+       $(OBJS)\monolib_datavgen.obj \\r
         $(OBJS)\monolib_datectlg.obj \\r
         $(OBJS)\monolib_editlbox.obj \\r
         $(OBJS)\monolib_grid.obj \\r
         $(OBJS)\monolib_gridctrl.obj \\r
         $(OBJS)\monolib_grideditors.obj \\r
         $(OBJS)\monolib_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_hyperlinkg.obj \\r
+       $(OBJS)\monolib_laywin.obj \\r
+       $(OBJS)\monolib_notifmsgg.obj \\r
+       $(OBJS)\monolib_odcombo.obj \\r
+       $(OBJS)\monolib_propdlg.obj \\r
+       $(OBJS)\monolib_richtooltipg.obj \\r
+       $(OBJS)\monolib_sashwin.obj \\r
+       $(OBJS)\monolib_splash.obj \\r
+       $(OBJS)\monolib_generic_timectrl.obj \\r
+       $(OBJS)\monolib_tipdlg.obj \\r
+       $(OBJS)\monolib_treelist.obj \\r
+       $(OBJS)\monolib_wizard.obj \\r
+       $(OBJS)\monolib_taskbarcmn.obj \\r
+       $(OBJS)\monolib_aboutdlg.obj \\r
+       $(OBJS)\monolib_notifmsg.obj \\r
+       $(OBJS)\monolib_richtooltip.obj \\r
+       $(OBJS)\monolib_sound.obj \\r
+       $(OBJS)\monolib_taskbar.obj \\r
+       $(OBJS)\monolib_joystick.obj \\r
+       $(OBJS)\monolib_animateg.obj \\r
+       $(OBJS)\monolib_bmpcbox.obj \\r
+       $(OBJS)\monolib_calctrl.obj \\r
+       $(OBJS)\monolib_commandlinkbutton.obj \\r
+       $(OBJS)\monolib_datecontrols.obj \\r
+       $(OBJS)\monolib_datectrl.obj \\r
+       $(OBJS)\monolib_datetimectrl.obj \\r
+       $(OBJS)\monolib_hyperlink.obj \\r
+       $(OBJS)\monolib_msw_timectrl.obj\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \\r
+       $(OBJS)\monolib_animatecmn.obj \\r
+       $(OBJS)\monolib_bmpcboxcmn.obj \\r
+       $(OBJS)\monolib_calctrlcmn.obj \\r
+       $(OBJS)\monolib_datavcmn.obj \\r
+       $(OBJS)\monolib_gridcmn.obj \\r
+       $(OBJS)\monolib_hyperlnkcmn.obj \\r
+       $(OBJS)\monolib_odcombocmn.obj \\r
+       $(OBJS)\monolib_richtooltipcmn.obj \\r
+       $(OBJS)\monolib_aboutdlgg.obj \\r
+       $(OBJS)\monolib_bannerwindow.obj \\r
+       $(OBJS)\monolib_bmpcboxg.obj \\r
+       $(OBJS)\monolib_calctrlg.obj \\r
+       $(OBJS)\monolib_commandlinkbuttong.obj \\r
+       $(OBJS)\monolib_datavgen.obj \\r
         $(OBJS)\monolib_datectlg.obj \\r
         $(OBJS)\monolib_editlbox.obj \\r
         $(OBJS)\monolib_grid.obj \\r
         $(OBJS)\monolib_gridctrl.obj \\r
         $(OBJS)\monolib_grideditors.obj \\r
         $(OBJS)\monolib_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_hyperlinkg.obj \\r
+       $(OBJS)\monolib_laywin.obj \\r
+       $(OBJS)\monolib_notifmsgg.obj \\r
+       $(OBJS)\monolib_odcombo.obj \\r
+       $(OBJS)\monolib_propdlg.obj \\r
+       $(OBJS)\monolib_richtooltipg.obj \\r
+       $(OBJS)\monolib_sashwin.obj \\r
+       $(OBJS)\monolib_splash.obj \\r
+       $(OBJS)\monolib_generic_timectrl.obj \\r
+       $(OBJS)\monolib_tipdlg.obj \\r
+       $(OBJS)\monolib_treelist.obj \\r
+       $(OBJS)\monolib_wizard.obj \\r
+       $(OBJS)\monolib_taskbarcmn.obj \\r
+       $(OBJS)\monolib_aboutdlg.obj \\r
+       $(OBJS)\monolib_notifmsg.obj \\r
+       $(OBJS)\monolib_richtooltip.obj \\r
+       $(OBJS)\monolib_sound.obj \\r
+       $(OBJS)\monolib_taskbar.obj \\r
+       $(OBJS)\monolib_joystick.obj \\r
+       $(OBJS)\monolib_animateg.obj\r
+!endif\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
  __basedll___depname = \\r
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll\r
  !endif\r
@@ -3193,19 +3193,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_fontenum.obj \\r
         $(OBJS)\coredll_fontutil.obj \\r
         $(OBJS)\coredll_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\coredll_gdiplus.obj \\r
+       $(OBJS)\coredll_graphics.obj \\r
+       $(OBJS)\coredll_icon.obj \\r
+       $(OBJS)\coredll_imaglist.obj \\r
+       $(OBJS)\coredll_minifram.obj \\r
+       $(OBJS)\coredll_nonownedwnd.obj \\r
+       $(OBJS)\coredll_dataobj.obj \\r
+       $(OBJS)\coredll_dropsrc.obj \\r
+       $(OBJS)\coredll_droptgt.obj \\r
+       $(OBJS)\coredll_oleutils.obj \\r
+       $(OBJS)\coredll_palette.obj \\r
+       $(OBJS)\coredll_pen.obj \\r
         $(OBJS)\coredll_popupwin.obj \\r
         $(OBJS)\coredll_printdlg.obj \\r
         $(OBJS)\coredll_printwin.obj \\r
@@ -3465,19 +3465,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_fontenum.obj \\r
         $(OBJS)\coredll_fontutil.obj \\r
         $(OBJS)\coredll_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\coredll_gdiplus.obj \\r
+       $(OBJS)\coredll_graphics.obj \\r
+       $(OBJS)\coredll_icon.obj \\r
+       $(OBJS)\coredll_imaglist.obj \\r
+       $(OBJS)\coredll_minifram.obj \\r
+       $(OBJS)\coredll_nonownedwnd.obj \\r
+       $(OBJS)\coredll_dataobj.obj \\r
+       $(OBJS)\coredll_dropsrc.obj \\r
+       $(OBJS)\coredll_droptgt.obj \\r
+       $(OBJS)\coredll_oleutils.obj \\r
+       $(OBJS)\coredll_palette.obj \\r
+       $(OBJS)\coredll_pen.obj \\r
         $(OBJS)\coredll_popupwin.obj \\r
         $(OBJS)\coredll_printdlg.obj \\r
         $(OBJS)\coredll_printwin.obj \\r
@@ -3735,19 +3735,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_fontenum.obj \\r
         $(OBJS)\corelib_fontutil.obj \\r
         $(OBJS)\corelib_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\corelib_gdiplus.obj \\r
+       $(OBJS)\corelib_graphics.obj \\r
+       $(OBJS)\corelib_icon.obj \\r
+       $(OBJS)\corelib_imaglist.obj \\r
+       $(OBJS)\corelib_minifram.obj \\r
+       $(OBJS)\corelib_nonownedwnd.obj \\r
+       $(OBJS)\corelib_dataobj.obj \\r
+       $(OBJS)\corelib_dropsrc.obj \\r
+       $(OBJS)\corelib_droptgt.obj \\r
+       $(OBJS)\corelib_oleutils.obj \\r
+       $(OBJS)\corelib_palette.obj \\r
+       $(OBJS)\corelib_pen.obj \\r
         $(OBJS)\corelib_popupwin.obj \\r
         $(OBJS)\corelib_printdlg.obj \\r
         $(OBJS)\corelib_printwin.obj \\r
@@ -4007,19 +4007,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_fontenum.obj \\r
         $(OBJS)\corelib_fontutil.obj \\r
         $(OBJS)\corelib_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\corelib_gdiplus.obj \\r
+       $(OBJS)\corelib_graphics.obj \\r
+       $(OBJS)\corelib_icon.obj \\r
+       $(OBJS)\corelib_imaglist.obj \\r
+       $(OBJS)\corelib_minifram.obj \\r
+       $(OBJS)\corelib_nonownedwnd.obj \\r
+       $(OBJS)\corelib_dataobj.obj \\r
+       $(OBJS)\corelib_dropsrc.obj \\r
+       $(OBJS)\corelib_droptgt.obj \\r
+       $(OBJS)\corelib_oleutils.obj \\r
+       $(OBJS)\corelib_palette.obj \\r
+       $(OBJS)\corelib_pen.obj \\r
         $(OBJS)\corelib_popupwin.obj \\r
         $(OBJS)\corelib_printdlg.obj \\r
         $(OBJS)\corelib_printwin.obj \\r
@@ -4262,200 +4262,200 @@ __advdll___depname = \
  !if "$(WXUNIV)" == "0"\r
  ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \\r
         $(OBJS)\advdll_animatecmn.obj \\r
-       $(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 \\r
+       $(OBJS)\advdll_calctrlcmn.obj \\r
+       $(OBJS)\advdll_datavcmn.obj \\r
+       $(OBJS)\advdll_gridcmn.obj \\r
+       $(OBJS)\advdll_hyperlnkcmn.obj \\r
+       $(OBJS)\advdll_odcombocmn.obj \\r
+       $(OBJS)\advdll_richtooltipcmn.obj \\r
+       $(OBJS)\advdll_aboutdlgg.obj \\r
+       $(OBJS)\advdll_bannerwindow.obj \\r
+       $(OBJS)\advdll_bmpcboxg.obj \\r
+       $(OBJS)\advdll_calctrlg.obj \\r
+       $(OBJS)\advdll_commandlinkbuttong.obj \\r
+       $(OBJS)\advdll_datavgen.obj \\r
         $(OBJS)\advdll_datectlg.obj \\r
         $(OBJS)\advdll_editlbox.obj \\r
         $(OBJS)\advdll_grid.obj \\r
         $(OBJS)\advdll_gridctrl.obj \\r
         $(OBJS)\advdll_grideditors.obj \\r
         $(OBJS)\advdll_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\advdll_hyperlinkg.obj \\r
+       $(OBJS)\advdll_laywin.obj \\r
+       $(OBJS)\advdll_notifmsgg.obj \\r
+       $(OBJS)\advdll_odcombo.obj \\r
+       $(OBJS)\advdll_propdlg.obj \\r
+       $(OBJS)\advdll_richtooltipg.obj \\r
+       $(OBJS)\advdll_sashwin.obj \\r
+       $(OBJS)\advdll_splash.obj \\r
+       $(OBJS)\advdll_generic_timectrl.obj \\r
+       $(OBJS)\advdll_tipdlg.obj \\r
+       $(OBJS)\advdll_treelist.obj \\r
+       $(OBJS)\advdll_wizard.obj \\r
+       $(OBJS)\advdll_taskbarcmn.obj \\r
+       $(OBJS)\advdll_aboutdlg.obj \\r
+       $(OBJS)\advdll_notifmsg.obj \\r
+       $(OBJS)\advdll_richtooltip.obj \\r
+       $(OBJS)\advdll_sound.obj \\r
+       $(OBJS)\advdll_taskbar.obj \\r
+       $(OBJS)\advdll_joystick.obj \\r
+       $(OBJS)\advdll_animateg.obj \\r
+       $(OBJS)\advdll_bmpcbox.obj \\r
+       $(OBJS)\advdll_calctrl.obj \\r
+       $(OBJS)\advdll_commandlinkbutton.obj \\r
+       $(OBJS)\advdll_datecontrols.obj \\r
+       $(OBJS)\advdll_datectrl.obj \\r
+       $(OBJS)\advdll_datetimectrl.obj \\r
+       $(OBJS)\advdll_hyperlink.obj \\r
+       $(OBJS)\advdll_msw_timectrl.obj\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \\r
+       $(OBJS)\advdll_animatecmn.obj \\r
+       $(OBJS)\advdll_bmpcboxcmn.obj \\r
+       $(OBJS)\advdll_calctrlcmn.obj \\r
+       $(OBJS)\advdll_datavcmn.obj \\r
+       $(OBJS)\advdll_gridcmn.obj \\r
+       $(OBJS)\advdll_hyperlnkcmn.obj \\r
+       $(OBJS)\advdll_odcombocmn.obj \\r
+       $(OBJS)\advdll_richtooltipcmn.obj \\r
+       $(OBJS)\advdll_aboutdlgg.obj \\r
+       $(OBJS)\advdll_bannerwindow.obj \\r
+       $(OBJS)\advdll_bmpcboxg.obj \\r
+       $(OBJS)\advdll_calctrlg.obj \\r
+       $(OBJS)\advdll_commandlinkbuttong.obj \\r
+       $(OBJS)\advdll_datavgen.obj \\r
         $(OBJS)\advdll_datectlg.obj \\r
         $(OBJS)\advdll_editlbox.obj \\r
         $(OBJS)\advdll_grid.obj \\r
         $(OBJS)\advdll_gridctrl.obj \\r
         $(OBJS)\advdll_grideditors.obj \\r
         $(OBJS)\advdll_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\advdll_hyperlinkg.obj \\r
+       $(OBJS)\advdll_laywin.obj \\r
+       $(OBJS)\advdll_notifmsgg.obj \\r
+       $(OBJS)\advdll_odcombo.obj \\r
+       $(OBJS)\advdll_propdlg.obj \\r
+       $(OBJS)\advdll_richtooltipg.obj \\r
+       $(OBJS)\advdll_sashwin.obj \\r
+       $(OBJS)\advdll_splash.obj \\r
+       $(OBJS)\advdll_generic_timectrl.obj \\r
+       $(OBJS)\advdll_tipdlg.obj \\r
+       $(OBJS)\advdll_treelist.obj \\r
+       $(OBJS)\advdll_wizard.obj \\r
+       $(OBJS)\advdll_taskbarcmn.obj \\r
+       $(OBJS)\advdll_aboutdlg.obj \\r
+       $(OBJS)\advdll_notifmsg.obj \\r
+       $(OBJS)\advdll_richtooltip.obj \\r
+       $(OBJS)\advdll_sound.obj \\r
+       $(OBJS)\advdll_taskbar.obj \\r
+       $(OBJS)\advdll_joystick.obj \\r
+       $(OBJS)\advdll_animateg.obj\r
+!endif\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"\r
  __advlib___depname = \\r
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
  !endif\r
  !if "$(WXUNIV)" == "0"\r
  ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \\r
         $(OBJS)\advlib_animatecmn.obj \\r
-       $(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 \\r
+       $(OBJS)\advlib_calctrlcmn.obj \\r
+       $(OBJS)\advlib_datavcmn.obj \\r
+       $(OBJS)\advlib_gridcmn.obj \\r
+       $(OBJS)\advlib_hyperlnkcmn.obj \\r
+       $(OBJS)\advlib_odcombocmn.obj \\r
+       $(OBJS)\advlib_richtooltipcmn.obj \\r
+       $(OBJS)\advlib_aboutdlgg.obj \\r
+       $(OBJS)\advlib_bannerwindow.obj \\r
+       $(OBJS)\advlib_bmpcboxg.obj \\r
+       $(OBJS)\advlib_calctrlg.obj \\r
+       $(OBJS)\advlib_commandlinkbuttong.obj \\r
+       $(OBJS)\advlib_datavgen.obj \\r
         $(OBJS)\advlib_datectlg.obj \\r
         $(OBJS)\advlib_editlbox.obj \\r
         $(OBJS)\advlib_grid.obj \\r
         $(OBJS)\advlib_gridctrl.obj \\r
         $(OBJS)\advlib_grideditors.obj \\r
         $(OBJS)\advlib_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\advlib_hyperlinkg.obj \\r
+       $(OBJS)\advlib_laywin.obj \\r
+       $(OBJS)\advlib_notifmsgg.obj \\r
+       $(OBJS)\advlib_odcombo.obj \\r
+       $(OBJS)\advlib_propdlg.obj \\r
+       $(OBJS)\advlib_richtooltipg.obj \\r
+       $(OBJS)\advlib_sashwin.obj \\r
+       $(OBJS)\advlib_splash.obj \\r
+       $(OBJS)\advlib_generic_timectrl.obj \\r
+       $(OBJS)\advlib_tipdlg.obj \\r
+       $(OBJS)\advlib_treelist.obj \\r
+       $(OBJS)\advlib_wizard.obj \\r
+       $(OBJS)\advlib_taskbarcmn.obj \\r
+       $(OBJS)\advlib_aboutdlg.obj \\r
+       $(OBJS)\advlib_notifmsg.obj \\r
+       $(OBJS)\advlib_richtooltip.obj \\r
+       $(OBJS)\advlib_sound.obj \\r
+       $(OBJS)\advlib_taskbar.obj \\r
+       $(OBJS)\advlib_joystick.obj \\r
+       $(OBJS)\advlib_animateg.obj \\r
+       $(OBJS)\advlib_bmpcbox.obj \\r
+       $(OBJS)\advlib_calctrl.obj \\r
+       $(OBJS)\advlib_commandlinkbutton.obj \\r
+       $(OBJS)\advlib_datecontrols.obj \\r
+       $(OBJS)\advlib_datectrl.obj \\r
+       $(OBJS)\advlib_datetimectrl.obj \\r
+       $(OBJS)\advlib_hyperlink.obj \\r
+       $(OBJS)\advlib_msw_timectrl.obj\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \\r
+       $(OBJS)\advlib_animatecmn.obj \\r
+       $(OBJS)\advlib_bmpcboxcmn.obj \\r
+       $(OBJS)\advlib_calctrlcmn.obj \\r
+       $(OBJS)\advlib_datavcmn.obj \\r
+       $(OBJS)\advlib_gridcmn.obj \\r
+       $(OBJS)\advlib_hyperlnkcmn.obj \\r
+       $(OBJS)\advlib_odcombocmn.obj \\r
+       $(OBJS)\advlib_richtooltipcmn.obj \\r
+       $(OBJS)\advlib_aboutdlgg.obj \\r
+       $(OBJS)\advlib_bannerwindow.obj \\r
+       $(OBJS)\advlib_bmpcboxg.obj \\r
+       $(OBJS)\advlib_calctrlg.obj \\r
+       $(OBJS)\advlib_commandlinkbuttong.obj \\r
+       $(OBJS)\advlib_datavgen.obj \\r
         $(OBJS)\advlib_datectlg.obj \\r
         $(OBJS)\advlib_editlbox.obj \\r
         $(OBJS)\advlib_grid.obj \\r
         $(OBJS)\advlib_gridctrl.obj \\r
         $(OBJS)\advlib_grideditors.obj \\r
         $(OBJS)\advlib_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\advlib_hyperlinkg.obj \\r
+       $(OBJS)\advlib_laywin.obj \\r
+       $(OBJS)\advlib_notifmsgg.obj \\r
+       $(OBJS)\advlib_odcombo.obj \\r
+       $(OBJS)\advlib_propdlg.obj \\r
+       $(OBJS)\advlib_richtooltipg.obj \\r
+       $(OBJS)\advlib_sashwin.obj \\r
+       $(OBJS)\advlib_splash.obj \\r
+       $(OBJS)\advlib_generic_timectrl.obj \\r
+       $(OBJS)\advlib_tipdlg.obj \\r
+       $(OBJS)\advlib_treelist.obj \\r
+       $(OBJS)\advlib_wizard.obj \\r
+       $(OBJS)\advlib_taskbarcmn.obj \\r
+       $(OBJS)\advlib_aboutdlg.obj \\r
+       $(OBJS)\advlib_notifmsg.obj \\r
+       $(OBJS)\advlib_richtooltip.obj \\r
+       $(OBJS)\advlib_sound.obj \\r
+       $(OBJS)\advlib_taskbar.obj \\r
+       $(OBJS)\advlib_joystick.obj \\r
+       $(OBJS)\advlib_animateg.obj\r
+!endif\r
+!if "$(SHARED)" == "1"\r
  ____wxadv_namedll_DEP = $(__advdll___depname)\r
  !endif\r
  !if "$(SHARED)" == "0"\r
@@ -6250,9 +6250,9 @@ $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
  $(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp\r
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textfile.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\time.cpp\r
+\r
  $(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp\r
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
  \r
@@ -6739,27 +6739,27 @@ $(OBJS)\monodll_calctrl.obj: ..\..\src\msw\calctrl.cpp
  $(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp\r
+\r
+$(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
+\r
+$(OBJS)\monodll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp\r
+\r
+$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
+\r
+$(OBJS)\monodll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp\r
+\r
+$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp\r
+\r
+$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp\r
+\r
  $(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp\r
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp\r
  \r
@@ -7018,21 +7018,21 @@ $(OBJS)\monodll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
  $(OBJS)\monodll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp\r
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp\r
+\r
+$(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
+\r
+$(OBJS)\monodll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp\r
+\r
+$(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
+\r
+$(OBJS)\monodll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp\r
+\r
  $(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
  \r
@@ -7306,23 +7306,23 @@ $(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp\r
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
  !endif\r
  \r
@@ -8276,23 +8276,23 @@ $(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp\r
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp\r
  !endif\r
  \r
@@ -8371,38 +8371,38 @@ $(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splash.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp\r
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treelist.cpp\r
  !endif\r
  \r
@@ -8421,23 +8421,23 @@ $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp\r
         $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp\r
  !endif\r
  \r
@@ -8655,9 +8655,9 @@ $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
  $(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp\r
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textfile.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\time.cpp\r
+\r
  $(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp\r
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
  \r
@@ -9144,27 +9144,27 @@ $(OBJS)\monolib_calctrl.obj: ..\..\src\msw\calctrl.cpp
  $(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp\r
+\r
+$(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
+\r
+$(OBJS)\monolib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp\r
+\r
+$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
+\r
+$(OBJS)\monolib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp\r
+\r
+$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp\r
+\r
+$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp\r
+\r
  $(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp\r
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp\r
  \r
@@ -9423,21 +9423,21 @@ $(OBJS)\monolib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
  $(OBJS)\monolib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp\r
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp\r
+\r
+$(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
+\r
+$(OBJS)\monolib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp\r
+\r
+$(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
+\r
+$(OBJS)\monolib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp\r
+\r
  $(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
  \r
@@ -9711,23 +9711,23 @@ $(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp\r
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
  !endif\r
  \r
@@ -10681,23 +10681,23 @@ $(OBJS)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp\r
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp\r
  !endif\r
  \r
@@ -10776,38 +10776,38 @@ $(OBJS)\monolib_odcombo.obj: ..\..\src\generic\odcombo.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splash.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp\r
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp\r
  !endif\r
  \r
@@ -10826,23 +10826,23 @@ $(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp\r
         $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp\r
  !endif\r
  \r
@@ -11060,9 +11060,9 @@ $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
  $(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp\r
         $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textfile.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\time.cpp\r
+\r
  $(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp\r
         $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
  \r
@@ -11399,9 +11399,9 @@ $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
  $(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp\r
         $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textfile.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\time.cpp\r
+\r
  $(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp\r
         $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
  \r
@@ -12089,23 +12089,23 @@ $(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp\r
         $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
  !endif\r
  \r
@@ -13497,23 +13497,23 @@ $(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp\r
         $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
  !endif\r
  \r
@@ -14452,27 +14452,27 @@ $(OBJS)\advdll_calctrl.obj: ..\..\src\msw\calctrl.cpp
  $(OBJS)\advdll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp\r
+\r
+$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
+\r
+$(OBJS)\advdll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp\r
+\r
+$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
+\r
+$(OBJS)\advdll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp\r
+\r
+$(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
+\r
+$(OBJS)\advdll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp\r
+\r
  $(OBJS)\advdll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
  \r
@@ -14482,21 +14482,21 @@ $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
  $(OBJS)\advdll_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
+\r
+$(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+\r
+$(OBJS)\advdll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp\r
+\r
+$(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp\r
+\r
+$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp\r
+\r
  $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp\r
  \r
@@ -14539,51 +14539,51 @@ $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
  $(OBJS)\advdll_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp\r
+\r
+$(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
+\r
+$(OBJS)\advdll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp\r
+\r
+$(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp\r
+\r
+$(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp\r
+\r
+$(OBJS)\advdll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp\r
+\r
+$(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp\r
+\r
+$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp\r
+\r
  $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\wizard.cpp\r
  \r
  $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
+\r
+$(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
+\r
+$(OBJS)\advdll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp\r
+\r
+$(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp\r
+\r
+$(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp\r
+\r
  $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp\r
  \r
@@ -14602,27 +14602,27 @@ $(OBJS)\advlib_calctrl.obj: ..\..\src\msw\calctrl.cpp
  $(OBJS)\advlib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp\r
+\r
+$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
+\r
+$(OBJS)\advlib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp\r
+\r
+$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
+\r
+$(OBJS)\advlib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp\r
+\r
+$(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
+\r
+$(OBJS)\advlib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp\r
+\r
  $(OBJS)\advlib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
  \r
@@ -14632,21 +14632,21 @@ $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
  $(OBJS)\advlib_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
+\r
+$(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+\r
+$(OBJS)\advlib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp\r
+\r
+$(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp\r
+\r
+$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp\r
+\r
  $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp\r
  \r
@@ -14689,51 +14689,51 @@ $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
  $(OBJS)\advlib_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp\r
+\r
+$(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
+\r
+$(OBJS)\advlib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp\r
+\r
+$(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp\r
+\r
+$(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp\r
+\r
+$(OBJS)\advlib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp\r
+\r
+$(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp\r
+\r
+$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp\r
+\r
  $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp\r
  \r
  $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
+\r
+$(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
+\r
+$(OBJS)\advlib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp\r
+\r
+$(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp\r
+\r
+$(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp\r
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp\r
+\r
  $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp\r
         $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp\r
  \r
@@ -15172,21 +15172,21 @@ $(OBJS)\xrcdll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
  $(OBJS)\xrcdll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp\r
         $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp\r
+\r
+$(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
+       $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
+\r
+$(OBJS)\xrcdll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp\r
+\r
+$(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
+       $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
+\r
+$(OBJS)\xrcdll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp\r
+       $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp\r
+\r
  $(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
         $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
  \r
@@ -15370,21 +15370,21 @@ $(OBJS)\xrclib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
  $(OBJS)\xrclib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp\r
         $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp\r
  \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp\r
+\r
+$(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
+       $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
+\r
+$(OBJS)\xrclib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp\r
+\r
+$(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
+       $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
+\r
+$(OBJS)\xrclib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp\r
+       $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp\r
+\r
  $(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
         $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
  \r
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc

index 3d4f9a8d3dab70687c8ee4295f1944dbb2ee0e7e..6855909f612b743c89ff0a40f487c5252c3baddf 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -375,7 +375,7 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_tarstrm.o \\r
         $(OBJS)\monodll_textbuf.o \\r
         $(OBJS)\monodll_textfile.o \\r
-       $(OBJS)\monodll_time.o \
+       $(OBJS)\monodll_time.o \\r
         $(OBJS)\monodll_timercmn.o \\r
         $(OBJS)\monodll_timerimpl.o \\r
         $(OBJS)\monodll_tokenzr.o \\r
@@ -525,7 +525,7 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_tarstrm.o \\r
         $(OBJS)\monolib_textbuf.o \\r
         $(OBJS)\monolib_textfile.o \\r
-       $(OBJS)\monolib_time.o \
+       $(OBJS)\monolib_time.o \\r
         $(OBJS)\monolib_timercmn.o \\r
         $(OBJS)\monolib_timerimpl.o \\r
         $(OBJS)\monolib_tokenzr.o \\r
@@ -673,7 +673,7 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_tarstrm.o \\r
         $(OBJS)\basedll_textbuf.o \\r
         $(OBJS)\basedll_textfile.o \\r
-       $(OBJS)\basedll_time.o \
+       $(OBJS)\basedll_time.o \\r
         $(OBJS)\basedll_timercmn.o \\r
         $(OBJS)\basedll_timerimpl.o \\r
         $(OBJS)\basedll_tokenzr.o \\r
@@ -805,7 +805,7 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_tarstrm.o \\r
         $(OBJS)\baselib_textbuf.o \\r
         $(OBJS)\baselib_textfile.o \\r
-       $(OBJS)\baselib_time.o \
+       $(OBJS)\baselib_time.o \\r
         $(OBJS)\baselib_timercmn.o \\r
         $(OBJS)\baselib_timerimpl.o \\r
         $(OBJS)\baselib_tokenzr.o \\r
@@ -1216,19 +1216,19 @@ XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_xh_split.o \\r
         $(OBJS)\xrcdll_xh_srchctrl.o \\r
         $(OBJS)\xrcdll_xh_statbar.o \\r
-       $(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 \\r
+       $(OBJS)\xrcdll_xh_stbox.o \\r
+       $(OBJS)\xrcdll_xh_stlin.o \\r
+       $(OBJS)\xrcdll_xh_sttxt.o \\r
+       $(OBJS)\xrcdll_xh_text.o \\r
+       $(OBJS)\xrcdll_xh_tglbtn.o \\r
+       $(OBJS)\xrcdll_xh_timectrl.o \\r
+       $(OBJS)\xrcdll_xh_toolb.o \\r
+       $(OBJS)\xrcdll_xh_toolbk.o \\r
+       $(OBJS)\xrcdll_xh_tree.o \\r
+       $(OBJS)\xrcdll_xh_treebk.o \\r
+       $(OBJS)\xrcdll_xh_unkwn.o \\r
+       $(OBJS)\xrcdll_xh_wizrd.o \\r
         $(OBJS)\xrcdll_xmlres.o \\r
         $(OBJS)\xrcdll_xmladv.o \\r
         $(OBJS)\xrcdll_xmlrsall.o\r
@@ -1291,19 +1291,19 @@ XRCLIB_OBJECTS =  \
         $(OBJS)\xrclib_xh_split.o \\r
         $(OBJS)\xrclib_xh_srchctrl.o \\r
         $(OBJS)\xrclib_xh_statbar.o \\r
-       $(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 \\r
+       $(OBJS)\xrclib_xh_stbox.o \\r
+       $(OBJS)\xrclib_xh_stlin.o \\r
+       $(OBJS)\xrclib_xh_sttxt.o \\r
+       $(OBJS)\xrclib_xh_text.o \\r
+       $(OBJS)\xrclib_xh_tglbtn.o \\r
+       $(OBJS)\xrclib_xh_timectrl.o \\r
+       $(OBJS)\xrclib_xh_toolb.o \\r
+       $(OBJS)\xrclib_xh_toolbk.o \\r
+       $(OBJS)\xrclib_xh_tree.o \\r
+       $(OBJS)\xrclib_xh_treebk.o \\r
+       $(OBJS)\xrclib_xh_unkwn.o \\r
+       $(OBJS)\xrclib_xh_wizrd.o \\r
         $(OBJS)\xrclib_xmlres.o \\r
         $(OBJS)\xrclib_xmladv.o \\r
         $(OBJS)\xrclib_xmlrsall.o\r
@@ -1677,19 +1677,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_xh_split.o \\r
         $(OBJS)\monodll_xh_srchctrl.o \\r
         $(OBJS)\monodll_xh_statbar.o \\r
-       $(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 \\r
+       $(OBJS)\monodll_xh_stbox.o \\r
+       $(OBJS)\monodll_xh_stlin.o \\r
+       $(OBJS)\monodll_xh_sttxt.o \\r
+       $(OBJS)\monodll_xh_text.o \\r
+       $(OBJS)\monodll_xh_tglbtn.o \\r
+       $(OBJS)\monodll_xh_timectrl.o \\r
+       $(OBJS)\monodll_xh_toolb.o \\r
+       $(OBJS)\monodll_xh_toolbk.o \\r
+       $(OBJS)\monodll_xh_tree.o \\r
+       $(OBJS)\monodll_xh_treebk.o \\r
+       $(OBJS)\monodll_xh_unkwn.o \\r
+       $(OBJS)\monodll_xh_wizrd.o \\r
         $(OBJS)\monodll_xmlres.o \\r
         $(OBJS)\monodll_xmladv.o \\r
         $(OBJS)\monodll_xmlrsall.o \\r
@@ -1756,19 +1756,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_fontenum.o \\r
         $(OBJS)\monodll_fontutil.o \\r
         $(OBJS)\monodll_gdiimage.o \\r
-       $(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 \\r
+       $(OBJS)\monodll_gdiplus.o \\r
+       $(OBJS)\monodll_graphics.o \\r
+       $(OBJS)\monodll_icon.o \\r
+       $(OBJS)\monodll_imaglist.o \\r
+       $(OBJS)\monodll_minifram.o \\r
+       $(OBJS)\monodll_nonownedwnd.o \\r
+       $(OBJS)\monodll_dataobj.o \\r
+       $(OBJS)\monodll_dropsrc.o \\r
+       $(OBJS)\monodll_droptgt.o \\r
+       $(OBJS)\monodll_oleutils.o \\r
+       $(OBJS)\monodll_palette.o \\r
+       $(OBJS)\monodll_pen.o \\r
         $(OBJS)\monodll_popupwin.o \\r
         $(OBJS)\monodll_printdlg.o \\r
         $(OBJS)\monodll_printwin.o \\r
@@ -2030,19 +2030,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_fontenum.o \\r
         $(OBJS)\monodll_fontutil.o \\r
         $(OBJS)\monodll_gdiimage.o \\r
-       $(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 \\r
+       $(OBJS)\monodll_gdiplus.o \\r
+       $(OBJS)\monodll_graphics.o \\r
+       $(OBJS)\monodll_icon.o \\r
+       $(OBJS)\monodll_imaglist.o \\r
+       $(OBJS)\monodll_minifram.o \\r
+       $(OBJS)\monodll_nonownedwnd.o \\r
+       $(OBJS)\monodll_dataobj.o \\r
+       $(OBJS)\monodll_dropsrc.o \\r
+       $(OBJS)\monodll_droptgt.o \\r
+       $(OBJS)\monodll_oleutils.o \\r
+       $(OBJS)\monodll_palette.o \\r
+       $(OBJS)\monodll_pen.o \\r
         $(OBJS)\monodll_popupwin.o \\r
         $(OBJS)\monodll_printdlg.o \\r
         $(OBJS)\monodll_printwin.o \\r
@@ -2276,100 +2276,100 @@ endif
  ifeq ($(WXUNIV),0)\r
  ____ADVANCED_SRC_FILENAMES_OBJECTS =  \\r
         $(OBJS)\monodll_animatecmn.o \\r
-       $(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 \\r
+       $(OBJS)\monodll_calctrlcmn.o \\r
+       $(OBJS)\monodll_datavcmn.o \\r
+       $(OBJS)\monodll_gridcmn.o \\r
+       $(OBJS)\monodll_hyperlnkcmn.o \\r
+       $(OBJS)\monodll_odcombocmn.o \\r
+       $(OBJS)\monodll_richtooltipcmn.o \\r
+       $(OBJS)\monodll_aboutdlgg.o \\r
+       $(OBJS)\monodll_bannerwindow.o \\r
+       $(OBJS)\monodll_bmpcboxg.o \\r
+       $(OBJS)\monodll_calctrlg.o \\r
+       $(OBJS)\monodll_commandlinkbuttong.o \\r
+       $(OBJS)\monodll_datavgen.o \\r
         $(OBJS)\monodll_datectlg.o \\r
         $(OBJS)\monodll_editlbox.o \\r
         $(OBJS)\monodll_grid.o \\r
         $(OBJS)\monodll_gridctrl.o \\r
         $(OBJS)\monodll_grideditors.o \\r
         $(OBJS)\monodll_gridsel.o \\r
-       $(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 \\r
+       $(OBJS)\monodll_hyperlinkg.o \\r
+       $(OBJS)\monodll_laywin.o \\r
+       $(OBJS)\monodll_notifmsgg.o \\r
+       $(OBJS)\monodll_odcombo.o \\r
+       $(OBJS)\monodll_propdlg.o \\r
+       $(OBJS)\monodll_richtooltipg.o \\r
+       $(OBJS)\monodll_sashwin.o \\r
+       $(OBJS)\monodll_splash.o \\r
+       $(OBJS)\monodll_generic_timectrl.o \\r
+       $(OBJS)\monodll_tipdlg.o \\r
+       $(OBJS)\monodll_treelist.o \\r
+       $(OBJS)\monodll_wizard.o \\r
+       $(OBJS)\monodll_taskbarcmn.o \\r
+       $(OBJS)\monodll_aboutdlg.o \\r
+       $(OBJS)\monodll_notifmsg.o \\r
+       $(OBJS)\monodll_richtooltip.o \\r
+       $(OBJS)\monodll_sound.o \\r
+       $(OBJS)\monodll_taskbar.o \\r
+       $(OBJS)\monodll_joystick.o \\r
+       $(OBJS)\monodll_animateg.o \\r
+       $(OBJS)\monodll_bmpcbox.o \\r
+       $(OBJS)\monodll_calctrl.o \\r
+       $(OBJS)\monodll_commandlinkbutton.o \\r
+       $(OBJS)\monodll_datecontrols.o \\r
+       $(OBJS)\monodll_datectrl.o \\r
+       $(OBJS)\monodll_datetimectrl.o \\r
+       $(OBJS)\monodll_hyperlink.o \\r
+       $(OBJS)\monodll_msw_timectrl.o\r
+endif\r
+ifeq ($(WXUNIV),1)\r
+____ADVANCED_SRC_FILENAMES_OBJECTS =  \\r
+       $(OBJS)\monodll_animatecmn.o \\r
+       $(OBJS)\monodll_bmpcboxcmn.o \\r
+       $(OBJS)\monodll_calctrlcmn.o \\r
+       $(OBJS)\monodll_datavcmn.o \\r
+       $(OBJS)\monodll_gridcmn.o \\r
+       $(OBJS)\monodll_hyperlnkcmn.o \\r
+       $(OBJS)\monodll_odcombocmn.o \\r
+       $(OBJS)\monodll_richtooltipcmn.o \\r
+       $(OBJS)\monodll_aboutdlgg.o \\r
+       $(OBJS)\monodll_bannerwindow.o \\r
+       $(OBJS)\monodll_bmpcboxg.o \\r
+       $(OBJS)\monodll_calctrlg.o \\r
+       $(OBJS)\monodll_commandlinkbuttong.o \\r
+       $(OBJS)\monodll_datavgen.o \\r
         $(OBJS)\monodll_datectlg.o \\r
         $(OBJS)\monodll_editlbox.o \\r
         $(OBJS)\monodll_grid.o \\r
         $(OBJS)\monodll_gridctrl.o \\r
         $(OBJS)\monodll_grideditors.o \\r
         $(OBJS)\monodll_gridsel.o \\r
-       $(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 \\r
+       $(OBJS)\monodll_hyperlinkg.o \\r
+       $(OBJS)\monodll_laywin.o \\r
+       $(OBJS)\monodll_notifmsgg.o \\r
+       $(OBJS)\monodll_odcombo.o \\r
+       $(OBJS)\monodll_propdlg.o \\r
+       $(OBJS)\monodll_richtooltipg.o \\r
+       $(OBJS)\monodll_sashwin.o \\r
+       $(OBJS)\monodll_splash.o \\r
+       $(OBJS)\monodll_generic_timectrl.o \\r
+       $(OBJS)\monodll_tipdlg.o \\r
+       $(OBJS)\monodll_treelist.o \\r
+       $(OBJS)\monodll_wizard.o \\r
+       $(OBJS)\monodll_taskbarcmn.o \\r
+       $(OBJS)\monodll_aboutdlg.o \\r
+       $(OBJS)\monodll_notifmsg.o \\r
+       $(OBJS)\monodll_richtooltip.o \\r
+       $(OBJS)\monodll_sound.o \\r
+       $(OBJS)\monodll_taskbar.o \\r
+       $(OBJS)\monodll_joystick.o \\r
+       $(OBJS)\monodll_animateg.o\r
+endif\r
+ifeq ($(USE_STC),1)\r
  __wxscintilla_library_link_DEP = $(__wxscintilla)\r
  endif\r
  ifeq ($(MONOLITHIC),1)\r
@@ -2466,19 +2466,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_xh_split.o \\r
         $(OBJS)\monolib_xh_srchctrl.o \\r
         $(OBJS)\monolib_xh_statbar.o \\r
-       $(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 \\r
+       $(OBJS)\monolib_xh_stbox.o \\r
+       $(OBJS)\monolib_xh_stlin.o \\r
+       $(OBJS)\monolib_xh_sttxt.o \\r
+       $(OBJS)\monolib_xh_text.o \\r
+       $(OBJS)\monolib_xh_tglbtn.o \\r
+       $(OBJS)\monolib_xh_timectrl.o \\r
+       $(OBJS)\monolib_xh_toolb.o \\r
+       $(OBJS)\monolib_xh_toolbk.o \\r
+       $(OBJS)\monolib_xh_tree.o \\r
+       $(OBJS)\monolib_xh_treebk.o \\r
+       $(OBJS)\monolib_xh_unkwn.o \\r
+       $(OBJS)\monolib_xh_wizrd.o \\r
         $(OBJS)\monolib_xmlres.o \\r
         $(OBJS)\monolib_xmladv.o \\r
         $(OBJS)\monolib_xmlrsall.o \\r
@@ -2545,19 +2545,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_fontenum.o \\r
         $(OBJS)\monolib_fontutil.o \\r
         $(OBJS)\monolib_gdiimage.o \\r
-       $(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 \\r
+       $(OBJS)\monolib_gdiplus.o \\r
+       $(OBJS)\monolib_graphics.o \\r
+       $(OBJS)\monolib_icon.o \\r
+       $(OBJS)\monolib_imaglist.o \\r
+       $(OBJS)\monolib_minifram.o \\r
+       $(OBJS)\monolib_nonownedwnd.o \\r
+       $(OBJS)\monolib_dataobj.o \\r
+       $(OBJS)\monolib_dropsrc.o \\r
+       $(OBJS)\monolib_droptgt.o \\r
+       $(OBJS)\monolib_oleutils.o \\r
+       $(OBJS)\monolib_palette.o \\r
+       $(OBJS)\monolib_pen.o \\r
         $(OBJS)\monolib_popupwin.o \\r
         $(OBJS)\monolib_printdlg.o \\r
         $(OBJS)\monolib_printwin.o \\r
@@ -2819,19 +2819,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_fontenum.o \\r
         $(OBJS)\monolib_fontutil.o \\r
         $(OBJS)\monolib_gdiimage.o \\r
-       $(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 \\r
+       $(OBJS)\monolib_gdiplus.o \\r
+       $(OBJS)\monolib_graphics.o \\r
+       $(OBJS)\monolib_icon.o \\r
+       $(OBJS)\monolib_imaglist.o \\r
+       $(OBJS)\monolib_minifram.o \\r
+       $(OBJS)\monolib_nonownedwnd.o \\r
+       $(OBJS)\monolib_dataobj.o \\r
+       $(OBJS)\monolib_dropsrc.o \\r
+       $(OBJS)\monolib_droptgt.o \\r
+       $(OBJS)\monolib_oleutils.o \\r
+       $(OBJS)\monolib_palette.o \\r
+       $(OBJS)\monolib_pen.o \\r
         $(OBJS)\monolib_popupwin.o \\r
         $(OBJS)\monolib_printdlg.o \\r
         $(OBJS)\monolib_printwin.o \\r
@@ -3065,100 +3065,100 @@ endif
  ifeq ($(WXUNIV),0)\r
  ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \\r
         $(OBJS)\monolib_animatecmn.o \\r
-       $(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 \\r
+       $(OBJS)\monolib_calctrlcmn.o \\r
+       $(OBJS)\monolib_datavcmn.o \\r
+       $(OBJS)\monolib_gridcmn.o \\r
+       $(OBJS)\monolib_hyperlnkcmn.o \\r
+       $(OBJS)\monolib_odcombocmn.o \\r
+       $(OBJS)\monolib_richtooltipcmn.o \\r
+       $(OBJS)\monolib_aboutdlgg.o \\r
+       $(OBJS)\monolib_bannerwindow.o \\r
+       $(OBJS)\monolib_bmpcboxg.o \\r
+       $(OBJS)\monolib_calctrlg.o \\r
+       $(OBJS)\monolib_commandlinkbuttong.o \\r
+       $(OBJS)\monolib_datavgen.o \\r
         $(OBJS)\monolib_datectlg.o \\r
         $(OBJS)\monolib_editlbox.o \\r
         $(OBJS)\monolib_grid.o \\r
         $(OBJS)\monolib_gridctrl.o \\r
         $(OBJS)\monolib_grideditors.o \\r
         $(OBJS)\monolib_gridsel.o \\r
-       $(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 \\r
+       $(OBJS)\monolib_hyperlinkg.o \\r
+       $(OBJS)\monolib_laywin.o \\r
+       $(OBJS)\monolib_notifmsgg.o \\r
+       $(OBJS)\monolib_odcombo.o \\r
+       $(OBJS)\monolib_propdlg.o \\r
+       $(OBJS)\monolib_richtooltipg.o \\r
+       $(OBJS)\monolib_sashwin.o \\r
+       $(OBJS)\monolib_splash.o \\r
+       $(OBJS)\monolib_generic_timectrl.o \\r
+       $(OBJS)\monolib_tipdlg.o \\r
+       $(OBJS)\monolib_treelist.o \\r
+       $(OBJS)\monolib_wizard.o \\r
+       $(OBJS)\monolib_taskbarcmn.o \\r
+       $(OBJS)\monolib_aboutdlg.o \\r
+       $(OBJS)\monolib_notifmsg.o \\r
+       $(OBJS)\monolib_richtooltip.o \\r
+       $(OBJS)\monolib_sound.o \\r
+       $(OBJS)\monolib_taskbar.o \\r
+       $(OBJS)\monolib_joystick.o \\r
+       $(OBJS)\monolib_animateg.o \\r
+       $(OBJS)\monolib_bmpcbox.o \\r
+       $(OBJS)\monolib_calctrl.o \\r
+       $(OBJS)\monolib_commandlinkbutton.o \\r
+       $(OBJS)\monolib_datecontrols.o \\r
+       $(OBJS)\monolib_datectrl.o \\r
+       $(OBJS)\monolib_datetimectrl.o \\r
+       $(OBJS)\monolib_hyperlink.o \\r
+       $(OBJS)\monolib_msw_timectrl.o\r
+endif\r
+ifeq ($(WXUNIV),1)\r
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \\r
+       $(OBJS)\monolib_animatecmn.o \\r
+       $(OBJS)\monolib_bmpcboxcmn.o \\r
+       $(OBJS)\monolib_calctrlcmn.o \\r
+       $(OBJS)\monolib_datavcmn.o \\r
+       $(OBJS)\monolib_gridcmn.o \\r
+       $(OBJS)\monolib_hyperlnkcmn.o \\r
+       $(OBJS)\monolib_odcombocmn.o \\r
+       $(OBJS)\monolib_richtooltipcmn.o \\r
+       $(OBJS)\monolib_aboutdlgg.o \\r
+       $(OBJS)\monolib_bannerwindow.o \\r
+       $(OBJS)\monolib_bmpcboxg.o \\r
+       $(OBJS)\monolib_calctrlg.o \\r
+       $(OBJS)\monolib_commandlinkbuttong.o \\r
+       $(OBJS)\monolib_datavgen.o \\r
         $(OBJS)\monolib_datectlg.o \\r
         $(OBJS)\monolib_editlbox.o \\r
         $(OBJS)\monolib_grid.o \\r
         $(OBJS)\monolib_gridctrl.o \\r
         $(OBJS)\monolib_grideditors.o \\r
         $(OBJS)\monolib_gridsel.o \\r
-       $(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 \\r
+       $(OBJS)\monolib_hyperlinkg.o \\r
+       $(OBJS)\monolib_laywin.o \\r
+       $(OBJS)\monolib_notifmsgg.o \\r
+       $(OBJS)\monolib_odcombo.o \\r
+       $(OBJS)\monolib_propdlg.o \\r
+       $(OBJS)\monolib_richtooltipg.o \\r
+       $(OBJS)\monolib_sashwin.o \\r
+       $(OBJS)\monolib_splash.o \\r
+       $(OBJS)\monolib_generic_timectrl.o \\r
+       $(OBJS)\monolib_tipdlg.o \\r
+       $(OBJS)\monolib_treelist.o \\r
+       $(OBJS)\monolib_wizard.o \\r
+       $(OBJS)\monolib_taskbarcmn.o \\r
+       $(OBJS)\monolib_aboutdlg.o \\r
+       $(OBJS)\monolib_notifmsg.o \\r
+       $(OBJS)\monolib_richtooltip.o \\r
+       $(OBJS)\monolib_sound.o \\r
+       $(OBJS)\monolib_taskbar.o \\r
+       $(OBJS)\monolib_joystick.o \\r
+       $(OBJS)\monolib_animateg.o\r
+endif\r
+ifeq ($(MONOLITHIC),0)\r
  ifeq ($(SHARED),1)\r
  __basedll___depname = \\r
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll\r
@@ -3227,19 +3227,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_fontenum.o \\r
         $(OBJS)\coredll_fontutil.o \\r
         $(OBJS)\coredll_gdiimage.o \\r
-       $(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 \\r
+       $(OBJS)\coredll_gdiplus.o \\r
+       $(OBJS)\coredll_graphics.o \\r
+       $(OBJS)\coredll_icon.o \\r
+       $(OBJS)\coredll_imaglist.o \\r
+       $(OBJS)\coredll_minifram.o \\r
+       $(OBJS)\coredll_nonownedwnd.o \\r
+       $(OBJS)\coredll_dataobj.o \\r
+       $(OBJS)\coredll_dropsrc.o \\r
+       $(OBJS)\coredll_droptgt.o \\r
+       $(OBJS)\coredll_oleutils.o \\r
+       $(OBJS)\coredll_palette.o \\r
+       $(OBJS)\coredll_pen.o \\r
         $(OBJS)\coredll_popupwin.o \\r
         $(OBJS)\coredll_printdlg.o \\r
         $(OBJS)\coredll_printwin.o \\r
@@ -3501,19 +3501,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_fontenum.o \\r
         $(OBJS)\coredll_fontutil.o \\r
         $(OBJS)\coredll_gdiimage.o \\r
-       $(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 \\r
+       $(OBJS)\coredll_gdiplus.o \\r
+       $(OBJS)\coredll_graphics.o \\r
+       $(OBJS)\coredll_icon.o \\r
+       $(OBJS)\coredll_imaglist.o \\r
+       $(OBJS)\coredll_minifram.o \\r
+       $(OBJS)\coredll_nonownedwnd.o \\r
+       $(OBJS)\coredll_dataobj.o \\r
+       $(OBJS)\coredll_dropsrc.o \\r
+       $(OBJS)\coredll_droptgt.o \\r
+       $(OBJS)\coredll_oleutils.o \\r
+       $(OBJS)\coredll_palette.o \\r
+       $(OBJS)\coredll_pen.o \\r
         $(OBJS)\coredll_popupwin.o \\r
         $(OBJS)\coredll_printdlg.o \\r
         $(OBJS)\coredll_printwin.o \\r
@@ -3777,19 +3777,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_fontenum.o \\r
         $(OBJS)\corelib_fontutil.o \\r
         $(OBJS)\corelib_gdiimage.o \\r
-       $(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 \\r
+       $(OBJS)\corelib_gdiplus.o \\r
+       $(OBJS)\corelib_graphics.o \\r
+       $(OBJS)\corelib_icon.o \\r
+       $(OBJS)\corelib_imaglist.o \\r
+       $(OBJS)\corelib_minifram.o \\r
+       $(OBJS)\corelib_nonownedwnd.o \\r
+       $(OBJS)\corelib_dataobj.o \\r
+       $(OBJS)\corelib_dropsrc.o \\r
+       $(OBJS)\corelib_droptgt.o \\r
+       $(OBJS)\corelib_oleutils.o \\r
+       $(OBJS)\corelib_palette.o \\r
+       $(OBJS)\corelib_pen.o \\r
         $(OBJS)\corelib_popupwin.o \\r
         $(OBJS)\corelib_printdlg.o \\r
         $(OBJS)\corelib_printwin.o \\r
@@ -4051,19 +4051,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_fontenum.o \\r
         $(OBJS)\corelib_fontutil.o \\r
         $(OBJS)\corelib_gdiimage.o \\r
-       $(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 \\r
+       $(OBJS)\corelib_gdiplus.o \\r
+       $(OBJS)\corelib_graphics.o \\r
+       $(OBJS)\corelib_icon.o \\r
+       $(OBJS)\corelib_imaglist.o \\r
+       $(OBJS)\corelib_minifram.o \\r
+       $(OBJS)\corelib_nonownedwnd.o \\r
+       $(OBJS)\corelib_dataobj.o \\r
+       $(OBJS)\corelib_dropsrc.o \\r
+       $(OBJS)\corelib_droptgt.o \\r
+       $(OBJS)\corelib_oleutils.o \\r
+       $(OBJS)\corelib_palette.o \\r
+       $(OBJS)\corelib_pen.o \\r
         $(OBJS)\corelib_popupwin.o \\r
         $(OBJS)\corelib_printdlg.o \\r
         $(OBJS)\corelib_printwin.o \\r
@@ -4311,100 +4311,100 @@ endif
  ifeq ($(WXUNIV),0)\r
  ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \\r
         $(OBJS)\advdll_animatecmn.o \\r
-       $(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 \\r
+       $(OBJS)\advdll_calctrlcmn.o \\r
+       $(OBJS)\advdll_datavcmn.o \\r
+       $(OBJS)\advdll_gridcmn.o \\r
+       $(OBJS)\advdll_hyperlnkcmn.o \\r
+       $(OBJS)\advdll_odcombocmn.o \\r
+       $(OBJS)\advdll_richtooltipcmn.o \\r
+       $(OBJS)\advdll_aboutdlgg.o \\r
+       $(OBJS)\advdll_bannerwindow.o \\r
+       $(OBJS)\advdll_bmpcboxg.o \\r
+       $(OBJS)\advdll_calctrlg.o \\r
+       $(OBJS)\advdll_commandlinkbuttong.o \\r
+       $(OBJS)\advdll_datavgen.o \\r
         $(OBJS)\advdll_datectlg.o \\r
         $(OBJS)\advdll_editlbox.o \\r
         $(OBJS)\advdll_grid.o \\r
         $(OBJS)\advdll_gridctrl.o \\r
         $(OBJS)\advdll_grideditors.o \\r
         $(OBJS)\advdll_gridsel.o \\r
-       $(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 \\r
+       $(OBJS)\advdll_hyperlinkg.o \\r
+       $(OBJS)\advdll_laywin.o \\r
+       $(OBJS)\advdll_notifmsgg.o \\r
+       $(OBJS)\advdll_odcombo.o \\r
+       $(OBJS)\advdll_propdlg.o \\r
+       $(OBJS)\advdll_richtooltipg.o \\r
+       $(OBJS)\advdll_sashwin.o \\r
+       $(OBJS)\advdll_splash.o \\r
+       $(OBJS)\advdll_generic_timectrl.o \\r
+       $(OBJS)\advdll_tipdlg.o \\r
+       $(OBJS)\advdll_treelist.o \\r
+       $(OBJS)\advdll_wizard.o \\r
+       $(OBJS)\advdll_taskbarcmn.o \\r
+       $(OBJS)\advdll_aboutdlg.o \\r
+       $(OBJS)\advdll_notifmsg.o \\r
+       $(OBJS)\advdll_richtooltip.o \\r
+       $(OBJS)\advdll_sound.o \\r
+       $(OBJS)\advdll_taskbar.o \\r
+       $(OBJS)\advdll_joystick.o \\r
+       $(OBJS)\advdll_animateg.o \\r
+       $(OBJS)\advdll_bmpcbox.o \\r
+       $(OBJS)\advdll_calctrl.o \\r
+       $(OBJS)\advdll_commandlinkbutton.o \\r
+       $(OBJS)\advdll_datecontrols.o \\r
+       $(OBJS)\advdll_datectrl.o \\r
+       $(OBJS)\advdll_datetimectrl.o \\r
+       $(OBJS)\advdll_hyperlink.o \\r
+       $(OBJS)\advdll_msw_timectrl.o\r
+endif\r
+ifeq ($(WXUNIV),1)\r
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \\r
+       $(OBJS)\advdll_animatecmn.o \\r
+       $(OBJS)\advdll_bmpcboxcmn.o \\r
+       $(OBJS)\advdll_calctrlcmn.o \\r
+       $(OBJS)\advdll_datavcmn.o \\r
+       $(OBJS)\advdll_gridcmn.o \\r
+       $(OBJS)\advdll_hyperlnkcmn.o \\r
+       $(OBJS)\advdll_odcombocmn.o \\r
+       $(OBJS)\advdll_richtooltipcmn.o \\r
+       $(OBJS)\advdll_aboutdlgg.o \\r
+       $(OBJS)\advdll_bannerwindow.o \\r
+       $(OBJS)\advdll_bmpcboxg.o \\r
+       $(OBJS)\advdll_calctrlg.o \\r
+       $(OBJS)\advdll_commandlinkbuttong.o \\r
+       $(OBJS)\advdll_datavgen.o \\r
         $(OBJS)\advdll_datectlg.o \\r
         $(OBJS)\advdll_editlbox.o \\r
         $(OBJS)\advdll_grid.o \\r
         $(OBJS)\advdll_gridctrl.o \\r
         $(OBJS)\advdll_grideditors.o \\r
         $(OBJS)\advdll_gridsel.o \\r
-       $(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 \\r
+       $(OBJS)\advdll_hyperlinkg.o \\r
+       $(OBJS)\advdll_laywin.o \\r
+       $(OBJS)\advdll_notifmsgg.o \\r
+       $(OBJS)\advdll_odcombo.o \\r
+       $(OBJS)\advdll_propdlg.o \\r
+       $(OBJS)\advdll_richtooltipg.o \\r
+       $(OBJS)\advdll_sashwin.o \\r
+       $(OBJS)\advdll_splash.o \\r
+       $(OBJS)\advdll_generic_timectrl.o \\r
+       $(OBJS)\advdll_tipdlg.o \\r
+       $(OBJS)\advdll_treelist.o \\r
+       $(OBJS)\advdll_wizard.o \\r
+       $(OBJS)\advdll_taskbarcmn.o \\r
+       $(OBJS)\advdll_aboutdlg.o \\r
+       $(OBJS)\advdll_notifmsg.o \\r
+       $(OBJS)\advdll_richtooltip.o \\r
+       $(OBJS)\advdll_sound.o \\r
+       $(OBJS)\advdll_taskbar.o \\r
+       $(OBJS)\advdll_joystick.o \\r
+       $(OBJS)\advdll_animateg.o\r
+endif\r
+ifeq ($(MONOLITHIC),0)\r
  ifeq ($(SHARED),0)\r
  ifeq ($(USE_GUI),1)\r
  __advlib___depname = \\r
@@ -4415,100 +4415,100 @@ endif
  ifeq ($(WXUNIV),0)\r
  ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \\r
         $(OBJS)\advlib_animatecmn.o \\r
-       $(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 \\r
+       $(OBJS)\advlib_calctrlcmn.o \\r
+       $(OBJS)\advlib_datavcmn.o \\r
+       $(OBJS)\advlib_gridcmn.o \\r
+       $(OBJS)\advlib_hyperlnkcmn.o \\r
+       $(OBJS)\advlib_odcombocmn.o \\r
+       $(OBJS)\advlib_richtooltipcmn.o \\r
+       $(OBJS)\advlib_aboutdlgg.o \\r
+       $(OBJS)\advlib_bannerwindow.o \\r
+       $(OBJS)\advlib_bmpcboxg.o \\r
+       $(OBJS)\advlib_calctrlg.o \\r
+       $(OBJS)\advlib_commandlinkbuttong.o \\r
+       $(OBJS)\advlib_datavgen.o \\r
         $(OBJS)\advlib_datectlg.o \\r
         $(OBJS)\advlib_editlbox.o \\r
         $(OBJS)\advlib_grid.o \\r
         $(OBJS)\advlib_gridctrl.o \\r
         $(OBJS)\advlib_grideditors.o \\r
         $(OBJS)\advlib_gridsel.o \\r
-       $(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 \\r
+       $(OBJS)\advlib_hyperlinkg.o \\r
+       $(OBJS)\advlib_laywin.o \\r
+       $(OBJS)\advlib_notifmsgg.o \\r
+       $(OBJS)\advlib_odcombo.o \\r
+       $(OBJS)\advlib_propdlg.o \\r
+       $(OBJS)\advlib_richtooltipg.o \\r
+       $(OBJS)\advlib_sashwin.o \\r
+       $(OBJS)\advlib_splash.o \\r
+       $(OBJS)\advlib_generic_timectrl.o \\r
+       $(OBJS)\advlib_tipdlg.o \\r
+       $(OBJS)\advlib_treelist.o \\r
+       $(OBJS)\advlib_wizard.o \\r
+       $(OBJS)\advlib_taskbarcmn.o \\r
+       $(OBJS)\advlib_aboutdlg.o \\r
+       $(OBJS)\advlib_notifmsg.o \\r
+       $(OBJS)\advlib_richtooltip.o \\r
+       $(OBJS)\advlib_sound.o \\r
+       $(OBJS)\advlib_taskbar.o \\r
+       $(OBJS)\advlib_joystick.o \\r
+       $(OBJS)\advlib_animateg.o \\r
+       $(OBJS)\advlib_bmpcbox.o \\r
+       $(OBJS)\advlib_calctrl.o \\r
+       $(OBJS)\advlib_commandlinkbutton.o \\r
+       $(OBJS)\advlib_datecontrols.o \\r
+       $(OBJS)\advlib_datectrl.o \\r
+       $(OBJS)\advlib_datetimectrl.o \\r
+       $(OBJS)\advlib_hyperlink.o \\r
+       $(OBJS)\advlib_msw_timectrl.o\r
+endif\r
+ifeq ($(WXUNIV),1)\r
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \\r
+       $(OBJS)\advlib_animatecmn.o \\r
+       $(OBJS)\advlib_bmpcboxcmn.o \\r
+       $(OBJS)\advlib_calctrlcmn.o \\r
+       $(OBJS)\advlib_datavcmn.o \\r
+       $(OBJS)\advlib_gridcmn.o \\r
+       $(OBJS)\advlib_hyperlnkcmn.o \\r
+       $(OBJS)\advlib_odcombocmn.o \\r
+       $(OBJS)\advlib_richtooltipcmn.o \\r
+       $(OBJS)\advlib_aboutdlgg.o \\r
+       $(OBJS)\advlib_bannerwindow.o \\r
+       $(OBJS)\advlib_bmpcboxg.o \\r
+       $(OBJS)\advlib_calctrlg.o \\r
+       $(OBJS)\advlib_commandlinkbuttong.o \\r
+       $(OBJS)\advlib_datavgen.o \\r
         $(OBJS)\advlib_datectlg.o \\r
         $(OBJS)\advlib_editlbox.o \\r
         $(OBJS)\advlib_grid.o \\r
         $(OBJS)\advlib_gridctrl.o \\r
         $(OBJS)\advlib_grideditors.o \\r
         $(OBJS)\advlib_gridsel.o \\r
-       $(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 \\r
+       $(OBJS)\advlib_hyperlinkg.o \\r
+       $(OBJS)\advlib_laywin.o \\r
+       $(OBJS)\advlib_notifmsgg.o \\r
+       $(OBJS)\advlib_odcombo.o \\r
+       $(OBJS)\advlib_propdlg.o \\r
+       $(OBJS)\advlib_richtooltipg.o \\r
+       $(OBJS)\advlib_sashwin.o \\r
+       $(OBJS)\advlib_splash.o \\r
+       $(OBJS)\advlib_generic_timectrl.o \\r
+       $(OBJS)\advlib_tipdlg.o \\r
+       $(OBJS)\advlib_treelist.o \\r
+       $(OBJS)\advlib_wizard.o \\r
+       $(OBJS)\advlib_taskbarcmn.o \\r
+       $(OBJS)\advlib_aboutdlg.o \\r
+       $(OBJS)\advlib_notifmsg.o \\r
+       $(OBJS)\advlib_richtooltip.o \\r
+       $(OBJS)\advlib_sound.o \\r
+       $(OBJS)\advlib_taskbar.o \\r
+       $(OBJS)\advlib_joystick.o \\r
+       $(OBJS)\advlib_animateg.o\r
+endif\r
+ifeq ($(SHARED),1)\r
  ____wxadv_namedll_DEP = $(__advdll___depname)\r
  endif\r
  ifeq ($(SHARED),0)\r
@@ -6418,9 +6418,9 @@ $(OBJS)\monodll_textbuf.o: ../../src/common/textbuf.cpp
  $(OBJS)\monodll_textfile.o: ../../src/common/textfile.cpp\r
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(OBJS)\monodll_time.o: ../../src/common/time.cpp
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\monodll_time.o: ../../src/common/time.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\monodll_timercmn.o: ../../src/common/timercmn.cpp\r
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
@@ -6907,27 +6907,27 @@ $(OBJS)\monodll_calctrl.o: ../../src/msw/calctrl.cpp
  $(OBJS)\monodll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp\r
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(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\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monodll_datectrl.o: ../../src/msw/datectrl.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monodll_datetimectrl.o: ../../src/msw/datetimectrl.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monodll_hyperlink.o: ../../src/msw/hyperlink.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monodll_msw_timectrl.o: ../../src/msw/timectrl.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monodll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monodll_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\monodll_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp\r
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
@@ -7186,21 +7186,21 @@ $(OBJS)\monodll_xh_stlin.o: ../../src/xrc/xh_stlin.cpp
  $(OBJS)\monodll_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp\r
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(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\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monodll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monodll_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monodll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monodll_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\monodll_xh_tree.o: ../../src/xrc/xh_tree.cpp\r
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
@@ -7474,23 +7474,23 @@ $(OBJS)\monodll_imaglist.o: ../../src/msw/imaglist.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
-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)\r
+$(OBJS)\monodll_minifram.o: ../../src/msw/minifram.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_dataobj.o: ../../src/msw/ole/dataobj.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_dropsrc.o: ../../src/msw/ole/dropsrc.cpp\r
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
@@ -8444,23 +8444,23 @@ $(OBJS)\monodll_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
-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)\r
+$(OBJS)\monodll_odcombocmn.o: ../../src/common/odcombocmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_bannerwindow.o: ../../src/generic/bannerwindow.cpp\r
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
@@ -8539,38 +8539,38 @@ $(OBJS)\monodll_odcombo.o: ../../src/generic/odcombo.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
-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)\r
+$(OBJS)\monodll_propdlg.o: ../../src/generic/propdlg.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_richtooltipg.o: ../../src/generic/richtooltipg.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_sashwin.o: ../../src/generic/sashwin.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_splash.o: ../../src/generic/splash.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_generic_timectrl.o: ../../src/generic/timectrl.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_tipdlg.o: ../../src/generic/tipdlg.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_treelist.o: ../../src/generic/treelist.cpp\r
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
@@ -8589,23 +8589,23 @@ $(OBJS)\monodll_aboutdlg.o: ../../src/msw/aboutdlg.cpp
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
-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)\r
+$(OBJS)\monodll_notifmsg.o: ../../src/msw/notifmsg.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_richtooltip.o: ../../src/msw/richtooltip.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_sound.o: ../../src/msw/sound.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_taskbar.o: ../../src/msw/taskbar.cpp\r
         $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
@@ -8823,9 +8823,9 @@ $(OBJS)\monolib_textbuf.o: ../../src/common/textbuf.cpp
  $(OBJS)\monolib_textfile.o: ../../src/common/textfile.cpp\r
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(OBJS)\monolib_time.o: ../../src/common/time.cpp
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\monolib_time.o: ../../src/common/time.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\monolib_timercmn.o: ../../src/common/timercmn.cpp\r
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
@@ -9312,27 +9312,27 @@ $(OBJS)\monolib_calctrl.o: ../../src/msw/calctrl.cpp
  $(OBJS)\monolib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp\r
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(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\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monolib_datectrl.o: ../../src/msw/datectrl.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monolib_datetimectrl.o: ../../src/msw/datetimectrl.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monolib_hyperlink.o: ../../src/msw/hyperlink.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monolib_msw_timectrl.o: ../../src/msw/timectrl.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monolib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monolib_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\monolib_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp\r
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
@@ -9591,21 +9591,21 @@ $(OBJS)\monolib_xh_stlin.o: ../../src/xrc/xh_stlin.cpp
  $(OBJS)\monolib_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp\r
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(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\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monolib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monolib_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monolib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\monolib_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\monolib_xh_tree.o: ../../src/xrc/xh_tree.cpp\r
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
@@ -9879,23 +9879,23 @@ $(OBJS)\monolib_imaglist.o: ../../src/msw/imaglist.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
-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)\r
+$(OBJS)\monolib_minifram.o: ../../src/msw/minifram.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_dataobj.o: ../../src/msw/ole/dataobj.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_dropsrc.o: ../../src/msw/ole/dropsrc.cpp\r
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
@@ -10849,23 +10849,23 @@ $(OBJS)\monolib_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
-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)\r
+$(OBJS)\monolib_odcombocmn.o: ../../src/common/odcombocmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_bannerwindow.o: ../../src/generic/bannerwindow.cpp\r
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
@@ -10944,38 +10944,38 @@ $(OBJS)\monolib_odcombo.o: ../../src/generic/odcombo.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
-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)\r
+$(OBJS)\monolib_propdlg.o: ../../src/generic/propdlg.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_richtooltipg.o: ../../src/generic/richtooltipg.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_sashwin.o: ../../src/generic/sashwin.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_splash.o: ../../src/generic/splash.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_generic_timectrl.o: ../../src/generic/timectrl.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_tipdlg.o: ../../src/generic/tipdlg.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_treelist.o: ../../src/generic/treelist.cpp\r
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
@@ -10994,23 +10994,23 @@ $(OBJS)\monolib_aboutdlg.o: ../../src/msw/aboutdlg.cpp
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
-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)\r
+$(OBJS)\monolib_notifmsg.o: ../../src/msw/notifmsg.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_richtooltip.o: ../../src/msw/richtooltip.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_sound.o: ../../src/msw/sound.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_taskbar.o: ../../src/msw/taskbar.cpp\r
         $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
@@ -11228,9 +11228,9 @@ $(OBJS)\basedll_textbuf.o: ../../src/common/textbuf.cpp
  $(OBJS)\basedll_textfile.o: ../../src/common/textfile.cpp\r
         $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(OBJS)\basedll_time.o: ../../src/common/time.cpp
-       $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\basedll_time.o: ../../src/common/time.cpp\r
+       $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\basedll_timercmn.o: ../../src/common/timercmn.cpp\r
         $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
@@ -11567,9 +11567,9 @@ $(OBJS)\baselib_textbuf.o: ../../src/common/textbuf.cpp
  $(OBJS)\baselib_textfile.o: ../../src/common/textfile.cpp\r
         $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(OBJS)\baselib_time.o: ../../src/common/time.cpp
-       $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\baselib_time.o: ../../src/common/time.cpp\r
+       $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\baselib_timercmn.o: ../../src/common/timercmn.cpp\r
         $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
@@ -12257,23 +12257,23 @@ $(OBJS)\coredll_imaglist.o: ../../src/msw/imaglist.cpp
         $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
-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)\r
+$(OBJS)\coredll_minifram.o: ../../src/msw/minifram.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_dataobj.o: ../../src/msw/ole/dataobj.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_dropsrc.o: ../../src/msw/ole/dropsrc.cpp\r
         $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
@@ -13665,23 +13665,23 @@ $(OBJS)\corelib_imaglist.o: ../../src/msw/imaglist.cpp
         $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
-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)\r
+$(OBJS)\corelib_minifram.o: ../../src/msw/minifram.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_dataobj.o: ../../src/msw/ole/dataobj.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_dropsrc.o: ../../src/msw/ole/dropsrc.cpp\r
         $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
  endif\r
  \r
@@ -14620,27 +14620,27 @@ $(OBJS)\advdll_calctrl.o: ../../src/msw/calctrl.cpp
  $(OBJS)\advdll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp\r
         $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(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\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_datetimectrl.o: ../../src/msw/datetimectrl.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_hyperlink.o: ../../src/msw/hyperlink.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_msw_timectrl.o: ../../src/msw/timectrl.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_animatecmn.o: ../../src/common/animatecmn.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\advdll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp\r
         $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
@@ -14650,21 +14650,21 @@ $(OBJS)\advdll_datavcmn.o: ../../src/common/datavcmn.cpp
  $(OBJS)\advdll_gridcmn.o: ../../src/common/gridcmn.cpp\r
         $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(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\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_odcombocmn.o: ../../src/common/odcombocmn.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_bannerwindow.o: ../../src/generic/bannerwindow.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\advdll_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp\r
         $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
@@ -14707,51 +14707,51 @@ $(OBJS)\advdll_laywin.o: ../../src/generic/laywin.cpp
  $(OBJS)\advdll_notifmsgg.o: ../../src/generic/notifmsgg.cpp\r
         $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(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\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_propdlg.o: ../../src/generic/propdlg.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_richtooltipg.o: ../../src/generic/richtooltipg.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_sashwin.o: ../../src/generic/sashwin.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_splash.o: ../../src/generic/splash.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_generic_timectrl.o: ../../src/generic/timectrl.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_tipdlg.o: ../../src/generic/tipdlg.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_treelist.o: ../../src/generic/treelist.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\advdll_wizard.o: ../../src/generic/wizard.cpp\r
         $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
  $(OBJS)\advdll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp\r
         $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(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\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_notifmsg.o: ../../src/msw/notifmsg.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_richtooltip.o: ../../src/msw/richtooltip.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_sound.o: ../../src/msw/sound.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advdll_taskbar.o: ../../src/msw/taskbar.cpp\r
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\advdll_joystick.o: ../../src/msw/joystick.cpp\r
         $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
@@ -14770,27 +14770,27 @@ $(OBJS)\advlib_calctrl.o: ../../src/msw/calctrl.cpp
  $(OBJS)\advlib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp\r
         $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(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\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_datectrl.o: ../../src/msw/datectrl.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_datetimectrl.o: ../../src/msw/datetimectrl.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_hyperlink.o: ../../src/msw/hyperlink.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_msw_timectrl.o: ../../src/msw/timectrl.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_animatecmn.o: ../../src/common/animatecmn.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\advlib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp\r
         $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
@@ -14800,21 +14800,21 @@ $(OBJS)\advlib_datavcmn.o: ../../src/common/datavcmn.cpp
  $(OBJS)\advlib_gridcmn.o: ../../src/common/gridcmn.cpp\r
         $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(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\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_odcombocmn.o: ../../src/common/odcombocmn.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_bannerwindow.o: ../../src/generic/bannerwindow.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\advlib_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp\r
         $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
@@ -14857,51 +14857,51 @@ $(OBJS)\advlib_laywin.o: ../../src/generic/laywin.cpp
  $(OBJS)\advlib_notifmsgg.o: ../../src/generic/notifmsgg.cpp\r
         $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(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\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_propdlg.o: ../../src/generic/propdlg.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_richtooltipg.o: ../../src/generic/richtooltipg.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_sashwin.o: ../../src/generic/sashwin.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_splash.o: ../../src/generic/splash.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_generic_timectrl.o: ../../src/generic/timectrl.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_tipdlg.o: ../../src/generic/tipdlg.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_treelist.o: ../../src/generic/treelist.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\advlib_wizard.o: ../../src/generic/wizard.cpp\r
         $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
  $(OBJS)\advlib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp\r
         $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(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\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_notifmsg.o: ../../src/msw/notifmsg.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_richtooltip.o: ../../src/msw/richtooltip.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_sound.o: ../../src/msw/sound.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\advlib_taskbar.o: ../../src/msw/taskbar.cpp\r
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\advlib_joystick.o: ../../src/msw/joystick.cpp\r
         $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
@@ -15340,21 +15340,21 @@ $(OBJS)\xrcdll_xh_stlin.o: ../../src/xrc/xh_stlin.cpp
  $(OBJS)\xrcdll_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp\r
         $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(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\r
+       $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\xrcdll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp\r
+       $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\xrcdll_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp\r
+       $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\xrcdll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp\r
+       $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\xrcdll_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp\r
+       $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\xrcdll_xh_tree.o: ../../src/xrc/xh_tree.cpp\r
         $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<\r
  \r
@@ -15538,21 +15538,21 @@ $(OBJS)\xrclib_xh_stlin.o: ../../src/xrc/xh_stlin.cpp
  $(OBJS)\xrclib_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp\r
         $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
-$(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\r
+       $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\xrclib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp\r
+       $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\xrclib_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp\r
+       $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\xrclib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp\r
+       $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\xrclib_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp\r
+       $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
  $(OBJS)\xrclib_xh_tree.o: ../../src/xrc/xh_tree.cpp\r
         $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<\r
  \r
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc

index 748e1e1eeb654334a93f5cdab709a857313d0a0a..f64c8fddc9a9af6dac3062eba98c6cdd6b0d89e1 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -393,7 +393,7 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_tarstrm.obj \\r
         $(OBJS)\monodll_textbuf.obj \\r
         $(OBJS)\monodll_textfile.obj \\r
-       $(OBJS)\monodll_time.obj \
+       $(OBJS)\monodll_time.obj \\r
         $(OBJS)\monodll_timercmn.obj \\r
         $(OBJS)\monodll_timerimpl.obj \\r
         $(OBJS)\monodll_tokenzr.obj \\r
@@ -549,7 +549,7 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_tarstrm.obj \\r
         $(OBJS)\monolib_textbuf.obj \\r
         $(OBJS)\monolib_textfile.obj \\r
-       $(OBJS)\monolib_time.obj \
+       $(OBJS)\monolib_time.obj \\r
         $(OBJS)\monolib_timercmn.obj \\r
         $(OBJS)\monolib_timerimpl.obj \\r
         $(OBJS)\monolib_tokenzr.obj \\r
@@ -701,7 +701,7 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_tarstrm.obj \\r
         $(OBJS)\basedll_textbuf.obj \\r
         $(OBJS)\basedll_textfile.obj \\r
-       $(OBJS)\basedll_time.obj \
+       $(OBJS)\basedll_time.obj \\r
         $(OBJS)\basedll_timercmn.obj \\r
         $(OBJS)\basedll_timerimpl.obj \\r
         $(OBJS)\basedll_tokenzr.obj \\r
@@ -839,7 +839,7 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_tarstrm.obj \\r
         $(OBJS)\baselib_textbuf.obj \\r
         $(OBJS)\baselib_textfile.obj \\r
-       $(OBJS)\baselib_time.obj \
+       $(OBJS)\baselib_time.obj \\r
         $(OBJS)\baselib_timercmn.obj \\r
         $(OBJS)\baselib_timerimpl.obj \\r
         $(OBJS)\baselib_tokenzr.obj \\r
@@ -1298,19 +1298,19 @@ XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_xh_split.obj \\r
         $(OBJS)\xrcdll_xh_srchctrl.obj \\r
         $(OBJS)\xrcdll_xh_statbar.obj \\r
-       $(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 \\r
+       $(OBJS)\xrcdll_xh_stbox.obj \\r
+       $(OBJS)\xrcdll_xh_stlin.obj \\r
+       $(OBJS)\xrcdll_xh_sttxt.obj \\r
+       $(OBJS)\xrcdll_xh_text.obj \\r
+       $(OBJS)\xrcdll_xh_tglbtn.obj \\r
+       $(OBJS)\xrcdll_xh_timectrl.obj \\r
+       $(OBJS)\xrcdll_xh_toolb.obj \\r
+       $(OBJS)\xrcdll_xh_toolbk.obj \\r
+       $(OBJS)\xrcdll_xh_tree.obj \\r
+       $(OBJS)\xrcdll_xh_treebk.obj \\r
+       $(OBJS)\xrcdll_xh_unkwn.obj \\r
+       $(OBJS)\xrcdll_xh_wizrd.obj \\r
         $(OBJS)\xrcdll_xmlres.obj \\r
         $(OBJS)\xrcdll_xmladv.obj \\r
         $(OBJS)\xrcdll_xmlrsall.obj\r
@@ -1378,19 +1378,19 @@ XRCLIB_OBJECTS =  \
         $(OBJS)\xrclib_xh_split.obj \\r
         $(OBJS)\xrclib_xh_srchctrl.obj \\r
         $(OBJS)\xrclib_xh_statbar.obj \\r
-       $(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 \\r
+       $(OBJS)\xrclib_xh_stbox.obj \\r
+       $(OBJS)\xrclib_xh_stlin.obj \\r
+       $(OBJS)\xrclib_xh_sttxt.obj \\r
+       $(OBJS)\xrclib_xh_text.obj \\r
+       $(OBJS)\xrclib_xh_tglbtn.obj \\r
+       $(OBJS)\xrclib_xh_timectrl.obj \\r
+       $(OBJS)\xrclib_xh_toolb.obj \\r
+       $(OBJS)\xrclib_xh_toolbk.obj \\r
+       $(OBJS)\xrclib_xh_tree.obj \\r
+       $(OBJS)\xrclib_xh_treebk.obj \\r
+       $(OBJS)\xrclib_xh_unkwn.obj \\r
+       $(OBJS)\xrclib_xh_wizrd.obj \\r
         $(OBJS)\xrclib_xmlres.obj \\r
         $(OBJS)\xrclib_xmladv.obj \\r
         $(OBJS)\xrclib_xmlrsall.obj\r
@@ -1880,19 +1880,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_xh_split.obj \\r
         $(OBJS)\monodll_xh_srchctrl.obj \\r
         $(OBJS)\monodll_xh_statbar.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_xh_stbox.obj \\r
+       $(OBJS)\monodll_xh_stlin.obj \\r
+       $(OBJS)\monodll_xh_sttxt.obj \\r
+       $(OBJS)\monodll_xh_text.obj \\r
+       $(OBJS)\monodll_xh_tglbtn.obj \\r
+       $(OBJS)\monodll_xh_timectrl.obj \\r
+       $(OBJS)\monodll_xh_toolb.obj \\r
+       $(OBJS)\monodll_xh_toolbk.obj \\r
+       $(OBJS)\monodll_xh_tree.obj \\r
+       $(OBJS)\monodll_xh_treebk.obj \\r
+       $(OBJS)\monodll_xh_unkwn.obj \\r
+       $(OBJS)\monodll_xh_wizrd.obj \\r
         $(OBJS)\monodll_xmlres.obj \\r
         $(OBJS)\monodll_xmladv.obj \\r
         $(OBJS)\monodll_xmlrsall.obj \\r
@@ -1958,19 +1958,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_fontenum.obj \\r
         $(OBJS)\monodll_fontutil.obj \\r
         $(OBJS)\monodll_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_gdiplus.obj \\r
+       $(OBJS)\monodll_graphics.obj \\r
+       $(OBJS)\monodll_icon.obj \\r
+       $(OBJS)\monodll_imaglist.obj \\r
+       $(OBJS)\monodll_minifram.obj \\r
+       $(OBJS)\monodll_nonownedwnd.obj \\r
+       $(OBJS)\monodll_dataobj.obj \\r
+       $(OBJS)\monodll_dropsrc.obj \\r
+       $(OBJS)\monodll_droptgt.obj \\r
+       $(OBJS)\monodll_oleutils.obj \\r
+       $(OBJS)\monodll_palette.obj \\r
+       $(OBJS)\monodll_pen.obj \\r
         $(OBJS)\monodll_popupwin.obj \\r
         $(OBJS)\monodll_printdlg.obj \\r
         $(OBJS)\monodll_printwin.obj \\r
@@ -2230,19 +2230,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_fontenum.obj \\r
         $(OBJS)\monodll_fontutil.obj \\r
         $(OBJS)\monodll_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_gdiplus.obj \\r
+       $(OBJS)\monodll_graphics.obj \\r
+       $(OBJS)\monodll_icon.obj \\r
+       $(OBJS)\monodll_imaglist.obj \\r
+       $(OBJS)\monodll_minifram.obj \\r
+       $(OBJS)\monodll_nonownedwnd.obj \\r
+       $(OBJS)\monodll_dataobj.obj \\r
+       $(OBJS)\monodll_dropsrc.obj \\r
+       $(OBJS)\monodll_droptgt.obj \\r
+       $(OBJS)\monodll_oleutils.obj \\r
+       $(OBJS)\monodll_palette.obj \\r
+       $(OBJS)\monodll_pen.obj \\r
         $(OBJS)\monodll_popupwin.obj \\r
         $(OBJS)\monodll_printdlg.obj \\r
         $(OBJS)\monodll_printwin.obj \\r
@@ -2475,100 +2475,100 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
  !if "$(WXUNIV)" == "0"\r
  ____ADVANCED_SRC_FILENAMES_OBJECTS =  \\r
         $(OBJS)\monodll_animatecmn.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_calctrlcmn.obj \\r
+       $(OBJS)\monodll_datavcmn.obj \\r
+       $(OBJS)\monodll_gridcmn.obj \\r
+       $(OBJS)\monodll_hyperlnkcmn.obj \\r
+       $(OBJS)\monodll_odcombocmn.obj \\r
+       $(OBJS)\monodll_richtooltipcmn.obj \\r
+       $(OBJS)\monodll_aboutdlgg.obj \\r
+       $(OBJS)\monodll_bannerwindow.obj \\r
+       $(OBJS)\monodll_bmpcboxg.obj \\r
+       $(OBJS)\monodll_calctrlg.obj \\r
+       $(OBJS)\monodll_commandlinkbuttong.obj \\r
+       $(OBJS)\monodll_datavgen.obj \\r
         $(OBJS)\monodll_datectlg.obj \\r
         $(OBJS)\monodll_editlbox.obj \\r
         $(OBJS)\monodll_grid.obj \\r
         $(OBJS)\monodll_gridctrl.obj \\r
         $(OBJS)\monodll_grideditors.obj \\r
         $(OBJS)\monodll_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_hyperlinkg.obj \\r
+       $(OBJS)\monodll_laywin.obj \\r
+       $(OBJS)\monodll_notifmsgg.obj \\r
+       $(OBJS)\monodll_odcombo.obj \\r
+       $(OBJS)\monodll_propdlg.obj \\r
+       $(OBJS)\monodll_richtooltipg.obj \\r
+       $(OBJS)\monodll_sashwin.obj \\r
+       $(OBJS)\monodll_splash.obj \\r
+       $(OBJS)\monodll_generic_timectrl.obj \\r
+       $(OBJS)\monodll_tipdlg.obj \\r
+       $(OBJS)\monodll_treelist.obj \\r
+       $(OBJS)\monodll_wizard.obj \\r
+       $(OBJS)\monodll_taskbarcmn.obj \\r
+       $(OBJS)\monodll_aboutdlg.obj \\r
+       $(OBJS)\monodll_notifmsg.obj \\r
+       $(OBJS)\monodll_richtooltip.obj \\r
+       $(OBJS)\monodll_sound.obj \\r
+       $(OBJS)\monodll_taskbar.obj \\r
+       $(OBJS)\monodll_joystick.obj \\r
+       $(OBJS)\monodll_animateg.obj \\r
+       $(OBJS)\monodll_bmpcbox.obj \\r
+       $(OBJS)\monodll_calctrl.obj \\r
+       $(OBJS)\monodll_commandlinkbutton.obj \\r
+       $(OBJS)\monodll_datecontrols.obj \\r
+       $(OBJS)\monodll_datectrl.obj \\r
+       $(OBJS)\monodll_datetimectrl.obj \\r
+       $(OBJS)\monodll_hyperlink.obj \\r
+       $(OBJS)\monodll_msw_timectrl.obj\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+____ADVANCED_SRC_FILENAMES_OBJECTS =  \\r
+       $(OBJS)\monodll_animatecmn.obj \\r
+       $(OBJS)\monodll_bmpcboxcmn.obj \\r
+       $(OBJS)\monodll_calctrlcmn.obj \\r
+       $(OBJS)\monodll_datavcmn.obj \\r
+       $(OBJS)\monodll_gridcmn.obj \\r
+       $(OBJS)\monodll_hyperlnkcmn.obj \\r
+       $(OBJS)\monodll_odcombocmn.obj \\r
+       $(OBJS)\monodll_richtooltipcmn.obj \\r
+       $(OBJS)\monodll_aboutdlgg.obj \\r
+       $(OBJS)\monodll_bannerwindow.obj \\r
+       $(OBJS)\monodll_bmpcboxg.obj \\r
+       $(OBJS)\monodll_calctrlg.obj \\r
+       $(OBJS)\monodll_commandlinkbuttong.obj \\r
+       $(OBJS)\monodll_datavgen.obj \\r
         $(OBJS)\monodll_datectlg.obj \\r
         $(OBJS)\monodll_editlbox.obj \\r
         $(OBJS)\monodll_grid.obj \\r
         $(OBJS)\monodll_gridctrl.obj \\r
         $(OBJS)\monodll_grideditors.obj \\r
         $(OBJS)\monodll_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_hyperlinkg.obj \\r
+       $(OBJS)\monodll_laywin.obj \\r
+       $(OBJS)\monodll_notifmsgg.obj \\r
+       $(OBJS)\monodll_odcombo.obj \\r
+       $(OBJS)\monodll_propdlg.obj \\r
+       $(OBJS)\monodll_richtooltipg.obj \\r
+       $(OBJS)\monodll_sashwin.obj \\r
+       $(OBJS)\monodll_splash.obj \\r
+       $(OBJS)\monodll_generic_timectrl.obj \\r
+       $(OBJS)\monodll_tipdlg.obj \\r
+       $(OBJS)\monodll_treelist.obj \\r
+       $(OBJS)\monodll_wizard.obj \\r
+       $(OBJS)\monodll_taskbarcmn.obj \\r
+       $(OBJS)\monodll_aboutdlg.obj \\r
+       $(OBJS)\monodll_notifmsg.obj \\r
+       $(OBJS)\monodll_richtooltip.obj \\r
+       $(OBJS)\monodll_sound.obj \\r
+       $(OBJS)\monodll_taskbar.obj \\r
+       $(OBJS)\monodll_joystick.obj \\r
+       $(OBJS)\monodll_animateg.obj\r
+!endif\r
+!if "$(USE_STC)" == "1"\r
  __wxscintilla_library_link_DEP = $(__wxscintilla)\r
  !endif\r
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"\r
@@ -2669,19 +2669,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_xh_split.obj \\r
         $(OBJS)\monolib_xh_srchctrl.obj \\r
         $(OBJS)\monolib_xh_statbar.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_xh_stbox.obj \\r
+       $(OBJS)\monolib_xh_stlin.obj \\r
+       $(OBJS)\monolib_xh_sttxt.obj \\r
+       $(OBJS)\monolib_xh_text.obj \\r
+       $(OBJS)\monolib_xh_tglbtn.obj \\r
+       $(OBJS)\monolib_xh_timectrl.obj \\r
+       $(OBJS)\monolib_xh_toolb.obj \\r
+       $(OBJS)\monolib_xh_toolbk.obj \\r
+       $(OBJS)\monolib_xh_tree.obj \\r
+       $(OBJS)\monolib_xh_treebk.obj \\r
+       $(OBJS)\monolib_xh_unkwn.obj \\r
+       $(OBJS)\monolib_xh_wizrd.obj \\r
         $(OBJS)\monolib_xmlres.obj \\r
         $(OBJS)\monolib_xmladv.obj \\r
         $(OBJS)\monolib_xmlrsall.obj \\r
@@ -2747,19 +2747,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_fontenum.obj \\r
         $(OBJS)\monolib_fontutil.obj \\r
         $(OBJS)\monolib_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_gdiplus.obj \\r
+       $(OBJS)\monolib_graphics.obj \\r
+       $(OBJS)\monolib_icon.obj \\r
+       $(OBJS)\monolib_imaglist.obj \\r
+       $(OBJS)\monolib_minifram.obj \\r
+       $(OBJS)\monolib_nonownedwnd.obj \\r
+       $(OBJS)\monolib_dataobj.obj \\r
+       $(OBJS)\monolib_dropsrc.obj \\r
+       $(OBJS)\monolib_droptgt.obj \\r
+       $(OBJS)\monolib_oleutils.obj \\r
+       $(OBJS)\monolib_palette.obj \\r
+       $(OBJS)\monolib_pen.obj \\r
         $(OBJS)\monolib_popupwin.obj \\r
         $(OBJS)\monolib_printdlg.obj \\r
         $(OBJS)\monolib_printwin.obj \\r
@@ -3019,19 +3019,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_fontenum.obj \\r
         $(OBJS)\monolib_fontutil.obj \\r
         $(OBJS)\monolib_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_gdiplus.obj \\r
+       $(OBJS)\monolib_graphics.obj \\r
+       $(OBJS)\monolib_icon.obj \\r
+       $(OBJS)\monolib_imaglist.obj \\r
+       $(OBJS)\monolib_minifram.obj \\r
+       $(OBJS)\monolib_nonownedwnd.obj \\r
+       $(OBJS)\monolib_dataobj.obj \\r
+       $(OBJS)\monolib_dropsrc.obj \\r
+       $(OBJS)\monolib_droptgt.obj \\r
+       $(OBJS)\monolib_oleutils.obj \\r
+       $(OBJS)\monolib_palette.obj \\r
+       $(OBJS)\monolib_pen.obj \\r
         $(OBJS)\monolib_popupwin.obj \\r
         $(OBJS)\monolib_printdlg.obj \\r
         $(OBJS)\monolib_printwin.obj \\r
@@ -3264,100 +3264,100 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
  !if "$(WXUNIV)" == "0"\r
  ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \\r
         $(OBJS)\monolib_animatecmn.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_calctrlcmn.obj \\r
+       $(OBJS)\monolib_datavcmn.obj \\r
+       $(OBJS)\monolib_gridcmn.obj \\r
+       $(OBJS)\monolib_hyperlnkcmn.obj \\r
+       $(OBJS)\monolib_odcombocmn.obj \\r
+       $(OBJS)\monolib_richtooltipcmn.obj \\r
+       $(OBJS)\monolib_aboutdlgg.obj \\r
+       $(OBJS)\monolib_bannerwindow.obj \\r
+       $(OBJS)\monolib_bmpcboxg.obj \\r
+       $(OBJS)\monolib_calctrlg.obj \\r
+       $(OBJS)\monolib_commandlinkbuttong.obj \\r
+       $(OBJS)\monolib_datavgen.obj \\r
         $(OBJS)\monolib_datectlg.obj \\r
         $(OBJS)\monolib_editlbox.obj \\r
         $(OBJS)\monolib_grid.obj \\r
         $(OBJS)\monolib_gridctrl.obj \\r
         $(OBJS)\monolib_grideditors.obj \\r
         $(OBJS)\monolib_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_hyperlinkg.obj \\r
+       $(OBJS)\monolib_laywin.obj \\r
+       $(OBJS)\monolib_notifmsgg.obj \\r
+       $(OBJS)\monolib_odcombo.obj \\r
+       $(OBJS)\monolib_propdlg.obj \\r
+       $(OBJS)\monolib_richtooltipg.obj \\r
+       $(OBJS)\monolib_sashwin.obj \\r
+       $(OBJS)\monolib_splash.obj \\r
+       $(OBJS)\monolib_generic_timectrl.obj \\r
+       $(OBJS)\monolib_tipdlg.obj \\r
+       $(OBJS)\monolib_treelist.obj \\r
+       $(OBJS)\monolib_wizard.obj \\r
+       $(OBJS)\monolib_taskbarcmn.obj \\r
+       $(OBJS)\monolib_aboutdlg.obj \\r
+       $(OBJS)\monolib_notifmsg.obj \\r
+       $(OBJS)\monolib_richtooltip.obj \\r
+       $(OBJS)\monolib_sound.obj \\r
+       $(OBJS)\monolib_taskbar.obj \\r
+       $(OBJS)\monolib_joystick.obj \\r
+       $(OBJS)\monolib_animateg.obj \\r
+       $(OBJS)\monolib_bmpcbox.obj \\r
+       $(OBJS)\monolib_calctrl.obj \\r
+       $(OBJS)\monolib_commandlinkbutton.obj \\r
+       $(OBJS)\monolib_datecontrols.obj \\r
+       $(OBJS)\monolib_datectrl.obj \\r
+       $(OBJS)\monolib_datetimectrl.obj \\r
+       $(OBJS)\monolib_hyperlink.obj \\r
+       $(OBJS)\monolib_msw_timectrl.obj\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \\r
+       $(OBJS)\monolib_animatecmn.obj \\r
+       $(OBJS)\monolib_bmpcboxcmn.obj \\r
+       $(OBJS)\monolib_calctrlcmn.obj \\r
+       $(OBJS)\monolib_datavcmn.obj \\r
+       $(OBJS)\monolib_gridcmn.obj \\r
+       $(OBJS)\monolib_hyperlnkcmn.obj \\r
+       $(OBJS)\monolib_odcombocmn.obj \\r
+       $(OBJS)\monolib_richtooltipcmn.obj \\r
+       $(OBJS)\monolib_aboutdlgg.obj \\r
+       $(OBJS)\monolib_bannerwindow.obj \\r
+       $(OBJS)\monolib_bmpcboxg.obj \\r
+       $(OBJS)\monolib_calctrlg.obj \\r
+       $(OBJS)\monolib_commandlinkbuttong.obj \\r
+       $(OBJS)\monolib_datavgen.obj \\r
         $(OBJS)\monolib_datectlg.obj \\r
         $(OBJS)\monolib_editlbox.obj \\r
         $(OBJS)\monolib_grid.obj \\r
         $(OBJS)\monolib_gridctrl.obj \\r
         $(OBJS)\monolib_grideditors.obj \\r
         $(OBJS)\monolib_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_hyperlinkg.obj \\r
+       $(OBJS)\monolib_laywin.obj \\r
+       $(OBJS)\monolib_notifmsgg.obj \\r
+       $(OBJS)\monolib_odcombo.obj \\r
+       $(OBJS)\monolib_propdlg.obj \\r
+       $(OBJS)\monolib_richtooltipg.obj \\r
+       $(OBJS)\monolib_sashwin.obj \\r
+       $(OBJS)\monolib_splash.obj \\r
+       $(OBJS)\monolib_generic_timectrl.obj \\r
+       $(OBJS)\monolib_tipdlg.obj \\r
+       $(OBJS)\monolib_treelist.obj \\r
+       $(OBJS)\monolib_wizard.obj \\r
+       $(OBJS)\monolib_taskbarcmn.obj \\r
+       $(OBJS)\monolib_aboutdlg.obj \\r
+       $(OBJS)\monolib_notifmsg.obj \\r
+       $(OBJS)\monolib_richtooltip.obj \\r
+       $(OBJS)\monolib_sound.obj \\r
+       $(OBJS)\monolib_taskbar.obj \\r
+       $(OBJS)\monolib_joystick.obj \\r
+       $(OBJS)\monolib_animateg.obj\r
+!endif\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
  __basedll___depname = \\r
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll\r
  !endif\r
@@ -3479,19 +3479,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_fontenum.obj \\r
         $(OBJS)\coredll_fontutil.obj \\r
         $(OBJS)\coredll_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\coredll_gdiplus.obj \\r
+       $(OBJS)\coredll_graphics.obj \\r
+       $(OBJS)\coredll_icon.obj \\r
+       $(OBJS)\coredll_imaglist.obj \\r
+       $(OBJS)\coredll_minifram.obj \\r
+       $(OBJS)\coredll_nonownedwnd.obj \\r
+       $(OBJS)\coredll_dataobj.obj \\r
+       $(OBJS)\coredll_dropsrc.obj \\r
+       $(OBJS)\coredll_droptgt.obj \\r
+       $(OBJS)\coredll_oleutils.obj \\r
+       $(OBJS)\coredll_palette.obj \\r
+       $(OBJS)\coredll_pen.obj \\r
         $(OBJS)\coredll_popupwin.obj \\r
         $(OBJS)\coredll_printdlg.obj \\r
         $(OBJS)\coredll_printwin.obj \\r
@@ -3751,19 +3751,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_fontenum.obj \\r
         $(OBJS)\coredll_fontutil.obj \\r
         $(OBJS)\coredll_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\coredll_gdiplus.obj \\r
+       $(OBJS)\coredll_graphics.obj \\r
+       $(OBJS)\coredll_icon.obj \\r
+       $(OBJS)\coredll_imaglist.obj \\r
+       $(OBJS)\coredll_minifram.obj \\r
+       $(OBJS)\coredll_nonownedwnd.obj \\r
+       $(OBJS)\coredll_dataobj.obj \\r
+       $(OBJS)\coredll_dropsrc.obj \\r
+       $(OBJS)\coredll_droptgt.obj \\r
+       $(OBJS)\coredll_oleutils.obj \\r
+       $(OBJS)\coredll_palette.obj \\r
+       $(OBJS)\coredll_pen.obj \\r
         $(OBJS)\coredll_popupwin.obj \\r
         $(OBJS)\coredll_printdlg.obj \\r
         $(OBJS)\coredll_printwin.obj \\r
@@ -4027,19 +4027,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_fontenum.obj \\r
         $(OBJS)\corelib_fontutil.obj \\r
         $(OBJS)\corelib_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\corelib_gdiplus.obj \\r
+       $(OBJS)\corelib_graphics.obj \\r
+       $(OBJS)\corelib_icon.obj \\r
+       $(OBJS)\corelib_imaglist.obj \\r
+       $(OBJS)\corelib_minifram.obj \\r
+       $(OBJS)\corelib_nonownedwnd.obj \\r
+       $(OBJS)\corelib_dataobj.obj \\r
+       $(OBJS)\corelib_dropsrc.obj \\r
+       $(OBJS)\corelib_droptgt.obj \\r
+       $(OBJS)\corelib_oleutils.obj \\r
+       $(OBJS)\corelib_palette.obj \\r
+       $(OBJS)\corelib_pen.obj \\r
         $(OBJS)\corelib_popupwin.obj \\r
         $(OBJS)\corelib_printdlg.obj \\r
         $(OBJS)\corelib_printwin.obj \\r
@@ -4299,19 +4299,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_fontenum.obj \\r
         $(OBJS)\corelib_fontutil.obj \\r
         $(OBJS)\corelib_gdiimage.obj \\r
-       $(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 \\r
+       $(OBJS)\corelib_gdiplus.obj \\r
+       $(OBJS)\corelib_graphics.obj \\r
+       $(OBJS)\corelib_icon.obj \\r
+       $(OBJS)\corelib_imaglist.obj \\r
+       $(OBJS)\corelib_minifram.obj \\r
+       $(OBJS)\corelib_nonownedwnd.obj \\r
+       $(OBJS)\corelib_dataobj.obj \\r
+       $(OBJS)\corelib_dropsrc.obj \\r
+       $(OBJS)\corelib_droptgt.obj \\r
+       $(OBJS)\corelib_oleutils.obj \\r
+       $(OBJS)\corelib_palette.obj \\r
+       $(OBJS)\corelib_pen.obj \\r
         $(OBJS)\corelib_popupwin.obj \\r
         $(OBJS)\corelib_printdlg.obj \\r
         $(OBJS)\corelib_printwin.obj \\r
@@ -4572,100 +4572,100 @@ __RUNTIME_LIBS_240 = $(__THREADSFLAG)
  !if "$(WXUNIV)" == "0"\r
  ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \\r
         $(OBJS)\advdll_animatecmn.obj \\r
-       $(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 \\r
+       $(OBJS)\advdll_calctrlcmn.obj \\r
+       $(OBJS)\advdll_datavcmn.obj \\r
+       $(OBJS)\advdll_gridcmn.obj \\r
+       $(OBJS)\advdll_hyperlnkcmn.obj \\r
+       $(OBJS)\advdll_odcombocmn.obj \\r
+       $(OBJS)\advdll_richtooltipcmn.obj \\r
+       $(OBJS)\advdll_aboutdlgg.obj \\r
+       $(OBJS)\advdll_bannerwindow.obj \\r
+       $(OBJS)\advdll_bmpcboxg.obj \\r
+       $(OBJS)\advdll_calctrlg.obj \\r
+       $(OBJS)\advdll_commandlinkbuttong.obj \\r
+       $(OBJS)\advdll_datavgen.obj \\r
         $(OBJS)\advdll_datectlg.obj \\r
         $(OBJS)\advdll_editlbox.obj \\r
         $(OBJS)\advdll_grid.obj \\r
         $(OBJS)\advdll_gridctrl.obj \\r
         $(OBJS)\advdll_grideditors.obj \\r
         $(OBJS)\advdll_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\advdll_hyperlinkg.obj \\r
+       $(OBJS)\advdll_laywin.obj \\r
+       $(OBJS)\advdll_notifmsgg.obj \\r
+       $(OBJS)\advdll_odcombo.obj \\r
+       $(OBJS)\advdll_propdlg.obj \\r
+       $(OBJS)\advdll_richtooltipg.obj \\r
+       $(OBJS)\advdll_sashwin.obj \\r
+       $(OBJS)\advdll_splash.obj \\r
+       $(OBJS)\advdll_generic_timectrl.obj \\r
+       $(OBJS)\advdll_tipdlg.obj \\r
+       $(OBJS)\advdll_treelist.obj \\r
+       $(OBJS)\advdll_wizard.obj \\r
+       $(OBJS)\advdll_taskbarcmn.obj \\r
+       $(OBJS)\advdll_aboutdlg.obj \\r
+       $(OBJS)\advdll_notifmsg.obj \\r
+       $(OBJS)\advdll_richtooltip.obj \\r
+       $(OBJS)\advdll_sound.obj \\r
+       $(OBJS)\advdll_taskbar.obj \\r
+       $(OBJS)\advdll_joystick.obj \\r
+       $(OBJS)\advdll_animateg.obj \\r
+       $(OBJS)\advdll_bmpcbox.obj \\r
+       $(OBJS)\advdll_calctrl.obj \\r
+       $(OBJS)\advdll_commandlinkbutton.obj \\r
+       $(OBJS)\advdll_datecontrols.obj \\r
+       $(OBJS)\advdll_datectrl.obj \\r
+       $(OBJS)\advdll_datetimectrl.obj \\r
+       $(OBJS)\advdll_hyperlink.obj \\r
+       $(OBJS)\advdll_msw_timectrl.obj\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \\r
+       $(OBJS)\advdll_animatecmn.obj \\r
+       $(OBJS)\advdll_bmpcboxcmn.obj \\r
+       $(OBJS)\advdll_calctrlcmn.obj \\r
+       $(OBJS)\advdll_datavcmn.obj \\r
+       $(OBJS)\advdll_gridcmn.obj \\r
+       $(OBJS)\advdll_hyperlnkcmn.obj \\r
+       $(OBJS)\advdll_odcombocmn.obj \\r
+       $(OBJS)\advdll_richtooltipcmn.obj \\r
+       $(OBJS)\advdll_aboutdlgg.obj \\r
+       $(OBJS)\advdll_bannerwindow.obj \\r
+       $(OBJS)\advdll_bmpcboxg.obj \\r
+       $(OBJS)\advdll_calctrlg.obj \\r
+       $(OBJS)\advdll_commandlinkbuttong.obj \\r
+       $(OBJS)\advdll_datavgen.obj \\r
         $(OBJS)\advdll_datectlg.obj \\r
         $(OBJS)\advdll_editlbox.obj \\r
         $(OBJS)\advdll_grid.obj \\r
         $(OBJS)\advdll_gridctrl.obj \\r
         $(OBJS)\advdll_grideditors.obj \\r
         $(OBJS)\advdll_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\advdll_hyperlinkg.obj \\r
+       $(OBJS)\advdll_laywin.obj \\r
+       $(OBJS)\advdll_notifmsgg.obj \\r
+       $(OBJS)\advdll_odcombo.obj \\r
+       $(OBJS)\advdll_propdlg.obj \\r
+       $(OBJS)\advdll_richtooltipg.obj \\r
+       $(OBJS)\advdll_sashwin.obj \\r
+       $(OBJS)\advdll_splash.obj \\r
+       $(OBJS)\advdll_generic_timectrl.obj \\r
+       $(OBJS)\advdll_tipdlg.obj \\r
+       $(OBJS)\advdll_treelist.obj \\r
+       $(OBJS)\advdll_wizard.obj \\r
+       $(OBJS)\advdll_taskbarcmn.obj \\r
+       $(OBJS)\advdll_aboutdlg.obj \\r
+       $(OBJS)\advdll_notifmsg.obj \\r
+       $(OBJS)\advdll_richtooltip.obj \\r
+       $(OBJS)\advdll_sound.obj \\r
+       $(OBJS)\advdll_taskbar.obj \\r
+       $(OBJS)\advdll_joystick.obj \\r
+       $(OBJS)\advdll_animateg.obj\r
+!endif\r
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"\r
  __advlib___depname = \\r
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
  !endif\r
@@ -4678,100 +4678,100 @@ __RUNTIME_LIBS_255 = $(__THREADSFLAG)
  !if "$(WXUNIV)" == "0"\r
  ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \\r
         $(OBJS)\advlib_animatecmn.obj \\r
-       $(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 \\r
+       $(OBJS)\advlib_calctrlcmn.obj \\r
+       $(OBJS)\advlib_datavcmn.obj \\r
+       $(OBJS)\advlib_gridcmn.obj \\r
+       $(OBJS)\advlib_hyperlnkcmn.obj \\r
+       $(OBJS)\advlib_odcombocmn.obj \\r
+       $(OBJS)\advlib_richtooltipcmn.obj \\r
+       $(OBJS)\advlib_aboutdlgg.obj \\r
+       $(OBJS)\advlib_bannerwindow.obj \\r
+       $(OBJS)\advlib_bmpcboxg.obj \\r
+       $(OBJS)\advlib_calctrlg.obj \\r
+       $(OBJS)\advlib_commandlinkbuttong.obj \\r
+       $(OBJS)\advlib_datavgen.obj \\r
         $(OBJS)\advlib_datectlg.obj \\r
         $(OBJS)\advlib_editlbox.obj \\r
         $(OBJS)\advlib_grid.obj \\r
         $(OBJS)\advlib_gridctrl.obj \\r
         $(OBJS)\advlib_grideditors.obj \\r
         $(OBJS)\advlib_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\advlib_hyperlinkg.obj \\r
+       $(OBJS)\advlib_laywin.obj \\r
+       $(OBJS)\advlib_notifmsgg.obj \\r
+       $(OBJS)\advlib_odcombo.obj \\r
+       $(OBJS)\advlib_propdlg.obj \\r
+       $(OBJS)\advlib_richtooltipg.obj \\r
+       $(OBJS)\advlib_sashwin.obj \\r
+       $(OBJS)\advlib_splash.obj \\r
+       $(OBJS)\advlib_generic_timectrl.obj \\r
+       $(OBJS)\advlib_tipdlg.obj \\r
+       $(OBJS)\advlib_treelist.obj \\r
+       $(OBJS)\advlib_wizard.obj \\r
+       $(OBJS)\advlib_taskbarcmn.obj \\r
+       $(OBJS)\advlib_aboutdlg.obj \\r
+       $(OBJS)\advlib_notifmsg.obj \\r
+       $(OBJS)\advlib_richtooltip.obj \\r
+       $(OBJS)\advlib_sound.obj \\r
+       $(OBJS)\advlib_taskbar.obj \\r
+       $(OBJS)\advlib_joystick.obj \\r
+       $(OBJS)\advlib_animateg.obj \\r
+       $(OBJS)\advlib_bmpcbox.obj \\r
+       $(OBJS)\advlib_calctrl.obj \\r
+       $(OBJS)\advlib_commandlinkbutton.obj \\r
+       $(OBJS)\advlib_datecontrols.obj \\r
+       $(OBJS)\advlib_datectrl.obj \\r
+       $(OBJS)\advlib_datetimectrl.obj \\r
+       $(OBJS)\advlib_hyperlink.obj \\r
+       $(OBJS)\advlib_msw_timectrl.obj\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \\r
+       $(OBJS)\advlib_animatecmn.obj \\r
+       $(OBJS)\advlib_bmpcboxcmn.obj \\r
+       $(OBJS)\advlib_calctrlcmn.obj \\r
+       $(OBJS)\advlib_datavcmn.obj \\r
+       $(OBJS)\advlib_gridcmn.obj \\r
+       $(OBJS)\advlib_hyperlnkcmn.obj \\r
+       $(OBJS)\advlib_odcombocmn.obj \\r
+       $(OBJS)\advlib_richtooltipcmn.obj \\r
+       $(OBJS)\advlib_aboutdlgg.obj \\r
+       $(OBJS)\advlib_bannerwindow.obj \\r
+       $(OBJS)\advlib_bmpcboxg.obj \\r
+       $(OBJS)\advlib_calctrlg.obj \\r
+       $(OBJS)\advlib_commandlinkbuttong.obj \\r
+       $(OBJS)\advlib_datavgen.obj \\r
         $(OBJS)\advlib_datectlg.obj \\r
         $(OBJS)\advlib_editlbox.obj \\r
         $(OBJS)\advlib_grid.obj \\r
         $(OBJS)\advlib_gridctrl.obj \\r
         $(OBJS)\advlib_grideditors.obj \\r
         $(OBJS)\advlib_gridsel.obj \\r
-       $(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 \\r
+       $(OBJS)\advlib_hyperlinkg.obj \\r
+       $(OBJS)\advlib_laywin.obj \\r
+       $(OBJS)\advlib_notifmsgg.obj \\r
+       $(OBJS)\advlib_odcombo.obj \\r
+       $(OBJS)\advlib_propdlg.obj \\r
+       $(OBJS)\advlib_richtooltipg.obj \\r
+       $(OBJS)\advlib_sashwin.obj \\r
+       $(OBJS)\advlib_splash.obj \\r
+       $(OBJS)\advlib_generic_timectrl.obj \\r
+       $(OBJS)\advlib_tipdlg.obj \\r
+       $(OBJS)\advlib_treelist.obj \\r
+       $(OBJS)\advlib_wizard.obj \\r
+       $(OBJS)\advlib_taskbarcmn.obj \\r
+       $(OBJS)\advlib_aboutdlg.obj \\r
+       $(OBJS)\advlib_notifmsg.obj \\r
+       $(OBJS)\advlib_richtooltip.obj \\r
+       $(OBJS)\advlib_sound.obj \\r
+       $(OBJS)\advlib_taskbar.obj \\r
+       $(OBJS)\advlib_joystick.obj \\r
+       $(OBJS)\advlib_animateg.obj\r
+!endif\r
+!if "$(SHARED)" == "1"\r
  ____wxadv_namedll_DEP = $(__advdll___depname)\r
  !endif\r
  !if "$(SHARED)" == "0"\r
@@ -6856,9 +6856,9 @@ $(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
  $(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textfile.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\time.cpp\r
+\r
  $(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
  \r
@@ -7345,27 +7345,27 @@ $(OBJS)\monodll_calctrl.obj: ..\..\src\msw\calctrl.cpp
  $(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp\r
+\r
+$(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
+\r
+$(OBJS)\monodll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp\r
+\r
+$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
+\r
+$(OBJS)\monodll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp\r
+\r
+$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp\r
+\r
+$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp\r
+\r
  $(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp\r
  \r
@@ -7624,21 +7624,21 @@ $(OBJS)\monodll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
  $(OBJS)\monodll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp\r
+\r
+$(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
+\r
+$(OBJS)\monodll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp\r
+\r
+$(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
+\r
+$(OBJS)\monodll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp\r
+\r
  $(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
  \r
@@ -7912,23 +7912,23 @@ $(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
  !endif\r
  \r
@@ -8882,23 +8882,23 @@ $(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp\r
  !endif\r
  \r
@@ -8977,38 +8977,38 @@ $(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splash.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treelist.cpp\r
  !endif\r
  \r
@@ -9027,23 +9027,23 @@ $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp\r
  !endif\r
  \r
@@ -9261,9 +9261,9 @@ $(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
  $(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textfile.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\time.cpp\r
+\r
  $(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
  \r
@@ -9750,27 +9750,27 @@ $(OBJS)\monolib_calctrl.obj: ..\..\src\msw\calctrl.cpp
  $(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp\r
+\r
+$(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
+\r
+$(OBJS)\monolib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp\r
+\r
+$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
+\r
+$(OBJS)\monolib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp\r
+\r
+$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp\r
+\r
+$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp\r
+\r
  $(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp\r
  \r
@@ -10029,21 +10029,21 @@ $(OBJS)\monolib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
  $(OBJS)\monolib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp\r
+\r
+$(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
+\r
+$(OBJS)\monolib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp\r
+\r
+$(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
+\r
+$(OBJS)\monolib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp\r
+\r
  $(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
  \r
@@ -10317,23 +10317,23 @@ $(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
  !endif\r
  \r
@@ -11287,23 +11287,23 @@ $(OBJS)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp\r
  !endif\r
  \r
@@ -11382,38 +11382,38 @@ $(OBJS)\monolib_odcombo.obj: ..\..\src\generic\odcombo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splash.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp\r
  !endif\r
  \r
@@ -11432,23 +11432,23 @@ $(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp\r
  !endif\r
  \r
@@ -11666,9 +11666,9 @@ $(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp
  $(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textfile.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\time.cpp\r
+\r
  $(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
  \r
@@ -12005,9 +12005,9 @@ $(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp
  $(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textfile.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\time.cpp\r
+\r
  $(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
  \r
@@ -12695,23 +12695,23 @@ $(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
  !endif\r
  \r
@@ -14103,23 +14103,23 @@ $(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp\r
  !endif\r
  \r
-!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"\r
+$(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
  !endif\r
  \r
@@ -15058,27 +15058,27 @@ $(OBJS)\advdll_calctrl.obj: ..\..\src\msw\calctrl.cpp
  $(OBJS)\advdll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp\r
+\r
+$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
+\r
+$(OBJS)\advdll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp\r
+\r
+$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
+\r
+$(OBJS)\advdll_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp\r
+\r
+$(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
+\r
+$(OBJS)\advdll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp\r
+\r
  $(OBJS)\advdll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
  \r
@@ -15088,21 +15088,21 @@ $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
  $(OBJS)\advdll_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
+\r
+$(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+\r
+$(OBJS)\advdll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp\r
+\r
+$(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp\r
+\r
+$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp\r
+\r
  $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp\r
  \r
@@ -15145,51 +15145,51 @@ $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
  $(OBJS)\advdll_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp\r
+\r
+$(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
+\r
+$(OBJS)\advdll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp\r
+\r
+$(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp\r
+\r
+$(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp\r
+\r
+$(OBJS)\advdll_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrl.cpp\r
+\r
+$(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp\r
+\r
+$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp\r
+\r
  $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\wizard.cpp\r
  \r
  $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
+\r
+$(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
+\r
+$(OBJS)\advdll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp\r
+\r
+$(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp\r
+\r
+$(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp\r
+\r
  $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp\r
  \r
@@ -15208,27 +15208,27 @@ $(OBJS)\advlib_calctrl.obj: ..\..\src\msw\calctrl.cpp
  $(OBJS)\advlib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp\r
+\r
+$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp\r
+\r
+$(OBJS)\advlib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp\r
+\r
+$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
+\r
+$(OBJS)\advlib_msw_timectrl.obj: ..\..\src\msw\timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp\r
+\r
+$(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp\r
+\r
+$(OBJS)\advlib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp\r
+\r
  $(OBJS)\advlib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
  \r
@@ -15238,21 +15238,21 @@ $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
  $(OBJS)\advlib_gridcmn.obj: ..\..\src\common\gridcmn.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp\r
+\r
+$(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp\r
+\r
+$(OBJS)\advlib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp\r
+\r
+$(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp\r
+\r
+$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp\r
+\r
  $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp\r
  \r
@@ -15295,51 +15295,51 @@ $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
  $(OBJS)\advlib_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp\r
+\r
+$(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp\r
+\r
+$(OBJS)\advlib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp\r
+\r
+$(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp\r
+\r
+$(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp\r
+\r
+$(OBJS)\advlib_generic_timectrl.obj: ..\..\src\generic\timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrl.cpp\r
+\r
+$(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp\r
+\r
+$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp\r
+\r
  $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp\r
  \r
  $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp\r
+\r
+$(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp\r
+\r
+$(OBJS)\advlib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp\r
+\r
+$(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp\r
+\r
+$(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp\r
+\r
  $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp\r
  \r
@@ -15778,21 +15778,21 @@ $(OBJS)\xrcdll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
  $(OBJS)\xrcdll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp\r
+\r
+$(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
+\r
+$(OBJS)\xrcdll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp\r
+\r
+$(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
+\r
+$(OBJS)\xrcdll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp\r
+\r
  $(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
  \r
@@ -15976,21 +15976,21 @@ $(OBJS)\xrclib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp
  $(OBJS)\xrclib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp\r
  \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp\r
+\r
+$(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp\r
+\r
+$(OBJS)\xrclib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp\r
+\r
+$(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp\r
+\r
+$(OBJS)\xrclib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp\r
+\r
  $(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
  \r
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat

index 86026d18176aabf6ef64591428c9c72351516d28..b03ef51786c30ada76e64a3f1b1ea38961aff104 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -189,19 +189,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
         $(OBJS)\monodll_xh_split.obj &\r
         $(OBJS)\monodll_xh_srchctrl.obj &\r
         $(OBJS)\monodll_xh_statbar.obj &\r
-       $(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 &\r
+       $(OBJS)\monodll_xh_stbox.obj &\r
+       $(OBJS)\monodll_xh_stlin.obj &\r
+       $(OBJS)\monodll_xh_sttxt.obj &\r
+       $(OBJS)\monodll_xh_text.obj &\r
+       $(OBJS)\monodll_xh_tglbtn.obj &\r
+       $(OBJS)\monodll_xh_timectrl.obj &\r
+       $(OBJS)\monodll_xh_toolb.obj &\r
+       $(OBJS)\monodll_xh_toolbk.obj &\r
+       $(OBJS)\monodll_xh_tree.obj &\r
+       $(OBJS)\monodll_xh_treebk.obj &\r
+       $(OBJS)\monodll_xh_unkwn.obj &\r
+       $(OBJS)\monodll_xh_wizrd.obj &\r
         $(OBJS)\monodll_xmlres.obj &\r
         $(OBJS)\monodll_xmladv.obj &\r
         $(OBJS)\monodll_xmlrsall.obj &\r
@@ -269,19 +269,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
         $(OBJS)\monodll_fontenum.obj &\r
         $(OBJS)\monodll_fontutil.obj &\r
         $(OBJS)\monodll_gdiimage.obj &\r
-       $(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 &\r
+       $(OBJS)\monodll_gdiplus.obj &\r
+       $(OBJS)\monodll_graphics.obj &\r
+       $(OBJS)\monodll_icon.obj &\r
+       $(OBJS)\monodll_imaglist.obj &\r
+       $(OBJS)\monodll_minifram.obj &\r
+       $(OBJS)\monodll_nonownedwnd.obj &\r
+       $(OBJS)\monodll_dataobj.obj &\r
+       $(OBJS)\monodll_dropsrc.obj &\r
+       $(OBJS)\monodll_droptgt.obj &\r
+       $(OBJS)\monodll_oleutils.obj &\r
+       $(OBJS)\monodll_palette.obj &\r
+       $(OBJS)\monodll_pen.obj &\r
         $(OBJS)\monodll_popupwin.obj &\r
         $(OBJS)\monodll_printdlg.obj &\r
         $(OBJS)\monodll_printwin.obj &\r
@@ -543,19 +543,19 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
         $(OBJS)\monodll_fontenum.obj &\r
         $(OBJS)\monodll_fontutil.obj &\r
         $(OBJS)\monodll_gdiimage.obj &\r
-       $(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 &\r
+       $(OBJS)\monodll_gdiplus.obj &\r
+       $(OBJS)\monodll_graphics.obj &\r
+       $(OBJS)\monodll_icon.obj &\r
+       $(OBJS)\monodll_imaglist.obj &\r
+       $(OBJS)\monodll_minifram.obj &\r
+       $(OBJS)\monodll_nonownedwnd.obj &\r
+       $(OBJS)\monodll_dataobj.obj &\r
+       $(OBJS)\monodll_dropsrc.obj &\r
+       $(OBJS)\monodll_droptgt.obj &\r
+       $(OBJS)\monodll_oleutils.obj &\r
+       $(OBJS)\monodll_palette.obj &\r
+       $(OBJS)\monodll_pen.obj &\r
         $(OBJS)\monodll_popupwin.obj &\r
         $(OBJS)\monodll_printdlg.obj &\r
         $(OBJS)\monodll_printwin.obj &\r
@@ -790,100 +790,100 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =
  !ifeq WXUNIV 0\r
  ____ADVANCED_SRC_FILENAMES_OBJECTS =  &\r
         $(OBJS)\monodll_animatecmn.obj &\r
-       $(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 &\r
+       $(OBJS)\monodll_calctrlcmn.obj &\r
+       $(OBJS)\monodll_datavcmn.obj &\r
+       $(OBJS)\monodll_gridcmn.obj &\r
+       $(OBJS)\monodll_hyperlnkcmn.obj &\r
+       $(OBJS)\monodll_odcombocmn.obj &\r
+       $(OBJS)\monodll_richtooltipcmn.obj &\r
+       $(OBJS)\monodll_aboutdlgg.obj &\r
+       $(OBJS)\monodll_bannerwindow.obj &\r
+       $(OBJS)\monodll_bmpcboxg.obj &\r
+       $(OBJS)\monodll_calctrlg.obj &\r
+       $(OBJS)\monodll_commandlinkbuttong.obj &\r
+       $(OBJS)\monodll_datavgen.obj &\r
         $(OBJS)\monodll_datectlg.obj &\r
         $(OBJS)\monodll_editlbox.obj &\r
         $(OBJS)\monodll_grid.obj &\r
         $(OBJS)\monodll_gridctrl.obj &\r
         $(OBJS)\monodll_grideditors.obj &\r
         $(OBJS)\monodll_gridsel.obj &\r
-       $(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 &\r
+       $(OBJS)\monodll_hyperlinkg.obj &\r
+       $(OBJS)\monodll_laywin.obj &\r
+       $(OBJS)\monodll_notifmsgg.obj &\r
+       $(OBJS)\monodll_odcombo.obj &\r
+       $(OBJS)\monodll_propdlg.obj &\r
+       $(OBJS)\monodll_richtooltipg.obj &\r
+       $(OBJS)\monodll_sashwin.obj &\r
+       $(OBJS)\monodll_splash.obj &\r
+       $(OBJS)\monodll_generic_timectrl.obj &\r
+       $(OBJS)\monodll_tipdlg.obj &\r
+       $(OBJS)\monodll_treelist.obj &\r
+       $(OBJS)\monodll_wizard.obj &\r
+       $(OBJS)\monodll_taskbarcmn.obj &\r
+       $(OBJS)\monodll_aboutdlg.obj &\r
+       $(OBJS)\monodll_notifmsg.obj &\r
+       $(OBJS)\monodll_richtooltip.obj &\r
+       $(OBJS)\monodll_sound.obj &\r
+       $(OBJS)\monodll_taskbar.obj &\r
+       $(OBJS)\monodll_joystick.obj &\r
+       $(OBJS)\monodll_animateg.obj &\r
+       $(OBJS)\monodll_bmpcbox.obj &\r
+       $(OBJS)\monodll_calctrl.obj &\r
+       $(OBJS)\monodll_commandlinkbutton.obj &\r
+       $(OBJS)\monodll_datecontrols.obj &\r
+       $(OBJS)\monodll_datectrl.obj &\r
+       $(OBJS)\monodll_datetimectrl.obj &\r
+       $(OBJS)\monodll_hyperlink.obj &\r
+       $(OBJS)\monodll_msw_timectrl.obj\r
+!endif\r
+!ifeq WXUNIV 1\r
+____ADVANCED_SRC_FILENAMES_OBJECTS =  &\r
+       $(OBJS)\monodll_animatecmn.obj &\r
+       $(OBJS)\monodll_bmpcboxcmn.obj &\r
+       $(OBJS)\monodll_calctrlcmn.obj &\r
+       $(OBJS)\monodll_datavcmn.obj &\r
+       $(OBJS)\monodll_gridcmn.obj &\r
+       $(OBJS)\monodll_hyperlnkcmn.obj &\r
+       $(OBJS)\monodll_odcombocmn.obj &\r
+       $(OBJS)\monodll_richtooltipcmn.obj &\r
+       $(OBJS)\monodll_aboutdlgg.obj &\r
+       $(OBJS)\monodll_bannerwindow.obj &\r
+       $(OBJS)\monodll_bmpcboxg.obj &\r
+       $(OBJS)\monodll_calctrlg.obj &\r
+       $(OBJS)\monodll_commandlinkbuttong.obj &\r
+       $(OBJS)\monodll_datavgen.obj &\r
         $(OBJS)\monodll_datectlg.obj &\r
         $(OBJS)\monodll_editlbox.obj &\r
         $(OBJS)\monodll_grid.obj &\r
         $(OBJS)\monodll_gridctrl.obj &\r
         $(OBJS)\monodll_grideditors.obj &\r
         $(OBJS)\monodll_gridsel.obj &\r
-       $(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 &\r
+       $(OBJS)\monodll_hyperlinkg.obj &\r
+       $(OBJS)\monodll_laywin.obj &\r
+       $(OBJS)\monodll_notifmsgg.obj &\r
+       $(OBJS)\monodll_odcombo.obj &\r
+       $(OBJS)\monodll_propdlg.obj &\r
+       $(OBJS)\monodll_richtooltipg.obj &\r
+       $(OBJS)\monodll_sashwin.obj &\r
+       $(OBJS)\monodll_splash.obj &\r
+       $(OBJS)\monodll_generic_timectrl.obj &\r
+       $(OBJS)\monodll_tipdlg.obj &\r
+       $(OBJS)\monodll_treelist.obj &\r
+       $(OBJS)\monodll_wizard.obj &\r
+       $(OBJS)\monodll_taskbarcmn.obj &\r
+       $(OBJS)\monodll_aboutdlg.obj &\r
+       $(OBJS)\monodll_notifmsg.obj &\r
+       $(OBJS)\monodll_richtooltip.obj &\r
+       $(OBJS)\monodll_sound.obj &\r
+       $(OBJS)\monodll_taskbar.obj &\r
+       $(OBJS)\monodll_joystick.obj &\r
+       $(OBJS)\monodll_animateg.obj\r
+!endif\r
+__wxscintilla_library_link_DEP =\r
  !ifeq USE_STC 1\r
  __wxscintilla_library_link_DEP = $(__wxscintilla)\r
  !endif\r
@@ -983,19 +983,19 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
         $(OBJS)\monolib_xh_split.obj &\r
         $(OBJS)\monolib_xh_srchctrl.obj &\r
         $(OBJS)\monolib_xh_statbar.obj &\r
-       $(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 &\r
+       $(OBJS)\monolib_xh_stbox.obj &\r
+       $(OBJS)\monolib_xh_stlin.obj &\r
+       $(OBJS)\monolib_xh_sttxt.obj &\r
+       $(OBJS)\monolib_xh_text.obj &\r
+       $(OBJS)\monolib_xh_tglbtn.obj &\r
+       $(OBJS)\monolib_xh_timectrl.obj &\r
+       $(OBJS)\monolib_xh_toolb.obj &\r
+       $(OBJS)\monolib_xh_toolbk.obj &\r
+       $(OBJS)\monolib_xh_tree.obj &\r
+       $(OBJS)\monolib_xh_treebk.obj &\r
+       $(OBJS)\monolib_xh_unkwn.obj &\r
+       $(OBJS)\monolib_xh_wizrd.obj &\r
         $(OBJS)\monolib_xmlres.obj &\r
         $(OBJS)\monolib_xmladv.obj &\r
         $(OBJS)\monolib_xmlrsall.obj &\r
@@ -1063,19 +1063,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
         $(OBJS)\monolib_fontenum.obj &\r
         $(OBJS)\monolib_fontutil.obj &\r
         $(OBJS)\monolib_gdiimage.obj &\r
-       $(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 &\r
+       $(OBJS)\monolib_gdiplus.obj &\r
+       $(OBJS)\monolib_graphics.obj &\r
+       $(OBJS)\monolib_icon.obj &\r
+       $(OBJS)\monolib_imaglist.obj &\r
+       $(OBJS)\monolib_minifram.obj &\r
+       $(OBJS)\monolib_nonownedwnd.obj &\r
+       $(OBJS)\monolib_dataobj.obj &\r
+       $(OBJS)\monolib_dropsrc.obj &\r
+       $(OBJS)\monolib_droptgt.obj &\r
+       $(OBJS)\monolib_oleutils.obj &\r
+       $(OBJS)\monolib_palette.obj &\r
+       $(OBJS)\monolib_pen.obj &\r
         $(OBJS)\monolib_popupwin.obj &\r
         $(OBJS)\monolib_printdlg.obj &\r
         $(OBJS)\monolib_printwin.obj &\r
@@ -1337,19 +1337,19 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
         $(OBJS)\monolib_fontenum.obj &\r
         $(OBJS)\monolib_fontutil.obj &\r
         $(OBJS)\monolib_gdiimage.obj &\r
-       $(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 &\r
+       $(OBJS)\monolib_gdiplus.obj &\r
+       $(OBJS)\monolib_graphics.obj &\r
+       $(OBJS)\monolib_icon.obj &\r
+       $(OBJS)\monolib_imaglist.obj &\r
+       $(OBJS)\monolib_minifram.obj &\r
+       $(OBJS)\monolib_nonownedwnd.obj &\r
+       $(OBJS)\monolib_dataobj.obj &\r
+       $(OBJS)\monolib_dropsrc.obj &\r
+       $(OBJS)\monolib_droptgt.obj &\r
+       $(OBJS)\monolib_oleutils.obj &\r
+       $(OBJS)\monolib_palette.obj &\r
+       $(OBJS)\monolib_pen.obj &\r
         $(OBJS)\monolib_popupwin.obj &\r
         $(OBJS)\monolib_printdlg.obj &\r
         $(OBJS)\monolib_printwin.obj &\r
@@ -1584,100 +1584,100 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =
  !ifeq WXUNIV 0\r
  ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &\r
         $(OBJS)\monolib_animatecmn.obj &\r
-       $(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 &\r
+       $(OBJS)\monolib_calctrlcmn.obj &\r
+       $(OBJS)\monolib_datavcmn.obj &\r
+       $(OBJS)\monolib_gridcmn.obj &\r
+       $(OBJS)\monolib_hyperlnkcmn.obj &\r
+       $(OBJS)\monolib_odcombocmn.obj &\r
+       $(OBJS)\monolib_richtooltipcmn.obj &\r
+       $(OBJS)\monolib_aboutdlgg.obj &\r
+       $(OBJS)\monolib_bannerwindow.obj &\r
+       $(OBJS)\monolib_bmpcboxg.obj &\r
+       $(OBJS)\monolib_calctrlg.obj &\r
+       $(OBJS)\monolib_commandlinkbuttong.obj &\r
+       $(OBJS)\monolib_datavgen.obj &\r
         $(OBJS)\monolib_datectlg.obj &\r
         $(OBJS)\monolib_editlbox.obj &\r
         $(OBJS)\monolib_grid.obj &\r
         $(OBJS)\monolib_gridctrl.obj &\r
         $(OBJS)\monolib_grideditors.obj &\r
         $(OBJS)\monolib_gridsel.obj &\r
-       $(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 &\r
+       $(OBJS)\monolib_hyperlinkg.obj &\r
+       $(OBJS)\monolib_laywin.obj &\r
+       $(OBJS)\monolib_notifmsgg.obj &\r
+       $(OBJS)\monolib_odcombo.obj &\r
+       $(OBJS)\monolib_propdlg.obj &\r
+       $(OBJS)\monolib_richtooltipg.obj &\r
+       $(OBJS)\monolib_sashwin.obj &\r
+       $(OBJS)\monolib_splash.obj &\r
+       $(OBJS)\monolib_generic_timectrl.obj &\r
+       $(OBJS)\monolib_tipdlg.obj &\r
+       $(OBJS)\monolib_treelist.obj &\r
+       $(OBJS)\monolib_wizard.obj &\r
+       $(OBJS)\monolib_taskbarcmn.obj &\r
+       $(OBJS)\monolib_aboutdlg.obj &\r
+       $(OBJS)\monolib_notifmsg.obj &\r
+       $(OBJS)\monolib_richtooltip.obj &\r
+       $(OBJS)\monolib_sound.obj &\r
+       $(OBJS)\monolib_taskbar.obj &\r
+       $(OBJS)\monolib_joystick.obj &\r
+       $(OBJS)\monolib_animateg.obj &\r
+       $(OBJS)\monolib_bmpcbox.obj &\r
+       $(OBJS)\monolib_calctrl.obj &\r
+       $(OBJS)\monolib_commandlinkbutton.obj &\r
+       $(OBJS)\monolib_datecontrols.obj &\r
+       $(OBJS)\monolib_datectrl.obj &\r
+       $(OBJS)\monolib_datetimectrl.obj &\r
+       $(OBJS)\monolib_hyperlink.obj &\r
+       $(OBJS)\monolib_msw_timectrl.obj\r
+!endif\r
+!ifeq WXUNIV 1\r
+____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &\r
+       $(OBJS)\monolib_animatecmn.obj &\r
+       $(OBJS)\monolib_bmpcboxcmn.obj &\r
+       $(OBJS)\monolib_calctrlcmn.obj &\r
+       $(OBJS)\monolib_datavcmn.obj &\r
+       $(OBJS)\monolib_gridcmn.obj &\r
+       $(OBJS)\monolib_hyperlnkcmn.obj &\r
+       $(OBJS)\monolib_odcombocmn.obj &\r
+       $(OBJS)\monolib_richtooltipcmn.obj &\r
+       $(OBJS)\monolib_aboutdlgg.obj &\r
+       $(OBJS)\monolib_bannerwindow.obj &\r
+       $(OBJS)\monolib_bmpcboxg.obj &\r
+       $(OBJS)\monolib_calctrlg.obj &\r
+       $(OBJS)\monolib_commandlinkbuttong.obj &\r
+       $(OBJS)\monolib_datavgen.obj &\r
         $(OBJS)\monolib_datectlg.obj &\r
         $(OBJS)\monolib_editlbox.obj &\r
         $(OBJS)\monolib_grid.obj &\r
         $(OBJS)\monolib_gridctrl.obj &\r
         $(OBJS)\monolib_grideditors.obj &\r
         $(OBJS)\monolib_gridsel.obj &\r
-       $(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 &\r
+       $(OBJS)\monolib_hyperlinkg.obj &\r
+       $(OBJS)\monolib_laywin.obj &\r
+       $(OBJS)\monolib_notifmsgg.obj &\r
+       $(OBJS)\monolib_odcombo.obj &\r
+       $(OBJS)\monolib_propdlg.obj &\r
+       $(OBJS)\monolib_richtooltipg.obj &\r
+       $(OBJS)\monolib_sashwin.obj &\r
+       $(OBJS)\monolib_splash.obj &\r
+       $(OBJS)\monolib_generic_timectrl.obj &\r
+       $(OBJS)\monolib_tipdlg.obj &\r
+       $(OBJS)\monolib_treelist.obj &\r
+       $(OBJS)\monolib_wizard.obj &\r
+       $(OBJS)\monolib_taskbarcmn.obj &\r
+       $(OBJS)\monolib_aboutdlg.obj &\r
+       $(OBJS)\monolib_notifmsg.obj &\r
+       $(OBJS)\monolib_richtooltip.obj &\r
+       $(OBJS)\monolib_sound.obj &\r
+       $(OBJS)\monolib_taskbar.obj &\r
+       $(OBJS)\monolib_joystick.obj &\r
+       $(OBJS)\monolib_animateg.obj\r
+!endif\r
+__basedll___depname =\r
  !ifeq MONOLITHIC 0\r
  !ifeq SHARED 1\r
  __basedll___depname = &\r
@@ -1756,19 +1756,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
         $(OBJS)\coredll_fontenum.obj &\r
         $(OBJS)\coredll_fontutil.obj &\r
         $(OBJS)\coredll_gdiimage.obj &\r
-       $(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 &\r
+       $(OBJS)\coredll_gdiplus.obj &\r
+       $(OBJS)\coredll_graphics.obj &\r
+       $(OBJS)\coredll_icon.obj &\r
+       $(OBJS)\coredll_imaglist.obj &\r
+       $(OBJS)\coredll_minifram.obj &\r
+       $(OBJS)\coredll_nonownedwnd.obj &\r
+       $(OBJS)\coredll_dataobj.obj &\r
+       $(OBJS)\coredll_dropsrc.obj &\r
+       $(OBJS)\coredll_droptgt.obj &\r
+       $(OBJS)\coredll_oleutils.obj &\r
+       $(OBJS)\coredll_palette.obj &\r
+       $(OBJS)\coredll_pen.obj &\r
         $(OBJS)\coredll_popupwin.obj &\r
         $(OBJS)\coredll_printdlg.obj &\r
         $(OBJS)\coredll_printwin.obj &\r
@@ -2030,19 +2030,19 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
         $(OBJS)\coredll_fontenum.obj &\r
         $(OBJS)\coredll_fontutil.obj &\r
         $(OBJS)\coredll_gdiimage.obj &\r
-       $(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 &\r
+       $(OBJS)\coredll_gdiplus.obj &\r
+       $(OBJS)\coredll_graphics.obj &\r
+       $(OBJS)\coredll_icon.obj &\r
+       $(OBJS)\coredll_imaglist.obj &\r
+       $(OBJS)\coredll_minifram.obj &\r
+       $(OBJS)\coredll_nonownedwnd.obj &\r
+       $(OBJS)\coredll_dataobj.obj &\r
+       $(OBJS)\coredll_dropsrc.obj &\r
+       $(OBJS)\coredll_droptgt.obj &\r
+       $(OBJS)\coredll_oleutils.obj &\r
+       $(OBJS)\coredll_palette.obj &\r
+       $(OBJS)\coredll_pen.obj &\r
         $(OBJS)\coredll_popupwin.obj &\r
         $(OBJS)\coredll_printdlg.obj &\r
         $(OBJS)\coredll_printwin.obj &\r
@@ -2308,19 +2308,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
         $(OBJS)\corelib_fontenum.obj &\r
         $(OBJS)\corelib_fontutil.obj &\r
         $(OBJS)\corelib_gdiimage.obj &\r
-       $(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 &\r
+       $(OBJS)\corelib_gdiplus.obj &\r
+       $(OBJS)\corelib_graphics.obj &\r
+       $(OBJS)\corelib_icon.obj &\r
+       $(OBJS)\corelib_imaglist.obj &\r
+       $(OBJS)\corelib_minifram.obj &\r
+       $(OBJS)\corelib_nonownedwnd.obj &\r
+       $(OBJS)\corelib_dataobj.obj &\r
+       $(OBJS)\corelib_dropsrc.obj &\r
+       $(OBJS)\corelib_droptgt.obj &\r
+       $(OBJS)\corelib_oleutils.obj &\r
+       $(OBJS)\corelib_palette.obj &\r
+       $(OBJS)\corelib_pen.obj &\r
         $(OBJS)\corelib_popupwin.obj &\r
         $(OBJS)\corelib_printdlg.obj &\r
         $(OBJS)\corelib_printwin.obj &\r
@@ -2582,19 +2582,19 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
         $(OBJS)\corelib_fontenum.obj &\r
         $(OBJS)\corelib_fontutil.obj &\r
         $(OBJS)\corelib_gdiimage.obj &\r
-       $(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 &\r
+       $(OBJS)\corelib_gdiplus.obj &\r
+       $(OBJS)\corelib_graphics.obj &\r
+       $(OBJS)\corelib_icon.obj &\r
+       $(OBJS)\corelib_imaglist.obj &\r
+       $(OBJS)\corelib_minifram.obj &\r
+       $(OBJS)\corelib_nonownedwnd.obj &\r
+       $(OBJS)\corelib_dataobj.obj &\r
+       $(OBJS)\corelib_dropsrc.obj &\r
+       $(OBJS)\corelib_droptgt.obj &\r
+       $(OBJS)\corelib_oleutils.obj &\r
+       $(OBJS)\corelib_palette.obj &\r
+       $(OBJS)\corelib_pen.obj &\r
         $(OBJS)\corelib_popupwin.obj &\r
         $(OBJS)\corelib_printdlg.obj &\r
         $(OBJS)\corelib_printwin.obj &\r
@@ -2846,100 +2846,100 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =
  !ifeq WXUNIV 0\r
  ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &\r
         $(OBJS)\advdll_animatecmn.obj &\r
-       $(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 &\r
+       $(OBJS)\advdll_calctrlcmn.obj &\r
+       $(OBJS)\advdll_datavcmn.obj &\r
+       $(OBJS)\advdll_gridcmn.obj &\r
+       $(OBJS)\advdll_hyperlnkcmn.obj &\r
+       $(OBJS)\advdll_odcombocmn.obj &\r
+       $(OBJS)\advdll_richtooltipcmn.obj &\r
+       $(OBJS)\advdll_aboutdlgg.obj &\r
+       $(OBJS)\advdll_bannerwindow.obj &\r
+       $(OBJS)\advdll_bmpcboxg.obj &\r
+       $(OBJS)\advdll_calctrlg.obj &\r
+       $(OBJS)\advdll_commandlinkbuttong.obj &\r
+       $(OBJS)\advdll_datavgen.obj &\r
         $(OBJS)\advdll_datectlg.obj &\r
         $(OBJS)\advdll_editlbox.obj &\r
         $(OBJS)\advdll_grid.obj &\r
         $(OBJS)\advdll_gridctrl.obj &\r
         $(OBJS)\advdll_grideditors.obj &\r
         $(OBJS)\advdll_gridsel.obj &\r
-       $(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 &\r
+       $(OBJS)\advdll_hyperlinkg.obj &\r
+       $(OBJS)\advdll_laywin.obj &\r
+       $(OBJS)\advdll_notifmsgg.obj &\r
+       $(OBJS)\advdll_odcombo.obj &\r
+       $(OBJS)\advdll_propdlg.obj &\r
+       $(OBJS)\advdll_richtooltipg.obj &\r
+       $(OBJS)\advdll_sashwin.obj &\r
+       $(OBJS)\advdll_splash.obj &\r
+       $(OBJS)\advdll_generic_timectrl.obj &\r
+       $(OBJS)\advdll_tipdlg.obj &\r
+       $(OBJS)\advdll_treelist.obj &\r
+       $(OBJS)\advdll_wizard.obj &\r
+       $(OBJS)\advdll_taskbarcmn.obj &\r
+       $(OBJS)\advdll_aboutdlg.obj &\r
+       $(OBJS)\advdll_notifmsg.obj &\r
+       $(OBJS)\advdll_richtooltip.obj &\r
+       $(OBJS)\advdll_sound.obj &\r
+       $(OBJS)\advdll_taskbar.obj &\r
+       $(OBJS)\advdll_joystick.obj &\r
+       $(OBJS)\advdll_animateg.obj &\r
+       $(OBJS)\advdll_bmpcbox.obj &\r
+       $(OBJS)\advdll_calctrl.obj &\r
+       $(OBJS)\advdll_commandlinkbutton.obj &\r
+       $(OBJS)\advdll_datecontrols.obj &\r
+       $(OBJS)\advdll_datectrl.obj &\r
+       $(OBJS)\advdll_datetimectrl.obj &\r
+       $(OBJS)\advdll_hyperlink.obj &\r
+       $(OBJS)\advdll_msw_timectrl.obj\r
+!endif\r
+!ifeq WXUNIV 1\r
+____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &\r
+       $(OBJS)\advdll_animatecmn.obj &\r
+       $(OBJS)\advdll_bmpcboxcmn.obj &\r
+       $(OBJS)\advdll_calctrlcmn.obj &\r
+       $(OBJS)\advdll_datavcmn.obj &\r
+       $(OBJS)\advdll_gridcmn.obj &\r
+       $(OBJS)\advdll_hyperlnkcmn.obj &\r
+       $(OBJS)\advdll_odcombocmn.obj &\r
+       $(OBJS)\advdll_richtooltipcmn.obj &\r
+       $(OBJS)\advdll_aboutdlgg.obj &\r
+       $(OBJS)\advdll_bannerwindow.obj &\r
+       $(OBJS)\advdll_bmpcboxg.obj &\r
+       $(OBJS)\advdll_calctrlg.obj &\r
+       $(OBJS)\advdll_commandlinkbuttong.obj &\r
+       $(OBJS)\advdll_datavgen.obj &\r
         $(OBJS)\advdll_datectlg.obj &\r
         $(OBJS)\advdll_editlbox.obj &\r
         $(OBJS)\advdll_grid.obj &\r
         $(OBJS)\advdll_gridctrl.obj &\r
         $(OBJS)\advdll_grideditors.obj &\r
         $(OBJS)\advdll_gridsel.obj &\r
-       $(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 &\r
+       $(OBJS)\advdll_hyperlinkg.obj &\r
+       $(OBJS)\advdll_laywin.obj &\r
+       $(OBJS)\advdll_notifmsgg.obj &\r
+       $(OBJS)\advdll_odcombo.obj &\r
+       $(OBJS)\advdll_propdlg.obj &\r
+       $(OBJS)\advdll_richtooltipg.obj &\r
+       $(OBJS)\advdll_sashwin.obj &\r
+       $(OBJS)\advdll_splash.obj &\r
+       $(OBJS)\advdll_generic_timectrl.obj &\r
+       $(OBJS)\advdll_tipdlg.obj &\r
+       $(OBJS)\advdll_treelist.obj &\r
+       $(OBJS)\advdll_wizard.obj &\r
+       $(OBJS)\advdll_taskbarcmn.obj &\r
+       $(OBJS)\advdll_aboutdlg.obj &\r
+       $(OBJS)\advdll_notifmsg.obj &\r
+       $(OBJS)\advdll_richtooltip.obj &\r
+       $(OBJS)\advdll_sound.obj &\r
+       $(OBJS)\advdll_taskbar.obj &\r
+       $(OBJS)\advdll_joystick.obj &\r
+       $(OBJS)\advdll_animateg.obj\r
+!endif\r
+__advlib___depname =\r
  !ifeq MONOLITHIC 0\r
  !ifeq SHARED 0\r
  !ifeq USE_GUI 1\r
@@ -2952,100 +2952,100 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =
  !ifeq WXUNIV 0\r
  ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &\r
         $(OBJS)\advlib_animatecmn.obj &\r
-       $(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 &\r
+       $(OBJS)\advlib_calctrlcmn.obj &\r
+       $(OBJS)\advlib_datavcmn.obj &\r
+       $(OBJS)\advlib_gridcmn.obj &\r
+       $(OBJS)\advlib_hyperlnkcmn.obj &\r
+       $(OBJS)\advlib_odcombocmn.obj &\r
+       $(OBJS)\advlib_richtooltipcmn.obj &\r
+       $(OBJS)\advlib_aboutdlgg.obj &\r
+       $(OBJS)\advlib_bannerwindow.obj &\r
+       $(OBJS)\advlib_bmpcboxg.obj &\r
+       $(OBJS)\advlib_calctrlg.obj &\r
+       $(OBJS)\advlib_commandlinkbuttong.obj &\r
+       $(OBJS)\advlib_datavgen.obj &\r
         $(OBJS)\advlib_datectlg.obj &\r
         $(OBJS)\advlib_editlbox.obj &\r
         $(OBJS)\advlib_grid.obj &\r
         $(OBJS)\advlib_gridctrl.obj &\r
         $(OBJS)\advlib_grideditors.obj &\r
         $(OBJS)\advlib_gridsel.obj &\r
-       $(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 &\r
+       $(OBJS)\advlib_hyperlinkg.obj &\r
+       $(OBJS)\advlib_laywin.obj &\r
+       $(OBJS)\advlib_notifmsgg.obj &\r
+       $(OBJS)\advlib_odcombo.obj &\r
+       $(OBJS)\advlib_propdlg.obj &\r
+       $(OBJS)\advlib_richtooltipg.obj &\r
+       $(OBJS)\advlib_sashwin.obj &\r
+       $(OBJS)\advlib_splash.obj &\r
+       $(OBJS)\advlib_generic_timectrl.obj &\r
+       $(OBJS)\advlib_tipdlg.obj &\r
+       $(OBJS)\advlib_treelist.obj &\r
+       $(OBJS)\advlib_wizard.obj &\r
+       $(OBJS)\advlib_taskbarcmn.obj &\r
+       $(OBJS)\advlib_aboutdlg.obj &\r
+       $(OBJS)\advlib_notifmsg.obj &\r
+       $(OBJS)\advlib_richtooltip.obj &\r
+       $(OBJS)\advlib_sound.obj &\r
+       $(OBJS)\advlib_taskbar.obj &\r
+       $(OBJS)\advlib_joystick.obj &\r
+       $(OBJS)\advlib_animateg.obj &\r
+       $(OBJS)\advlib_bmpcbox.obj &\r
+       $(OBJS)\advlib_calctrl.obj &\r
+       $(OBJS)\advlib_commandlinkbutton.obj &\r
+       $(OBJS)\advlib_datecontrols.obj &\r
+       $(OBJS)\advlib_datectrl.obj &\r
+       $(OBJS)\advlib_datetimectrl.obj &\r
+       $(OBJS)\advlib_hyperlink.obj &\r
+       $(OBJS)\advlib_msw_timectrl.obj\r
+!endif\r
+!ifeq WXUNIV 1\r
+____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &\r
+       $(OBJS)\advlib_animatecmn.obj &\r
+       $(OBJS)\advlib_bmpcboxcmn.obj &\r
+       $(OBJS)\advlib_calctrlcmn.obj &\r
+       $(OBJS)\advlib_datavcmn.obj &\r
+       $(OBJS)\advlib_gridcmn.obj &\r
+       $(OBJS)\advlib_hyperlnkcmn.obj &\r
+       $(OBJS)\advlib_odcombocmn.obj &\r
+       $(OBJS)\advlib_richtooltipcmn.obj &\r
+       $(OBJS)\advlib_aboutdlgg.obj &\r
+       $(OBJS)\advlib_bannerwindow.obj &\r
+       $(OBJS)\advlib_bmpcboxg.obj &\r
+       $(OBJS)\advlib_calctrlg.obj &\r
+       $(OBJS)\advlib_commandlinkbuttong.obj &\r
+       $(OBJS)\advlib_datavgen.obj &\r
         $(OBJS)\advlib_datectlg.obj &\r
         $(OBJS)\advlib_editlbox.obj &\r
         $(OBJS)\advlib_grid.obj &\r
         $(OBJS)\advlib_gridctrl.obj &\r
         $(OBJS)\advlib_grideditors.obj &\r
         $(OBJS)\advlib_gridsel.obj &\r
-       $(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 &\r
+       $(OBJS)\advlib_hyperlinkg.obj &\r
+       $(OBJS)\advlib_laywin.obj &\r
+       $(OBJS)\advlib_notifmsgg.obj &\r
+       $(OBJS)\advlib_odcombo.obj &\r
+       $(OBJS)\advlib_propdlg.obj &\r
+       $(OBJS)\advlib_richtooltipg.obj &\r
+       $(OBJS)\advlib_sashwin.obj &\r
+       $(OBJS)\advlib_splash.obj &\r
+       $(OBJS)\advlib_generic_timectrl.obj &\r
+       $(OBJS)\advlib_tipdlg.obj &\r
+       $(OBJS)\advlib_treelist.obj &\r
+       $(OBJS)\advlib_wizard.obj &\r
+       $(OBJS)\advlib_taskbarcmn.obj &\r
+       $(OBJS)\advlib_aboutdlg.obj &\r
+       $(OBJS)\advlib_notifmsg.obj &\r
+       $(OBJS)\advlib_richtooltip.obj &\r
+       $(OBJS)\advlib_sound.obj &\r
+       $(OBJS)\advlib_taskbar.obj &\r
+       $(OBJS)\advlib_joystick.obj &\r
+       $(OBJS)\advlib_animateg.obj\r
+!endif\r
+____wxadv_namedll_DEP =\r
  !ifeq SHARED 1\r
  ____wxadv_namedll_DEP = $(__advdll___depname)\r
  !endif\r
@@ -3911,7 +3911,7 @@ MONODLL_OBJECTS =  &
         $(OBJS)\monodll_tarstrm.obj &\r
         $(OBJS)\monodll_textbuf.obj &\r
         $(OBJS)\monodll_textfile.obj &\r
-       $(OBJS)\monodll_time.obj &
+       $(OBJS)\monodll_time.obj &\r
         $(OBJS)\monodll_timercmn.obj &\r
         $(OBJS)\monodll_timerimpl.obj &\r
         $(OBJS)\monodll_tokenzr.obj &\r
@@ -4059,7 +4059,7 @@ MONOLIB_OBJECTS =  &
         $(OBJS)\monolib_tarstrm.obj &\r
         $(OBJS)\monolib_textbuf.obj &\r
         $(OBJS)\monolib_textfile.obj &\r
-       $(OBJS)\monolib_time.obj &
+       $(OBJS)\monolib_time.obj &\r
         $(OBJS)\monolib_timercmn.obj &\r
         $(OBJS)\monolib_timerimpl.obj &\r
         $(OBJS)\monolib_tokenzr.obj &\r
@@ -4205,7 +4205,7 @@ BASEDLL_OBJECTS =  &
         $(OBJS)\basedll_tarstrm.obj &\r
         $(OBJS)\basedll_textbuf.obj &\r
         $(OBJS)\basedll_textfile.obj &\r
-       $(OBJS)\basedll_time.obj &
+       $(OBJS)\basedll_time.obj &\r
         $(OBJS)\basedll_timercmn.obj &\r
         $(OBJS)\basedll_timerimpl.obj &\r
         $(OBJS)\basedll_tokenzr.obj &\r
@@ -4336,7 +4336,7 @@ BASELIB_OBJECTS =  &
         $(OBJS)\baselib_tarstrm.obj &\r
         $(OBJS)\baselib_textbuf.obj &\r
         $(OBJS)\baselib_textfile.obj &\r
-       $(OBJS)\baselib_time.obj &
+       $(OBJS)\baselib_time.obj &\r
         $(OBJS)\baselib_timercmn.obj &\r
         $(OBJS)\baselib_timerimpl.obj &\r
         $(OBJS)\baselib_tokenzr.obj &\r
@@ -4736,19 +4736,19 @@ XRCDLL_OBJECTS =  &
         $(OBJS)\xrcdll_xh_split.obj &\r
         $(OBJS)\xrcdll_xh_srchctrl.obj &\r
         $(OBJS)\xrcdll_xh_statbar.obj &\r
-       $(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 &\r
+       $(OBJS)\xrcdll_xh_stbox.obj &\r
+       $(OBJS)\xrcdll_xh_stlin.obj &\r
+       $(OBJS)\xrcdll_xh_sttxt.obj &\r
+       $(OBJS)\xrcdll_xh_text.obj &\r
+       $(OBJS)\xrcdll_xh_tglbtn.obj &\r
+       $(OBJS)\xrcdll_xh_timectrl.obj &\r
+       $(OBJS)\xrcdll_xh_toolb.obj &\r
+       $(OBJS)\xrcdll_xh_toolbk.obj &\r
+       $(OBJS)\xrcdll_xh_tree.obj &\r
+       $(OBJS)\xrcdll_xh_treebk.obj &\r
+       $(OBJS)\xrcdll_xh_unkwn.obj &\r
+       $(OBJS)\xrcdll_xh_wizrd.obj &\r
         $(OBJS)\xrcdll_xmlres.obj &\r
         $(OBJS)\xrcdll_xmladv.obj &\r
         $(OBJS)\xrcdll_xmlrsall.obj\r
@@ -4812,19 +4812,19 @@ XRCLIB_OBJECTS =  &
         $(OBJS)\xrclib_xh_split.obj &\r
         $(OBJS)\xrclib_xh_srchctrl.obj &\r
         $(OBJS)\xrclib_xh_statbar.obj &\r
-       $(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 &\r
+       $(OBJS)\xrclib_xh_stbox.obj &\r
+       $(OBJS)\xrclib_xh_stlin.obj &\r
+       $(OBJS)\xrclib_xh_sttxt.obj &\r
+       $(OBJS)\xrclib_xh_text.obj &\r
+       $(OBJS)\xrclib_xh_tglbtn.obj &\r
+       $(OBJS)\xrclib_xh_timectrl.obj &\r
+       $(OBJS)\xrclib_xh_toolb.obj &\r
+       $(OBJS)\xrclib_xh_toolbk.obj &\r
+       $(OBJS)\xrclib_xh_tree.obj &\r
+       $(OBJS)\xrclib_xh_treebk.obj &\r
+       $(OBJS)\xrclib_xh_unkwn.obj &\r
+       $(OBJS)\xrclib_xh_wizrd.obj &\r
         $(OBJS)\xrclib_xmlres.obj &\r
         $(OBJS)\xrclib_xmladv.obj &\r
         $(OBJS)\xrclib_xmlrsall.obj\r
@@ -6689,9 +6689,9 @@ $(OBJS)\monodll_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
  $(OBJS)\monodll_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
  $(OBJS)\monodll_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
  \r
@@ -7178,27 +7178,27 @@ $(OBJS)\monodll_calctrl.obj :  .AUTODEPEND ..\..\src\msw\calctrl.cpp
  $(OBJS)\monodll_commandlinkbutton.obj :  .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\monodll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\monodll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\monodll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\monodll_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\monodll_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\monodll_mediactrl_am.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
  $(OBJS)\monodll_mediactrl_wmp10.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
  \r
@@ -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\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\monodll_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\monodll_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\monodll_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\monodll_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
  $(OBJS)\monodll_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
  \r
@@ -7745,23 +7745,23 @@ $(OBJS)\monodll_imaglist.obj :  .AUTODEPEND ..\..\src\msw\imaglist.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
  !endif\r
  \r
-!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\r
+$(OBJS)\monodll_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
  !endif\r
  \r
@@ -8715,23 +8715,23 @@ $(OBJS)\monodll_hyperlnkcmn.obj :  .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
  !endif\r
  \r
-!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\r
+$(OBJS)\monodll_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
  !endif\r
  \r
@@ -8810,38 +8810,38 @@ $(OBJS)\monodll_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
  !endif\r
  \r
-!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\r
+$(OBJS)\monodll_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_richtooltipg.obj :  .AUTODEPEND ..\..\src\generic\richtooltipg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
  !endif\r
  \r
@@ -8860,23 +8860,23 @@ $(OBJS)\monodll_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
  !endif\r
  \r
-!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\r
+$(OBJS)\monodll_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
  !endif\r
  \r
@@ -9094,9 +9094,9 @@ $(OBJS)\monolib_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
  $(OBJS)\monolib_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
  $(OBJS)\monolib_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
  \r
@@ -9583,27 +9583,27 @@ $(OBJS)\monolib_calctrl.obj :  .AUTODEPEND ..\..\src\msw\calctrl.cpp
  $(OBJS)\monolib_commandlinkbutton.obj :  .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\monolib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\monolib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\monolib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\monolib_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\monolib_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\monolib_mediactrl_am.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
  $(OBJS)\monolib_mediactrl_wmp10.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
  \r
@@ -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\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\monolib_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\monolib_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\monolib_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\monolib_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
  $(OBJS)\monolib_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
  \r
@@ -10150,23 +10150,23 @@ $(OBJS)\monolib_imaglist.obj :  .AUTODEPEND ..\..\src\msw\imaglist.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
  !endif\r
  \r
-!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\r
+$(OBJS)\monolib_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
  !endif\r
  \r
@@ -11120,23 +11120,23 @@ $(OBJS)\monolib_hyperlnkcmn.obj :  .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
  !endif\r
  \r
-!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\r
+$(OBJS)\monolib_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
  !endif\r
  \r
@@ -11215,38 +11215,38 @@ $(OBJS)\monolib_odcombo.obj :  .AUTODEPEND ..\..\src\generic\odcombo.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
  !endif\r
  \r
-!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\r
+$(OBJS)\monolib_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_richtooltipg.obj :  .AUTODEPEND ..\..\src\generic\richtooltipg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
  !endif\r
  \r
@@ -11265,23 +11265,23 @@ $(OBJS)\monolib_aboutdlg.obj :  .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
  !endif\r
  \r
-!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\r
+$(OBJS)\monolib_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
  !endif\r
  \r
@@ -11499,9 +11499,9 @@ $(OBJS)\basedll_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
  $(OBJS)\basedll_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<\r
+\r
  $(OBJS)\basedll_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<\r
  \r
@@ -11838,9 +11838,9 @@ $(OBJS)\baselib_textbuf.obj :  .AUTODEPEND ..\..\src\common\textbuf.cpp
  $(OBJS)\baselib_textfile.obj :  .AUTODEPEND ..\..\src\common\textfile.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<\r
+\r
  $(OBJS)\baselib_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<\r
  \r
@@ -12528,23 +12528,23 @@ $(OBJS)\coredll_imaglist.obj :  .AUTODEPEND ..\..\src\msw\imaglist.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
  !endif\r
  \r
-!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\r
+$(OBJS)\coredll_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
  !endif\r
  \r
@@ -13936,23 +13936,23 @@ $(OBJS)\corelib_imaglist.obj :  .AUTODEPEND ..\..\src\msw\imaglist.cpp
         $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
  !endif\r
  \r
-!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\r
+$(OBJS)\corelib_minifram.obj :  .AUTODEPEND ..\..\src\msw\minifram.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_nonownedwnd.obj :  .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
  !endif\r
  \r
@@ -14891,27 +14891,27 @@ $(OBJS)\advdll_calctrl.obj :  .AUTODEPEND ..\..\src\msw\calctrl.cpp
  $(OBJS)\advdll_commandlinkbutton.obj :  .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_bmpcboxcmn.obj :  .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
  $(OBJS)\advdll_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
  \r
@@ -14921,21 +14921,21 @@ $(OBJS)\advdll_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
  $(OBJS)\advdll_gridcmn.obj :  .AUTODEPEND ..\..\src\common\gridcmn.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
  $(OBJS)\advdll_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
  \r
@@ -14978,51 +14978,51 @@ $(OBJS)\advdll_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
  $(OBJS)\advdll_notifmsgg.obj :  .AUTODEPEND ..\..\src\generic\notifmsgg.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_richtooltipg.obj :  .AUTODEPEND ..\..\src\generic\richtooltipg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
  $(OBJS)\advdll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
  \r
  $(OBJS)\advdll_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\advdll_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
+\r
  $(OBJS)\advdll_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
  \r
@@ -15041,27 +15041,27 @@ $(OBJS)\advlib_calctrl.obj :  .AUTODEPEND ..\..\src\msw\calctrl.cpp
  $(OBJS)\advlib_commandlinkbutton.obj :  .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_datectrl.obj :  .AUTODEPEND ..\..\src\msw\datectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_datetimectrl.obj :  .AUTODEPEND ..\..\src\msw\datetimectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_hyperlink.obj :  .AUTODEPEND ..\..\src\msw\hyperlink.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_msw_timectrl.obj :  .AUTODEPEND ..\..\src\msw\timectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_bmpcboxcmn.obj :  .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
  $(OBJS)\advlib_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
  \r
@@ -15071,21 +15071,21 @@ $(OBJS)\advlib_datavcmn.obj :  .AUTODEPEND ..\..\src\common\datavcmn.cpp
  $(OBJS)\advlib_gridcmn.obj :  .AUTODEPEND ..\..\src\common\gridcmn.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_odcombocmn.obj :  .AUTODEPEND ..\..\src\common\odcombocmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_richtooltipcmn.obj :  .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
  $(OBJS)\advlib_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
  \r
@@ -15128,51 +15128,51 @@ $(OBJS)\advlib_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
  $(OBJS)\advlib_notifmsgg.obj :  .AUTODEPEND ..\..\src\generic\notifmsgg.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_propdlg.obj :  .AUTODEPEND ..\..\src\generic\propdlg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_richtooltipg.obj :  .AUTODEPEND ..\..\src\generic\richtooltipg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_sashwin.obj :  .AUTODEPEND ..\..\src\generic\sashwin.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_splash.obj :  .AUTODEPEND ..\..\src\generic\splash.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_generic_timectrl.obj :  .AUTODEPEND ..\..\src\generic\timectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
  $(OBJS)\advlib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
  \r
  $(OBJS)\advlib_taskbarcmn.obj :  .AUTODEPEND ..\..\src\common\taskbarcmn.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_notifmsg.obj :  .AUTODEPEND ..\..\src\msw\notifmsg.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_richtooltip.obj :  .AUTODEPEND ..\..\src\msw\richtooltip.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\advlib_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
+\r
  $(OBJS)\advlib_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
  \r
@@ -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\r
         $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\xrcdll_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\xrcdll_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\xrcdll_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<\r
+\r
+$(OBJS)\xrcdll_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<\r
+\r
  $(OBJS)\xrcdll_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<\r
  \r
@@ -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\r
         $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<\r
  \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\xrclib_xh_tglbtn.obj :  .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\xrclib_xh_timectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\xrclib_xh_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<\r
+\r
+$(OBJS)\xrclib_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<\r
+\r
  $(OBJS)\xrclib_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp\r
         $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<\r
  \r
diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp

index 8c23b15b10dd1044f5a0624cd11f651cd8fdb463..3d3e3810ef8ad5c63ef88931f01262a5fc010e8e 100644 (file)
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -272,22 +272,22 @@ SOURCE=..\..\src\common\gridcmn.cpp
  \r
  SOURCE=..\..\src\common\hyperlnkcmn.cpp\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\src\common\odcombocmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\richtooltipcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\taskbarcmn.cpp\r
+# End Source File\r
+# End Group\r
+# Begin Group "MSW Sources"\r
+\r
+# PROP Default_Filter ""\r
  # Begin Source File\r
  \r
  SOURCE=..\..\src\msw\aboutdlg.cpp\r
@@ -463,53 +463,53 @@ SOURCE=..\..\src\msw\datectrl.cpp
  \r
  !ELSEIF  "$(CFG)" == "adv - Win32 Debug"\r
  \r
-
-!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
-
+\r
+!ENDIF\r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\datetimectrl.cpp\r
+\r
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"\r
+\r
+\r
+!ENDIF\r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\hyperlink.cpp\r
+\r
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
  !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
  \r
  # PROP Exclude_From_Build 1\r
@@ -541,65 +541,65 @@ SOURCE=..\..\src\msw\hyperlink.cpp
  \r
  SOURCE=..\..\src\msw\joystick.cpp\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\src\msw\notifmsg.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\richtooltip.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\sound.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\taskbar.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\timectrl.cpp\r
+\r
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Debug"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Release"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Release"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 Debug"\r
+\r
+\r
+!ENDIF\r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\version.rc\r
+\r
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
  \r
  \r
  !ELSEIF  "$(CFG)" == "adv - Win32 DLL Release"\r
@@ -703,34 +703,34 @@ SOURCE=..\..\src\generic\notifmsgg.cpp
  \r
  SOURCE=..\..\src\generic\odcombo.cpp\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\src\generic\propdlg.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\generic\richtooltipg.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\generic\sashwin.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\generic\splash.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\generic\timectrl.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\generic\tipdlg.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\generic\treelist.cpp\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\src\generic\wizard.cpp\r
@@ -897,22 +897,22 @@ SOURCE=..\..\include\wx\msw\calctrl.h
  \r
  SOURCE=..\..\include\wx\msw\commandlinkbutton.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\msw\datectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\datetimectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\genrcdefs.h\r
+\r
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
+\r
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h\r
+InputPath=..\..\include\wx\msw\genrcdefs.h\r
  \r
  "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"\r
         cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
@@ -1006,22 +1006,22 @@ SOURCE=..\..\include\wx\msw\notifmsg.h
  # End Source File\r
  # Begin Source File\r
  \r
-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\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\taskbar.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\timectrl.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "Generic Headers"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
  SOURCE=..\..\include\wx\generic\aboutdlgg.h\r
  # End Source File\r
  # Begin Source File\r
@@ -1092,22 +1092,22 @@ SOURCE=..\..\include\wx\generic\propdlg.h
  \r
  SOURCE=..\..\include\wx\generic\sashwin.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\generic\splash.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\generic\timectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\generic\wizard.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "Common Headers"\r
+\r
+# PROP Default_Filter ""\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\aboutdlg.h\r
@@ -1140,22 +1140,22 @@ SOURCE=..\..\include\wx\dataview.h
  \r
  SOURCE=..\..\include\wx\datectrl.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\dateevt.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\datetimectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\dcbuffer.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\dvrenderers.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\editlbox.h\r
@@ -1184,42 +1184,42 @@ SOURCE=..\..\include\wx\notifmsg.h
  \r
  SOURCE=..\..\include\wx\odcombo.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\propdlg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\richtooltip.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\sashwin.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\sound.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\splash.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\taskbar.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\timectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\tipdlg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\treelist.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\wizard.h\r
diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp

index c00ef57ce88f49555e88a8f5c5cc897b53b0d935..9a7b582b4e02c063c8f0feb62f69a5106aabfbbd 100644 (file)
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -531,10 +531,10 @@ SOURCE=..\..\src\common\textfile.cpp
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\src\common\time.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\src\common\time.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
  SOURCE=..\..\src\common\timercmn.cpp\r
  # End Source File\r
  # Begin Source File\r
@@ -1229,22 +1229,22 @@ SOURCE=..\..\include\wx\dynload.h
  \r
  SOURCE=..\..\include\wx\encconv.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\event.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\eventfilter.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\evtloop.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\except.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\features.h\r
@@ -1567,10 +1567,10 @@ SOURCE=..\..\include\wx\thread.h
  # End Source File\r
  # Begin Source File\r
  \r
-SOURCE=..\..\include\wx\time.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\time.h\r
+# End Source File\r
+# Begin Source File\r
+\r
  SOURCE=..\..\include\wx\timer.h\r
  # End Source File\r
  # Begin Source File\r
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp

index 7cd78d10d848e27003cb3ce6aacffa68ab43dd64..202ce086d9918008774d0f4ea4908854bb6a588f 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -2028,22 +2028,22 @@ SOURCE=..\..\src\msw\nativewin.cpp
  \r
  !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
  \r
-
-!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
-
+\r
+!ENDIF\r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\nonownedwnd.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\notebook.cpp\r
+\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
  !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
  \r
  # PROP Exclude_From_Build 1\r
@@ -5003,42 +5003,42 @@ SOURCE=..\..\include\wx\msw\control.h
  \r
  SOURCE=..\..\include\wx\msw\ctrlsub.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\msw\cursor.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\custombgwin.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\ole\dataform.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\ole\dataobj.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\msw\ole\dataobj2.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\msw\datectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\datetimectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\dc.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\dcclient.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\msw\dcmemory.h\r
@@ -5278,22 +5278,22 @@ SOURCE=..\..\include\wx\msw\missing.h
  \r
  SOURCE=..\..\include\wx\msw\msgdlg.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\msw\msvcrt.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\nonownedwnd.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\notebook.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\notifmsg.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\msw\ole\oleutils.h\r
@@ -5406,22 +5406,22 @@ SOURCE=..\..\include\wx\msw\textctrl.h
  \r
  SOURCE=..\..\include\wx\msw\textentry.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\msw\tglbtn.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\timectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\toolbar.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\tooltip.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\msw\toplevel.h\r
@@ -5444,14 +5444,14 @@ SOURCE=..\..\include\wx\msw\uxthemep.h
  # End Source File\r
  # Begin Source File\r
  \r
-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\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\msw\webviewhistoryitem_ie.h\r
+# End Source File\r
+# Begin Source File\r
+\r
  SOURCE=..\..\include\wx\msw\window.h\r
  # End Source File\r
  # End Group\r
@@ -5506,22 +5506,22 @@ SOURCE=..\..\include\wx\generic\colrdlgg.h
  \r
  SOURCE=..\..\include\wx\generic\combo.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\generic\ctrlsub.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\generic\custombgwin.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\generic\dataview.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\generic\datectrl.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\generic\dcpsg.h\r
@@ -5694,22 +5694,22 @@ SOURCE=..\..\include\wx\generic\stattextg.h
  \r
  SOURCE=..\..\include\wx\generic\statusbr.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\generic\textdlgg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\generic\timectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\generic\treectlg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\generic\wizard.h\r
+# End Source File\r
  # End Group\r
  # Begin Group "wxUniv Headers"\r
  \r
@@ -5754,22 +5754,22 @@ SOURCE=..\..\include\wx\univ\colschem.h
  \r
  SOURCE=..\..\include\wx\univ\combobox.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\univ\control.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\univ\custombgwin.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\univ\dialog.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\univ\frame.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\univ\gauge.h\r
@@ -6162,42 +6162,42 @@ SOURCE=..\..\include\wx\cshelp.h
  \r
  SOURCE=..\..\include\wx\ctrlsub.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\cursor.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\custombgwin.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\dataobj.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\dataview.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\datectrl.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\dateevt.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\datetimectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\dc.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\dcbuffer.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\dcclient.h\r
@@ -6798,22 +6798,22 @@ SOURCE=..\..\include\wx\richtext\richtextsymboldlg.h
  \r
  SOURCE=..\..\include\wx\richtext\richtextuicustomization.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\richtext\richtextxml.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\richtooltip.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\sashwin.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\scopeguard.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\scrolbar.h\r
@@ -6922,22 +6922,22 @@ SOURCE=..\..\include\wx\textentry.h
  \r
  SOURCE=..\..\include\wx\textwrapper.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\tglbtn.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\timectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\tipdlg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\tipwin.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\ribbon\toolbar.h\r
@@ -7020,14 +7020,14 @@ SOURCE=..\..\include\wx\vscroll.h
  # End Source File\r
  # Begin Source File\r
  \r
-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\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\webviewarchivehandler.h\r
+# End Source File\r
+# Begin Source File\r
+\r
  SOURCE=..\..\include\wx\persist\window.h\r
  # End Source File\r
  # Begin Source File\r
@@ -7278,22 +7278,22 @@ SOURCE=..\..\include\wx\xrc\xh_sttxt.h
  \r
  SOURCE=..\..\include\wx\xrc\xh_text.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\xrc\xh_tglbtn.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\xrc\xh_timectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\xrc\xh_toolb.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\xrc\xh_toolbk.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\xrc\xh_tree.h\r
diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj

index 0c8e869b8bde14dfea8179ad68244b5033cf4b50..d7ddcf3352c0b96a7180314a35b4fb5d065628e6 100644 (file)
--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -595,21 +595,21 @@
                                 RelativePath="..\..\src\common\gridcmn.cpp">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\odcombocmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\richtooltipcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\taskbarcmn.cpp">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="MSW Sources"\r
+                       UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">\r
                         <File\r
                                 RelativePath="..\..\src\msw\aboutdlg.cpp">\r
                         </File>\r
@@ -683,34 +683,88 @@
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
-                                       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"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\datetimectrl.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\hyperlink.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\joystick.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\notifmsg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\richtooltip.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\sound.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\taskbar.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\timectrl.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\adv\msw_timectrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\adv\msw_timectrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\adv\msw_timectrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\adv\msw_timectrl.obj"/>\r
+                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
@@ -719,114 +773,12 @@
                                         ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
-                               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\version.rc">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Universal Debug|Win32"\r
@@ -891,126 +843,78 @@
                                 RelativePath="..\..\src\generic\notifmsgg.cpp">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\propdlg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\richtooltipg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\sashwin.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\splash.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\timectrl.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\adv\generic_timectrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\adv\generic_timectrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\adv\generic_timectrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\adv\generic_timectrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\adv\generic_timectrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\adv\generic_timectrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\adv\generic_timectrl.obj"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\adv\generic_timectrl.obj"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\tipdlg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\treelist.cpp">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\src\generic\wizard.cpp">\r
                         </File>\r
                 </Filter>\r
@@ -1114,21 +1018,21 @@
                                 RelativePath="..\..\include\wx\msw\calctrl.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datectrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\genrcdefs.h">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
                                                 CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
                                                 Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
                                                 AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>\r
@@ -1206,21 +1110,21 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\notifmsg.h">\r
                         </File>\r
-                       <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\r
+                               RelativePath="..\..\include\wx\msw\sound.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\taskbar.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\timectrl.h">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Generic Headers"\r
+                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\aboutdlgg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\animate.h">\r
@@ -1271,21 +1175,21 @@
                                 RelativePath="..\..\include\wx\generic\propdlg.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\splash.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\timectrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\wizard.h">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Common Headers"\r
+                       UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">\r
                         <File\r
                                 RelativePath="..\..\include\wx\aboutdlg.h">\r
                         </File>\r
@@ -1308,21 +1212,21 @@
                                 RelativePath="..\..\include\wx\dataview.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dateevt.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datetimectrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dcbuffer.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dvrenderers.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\editlbox.h">\r
                         </File>\r
                         <File\r
@@ -1341,36 +1245,36 @@
                                 RelativePath="..\..\include\wx\notifmsg.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\propdlg.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtooltip.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\sashwin.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\sound.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\splash.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\taskbar.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\timectrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\tipdlg.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\treelist.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\wizard.h">\r
                         </File>\r
                 </Filter>\r
diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj

index d00673452a894400799a34bd8cd3a08025258a30..a65ea6d32a6e4045f89672e6ee81e218cb1f54aa 100644 (file)
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -838,9 +838,9 @@
                                 RelativePath="..\..\src\common\textfile.cpp">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\common\time.cpp">
-                       </File>
-                       <File
+                               RelativePath="..\..\src\common\time.cpp">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\src\common\timercmn.cpp">\r
                         </File>\r
                         <File\r
@@ -1345,21 +1345,21 @@
                                 RelativePath="..\..\include\wx\dynload.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\event.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\eventfilter.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\evtloop.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\except.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\features.h">\r
                         </File>\r
                         <File\r
@@ -1600,9 +1600,9 @@
                                 RelativePath="..\..\include\wx\thread.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\time.h">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\time.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\timer.h">\r
                         </File>\r
                         <File\r
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj

index 319379098d5d472757f46ff7d827db09266336b5..a8f792507c5143b54c0745194399ae7918680324 100644 (file)
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1889,21 +1889,21 @@
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Universal Debug|Win32"\r
-                                       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"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\nonownedwnd.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\notebook.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\core\msw_notebook.obj"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32">\r
@@ -4313,36 +4313,36 @@
                                 RelativePath="..\..\include\wx\msw\control.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\cursor.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\custombgwin.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\ole\dataform.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\ole\dataobj.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\ole\dataobj2.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datectrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\dc.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\dcclient.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\msw\dcmemory.h">\r
                         </File>\r
                         <File\r
@@ -4529,21 +4529,21 @@
                                 RelativePath="..\..\include\wx\msw\missing.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\msvcrt.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\nonownedwnd.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\notebook.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\notifmsg.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\msw\ole\oleutils.h">\r
                         </File>\r
                         <File\r
@@ -4625,21 +4625,21 @@
                                 RelativePath="..\..\include\wx\msw\textctrl.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\tglbtn.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\timectrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\toolbar.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\tooltip.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\msw\toplevel.h">\r
                         </File>\r
                         <File\r
@@ -4655,12 +4655,12 @@
                                 RelativePath="..\..\include\wx\msw\uxthemep.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\msw\window.h">\r
                         </File>\r
                 </Filter>\r
@@ -4701,21 +4701,21 @@
                                 RelativePath="..\..\include\wx\generic\colrdlgg.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\ctrlsub.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\custombgwin.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\dataview.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\datectrl.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\generic\dcpsg.h">\r
                         </File>\r
                         <File\r
@@ -4842,21 +4842,21 @@
                                 RelativePath="..\..\include\wx\generic\stattextg.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\textdlgg.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\timectrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\treectlg.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\wizard.h">\r
+                       </File>\r
+               </Filter>\r
                 <Filter\r
                         Name="wxUniv Headers"\r
                         UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}">\r
@@ -4888,21 +4888,21 @@
                                 RelativePath="..\..\include\wx\univ\colschem.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\control.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\custombgwin.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\dialog.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\frame.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\univ\gauge.h">\r
                         </File>\r
                         <File\r
@@ -5196,36 +5196,36 @@
                                 RelativePath="..\..\include\wx\cshelp.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\cursor.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\custombgwin.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dataobj.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dataview.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datectrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dateevt.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datetimectrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dc.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dcbuffer.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\dcclient.h">\r
                         </File>\r
                         <File\r
@@ -5673,21 +5673,21 @@
                                 RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextxml.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtooltip.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\sashwin.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\scopeguard.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\scrolbar.h">\r
                         </File>\r
                         <File\r
@@ -5766,21 +5766,21 @@
                                 RelativePath="..\..\include\wx\textentry.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\tglbtn.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\timectrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\tipdlg.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\tipwin.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\ribbon\toolbar.h">\r
                         </File>\r
                         <File\r
@@ -5841,12 +5841,12 @@
                                 RelativePath="..\..\include\wx\vscroll.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\webview.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\webviewarchivehandler.h">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\webview.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webviewarchivehandler.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\persist\window.h">\r
                         </File>\r
                         <File\r
@@ -6033,21 +6033,21 @@
                                 RelativePath="..\..\include\wx\xrc\xh_sttxt.h">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolb.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tree.h">\r
                         </File>\r
                         <File\r
diff --git a/build/msw/wx_vc7_xrc.vcproj b/build/msw/wx_vc7_xrc.vcproj

index 5fde1d7ac96f48d15fcb3be2a2a9e3d39d13d6e4..0ad7748cb9ac324792d2b3307ecd7fe177b63ed4 100644 (file)
--- 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">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolb.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tree.h">\r
                         </File>\r
                         <File\r
@@ -1128,21 +1128,21 @@
                                 RelativePath="..\..\src\xrc\xh_sttxt.cpp">\r
                         </File>\r
                         <File\r
-                               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">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_tglbtn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_timectrl.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_toolb.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_toolbk.cpp">\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\src\xrc\xh_tree.cpp">\r
                         </File>\r
                         <File\r
diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj

index ffc90f0d82c1fcd5aabff6889e078063594fb1f4..ae08fda5771b4f31f25e9a86e648da1206442461 100644 (file)
--- a/build/msw/wx_vc8_adv.vcproj
+++ b/build/msw/wx_vc8_adv.vcproj
@@ -829,22 +829,22 @@
                         <File\r
                                 RelativePath="..\..\src\common\hyperlnkcmn.cpp"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\src\common\odcombocmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\richtooltipcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\taskbarcmn.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="MSW Sources"\r
                         UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"\r
                         >\r
                         <File\r
@@ -946,38 +946,38 @@
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
-                               <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\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\datetimectrl.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\hyperlink.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
@@ -994,146 +994,82 @@
                         <File\r
                                 RelativePath="..\..\src\msw\joystick.cpp"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\notifmsg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\richtooltip.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\sound.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\taskbar.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\timectrl.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\adv\msw_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\adv\msw_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\adv\msw_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\adv\msw_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\version.rc"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
@@ -1223,162 +1159,98 @@
                         <File\r
                                 RelativePath="..\..\src\generic\odcombo.cpp"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\propdlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\richtooltipg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\sashwin.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\splash.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\timectrl.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\tipdlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\treelist.cpp"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\wizard.cpp"\r
@@ -1517,22 +1389,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\commandlinkbutton.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                                 Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
                                                 CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
@@ -1632,22 +1504,22 @@
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\sound.h"\r
-                               >
-                       </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
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\taskbar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\timectrl.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Generic Headers"\r
+                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"\r
+                       >\r
+                       <File\r
                                 RelativePath="..\..\include\wx\generic\aboutdlgg.h"\r
                                 >\r
                         </File>\r
@@ -1718,22 +1590,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\generic\sashwin.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\splash.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\wizard.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Common Headers"\r
                         UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"\r
                         >\r
                         <File\r
@@ -1767,22 +1639,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\datectrl.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dateevt.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datetimectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dcbuffer.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dvrenderers.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\editlbox.h"\r
@@ -1811,42 +1683,42 @@
                         <File\r
                                 RelativePath="..\..\include\wx\odcombo.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\propdlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtooltip.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\sashwin.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\sound.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\splash.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\taskbar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\tipdlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\treelist.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\wizard.h"\r
diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj

index 1e83f9b5ab4003f31072e1439b28fb2090ab19f2..268ba0971c6d1ee2fb7cec3cc01d6424d08b0d7c 100644 (file)
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -1151,10 +1151,10 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\common\time.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\src\common\time.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\src\common\timercmn.cpp"\r
                                 >\r
                         </File>\r
@@ -1816,22 +1816,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\encconv.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\event.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\eventfilter.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\evtloop.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\except.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\features.h"\r
@@ -2154,10 +2154,10 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\time.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\time.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\timer.h"\r
                                 >\r
                         </File>\r
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj

index a653721643dd1cd921705e0c974f64d7257380c8..bd23086eef0da944725574b9c08d3a5ae49e92e5 100644 (file)
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -2554,22 +2554,22 @@
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
-                               <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\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\nonownedwnd.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\notebook.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 ObjectFile="vc_mswud\core\msw_notebook.obj"\r
                                         />\r
@@ -5782,42 +5782,42 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ctrlsub.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\cursor.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\custombgwin.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\ole\dataform.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\ole\dataobj.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\dataobj2.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\dc.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\dcclient.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\dcmemory.h"\r
@@ -6062,22 +6062,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\msgdlg.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\msvcrt.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\nonownedwnd.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\notebook.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\notifmsg.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\oleutils.h"\r
@@ -6190,22 +6190,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\textentry.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\tglbtn.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\toolbar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\tooltip.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\toplevel.h"\r
@@ -6228,14 +6228,14 @@
                                 >\r
                         </File>\r
                         <File\r
-                               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"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\msw\window.h"\r
                                 >\r
                         </File>\r
@@ -6291,22 +6291,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\generic\combo.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\ctrlsub.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\custombgwin.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\dataview.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\datectrl.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\dcpsg.h"\r
@@ -6479,22 +6479,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\generic\statusbr.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\textdlgg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\treectlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\wizard.h"\r
+                               >\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
@@ -6540,22 +6540,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\univ\combobox.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\control.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\custombgwin.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\dialog.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\frame.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\gauge.h"\r
@@ -6950,42 +6950,42 @@
                         <File\r
                                 RelativePath="..\..\include\wx\ctrlsub.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\cursor.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\custombgwin.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dataobj.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dataview.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\datectrl.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dateevt.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datetimectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dc.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dcbuffer.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dcclient.h"\r
@@ -7586,22 +7586,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextuicustomization.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextxml.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtooltip.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\sashwin.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\scopeguard.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\scrolbar.h"\r
@@ -7710,22 +7710,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\textwrapper.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\tglbtn.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\tipdlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\tipwin.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\ribbon\toolbar.h"\r
@@ -7808,14 +7808,14 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\webview.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\webviewarchivehandler.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\webview.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webviewarchivehandler.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\persist\window.h"\r
                                 >\r
                         </File>\r
@@ -8066,22 +8066,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_text.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tree.h"\r
diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj

index 82ee966b34cc5005fe4451a40267ff433f77ee6a..196f1482fa2af9f32362c45b07c8f6e5f104946e 100644 (file)
--- a/build/msw/wx_vc8_xrc.vcproj
+++ b/build/msw/wx_vc8_xrc.vcproj
@@ -1269,22 +1269,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_text.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tree.h"\r
@@ -1527,22 +1527,22 @@
                         <File\r
                                 RelativePath="..\..\src\xrc\xh_text.cpp"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_tglbtn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_timectrl.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_toolb.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_toolbk.cpp"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\xrc\xh_tree.cpp"\r
diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj

index 24233502bcb705d976e7784ee3a3c3a52c05ce17..79edd375e967a955ef243dd6a967670a89fdae6b 100644 (file)
--- a/build/msw/wx_vc9_adv.vcproj
+++ b/build/msw/wx_vc9_adv.vcproj
@@ -825,22 +825,22 @@
                         <File\r
                                 RelativePath="..\..\src\common\hyperlnkcmn.cpp"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\src\common\odcombocmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\richtooltipcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\taskbarcmn.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="MSW Sources"\r
                         UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"\r
                         >\r
                         <File\r
@@ -942,38 +942,38 @@
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
-                               <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\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\datetimectrl.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\hyperlink.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
                                 <FileConfiguration\r
                                         Name="Universal Release|Win32"\r
                                         ExcludedFromBuild="true"\r
@@ -990,146 +990,82 @@
                         <File\r
                                 RelativePath="..\..\src\msw\joystick.cpp"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\notifmsg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\richtooltip.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\sound.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\taskbar.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\timectrl.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\adv\msw_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\adv\msw_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\adv\msw_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\adv\msw_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\version.rc"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
@@ -1219,162 +1155,98 @@
                         <File\r
                                 RelativePath="..\..\src\generic\odcombo.cpp"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\propdlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\richtooltipg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\sashwin.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\splash.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\timectrl.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswud\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswu\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivud\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivu\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswuddll\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswudll\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivuddll\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               ObjectFile="vc_mswunivudll\adv\generic_timectrl.obj"\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\tipdlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\treelist.cpp"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\wizard.cpp"\r
@@ -1513,22 +1385,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\commandlinkbutton.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                                 Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
                                                 CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
@@ -1628,22 +1500,22 @@
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\sound.h"\r
-                               >
-                       </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
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\taskbar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\timectrl.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Generic Headers"\r
+                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"\r
+                       >\r
+                       <File\r
                                 RelativePath="..\..\include\wx\generic\aboutdlgg.h"\r
                                 >\r
                         </File>\r
@@ -1714,22 +1586,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\generic\sashwin.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\splash.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\wizard.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Common Headers"\r
                         UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"\r
                         >\r
                         <File\r
@@ -1763,22 +1635,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\datectrl.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dateevt.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datetimectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dcbuffer.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dvrenderers.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\editlbox.h"\r
@@ -1807,42 +1679,42 @@
                         <File\r
                                 RelativePath="..\..\include\wx\odcombo.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\propdlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtooltip.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\sashwin.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\sound.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\splash.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\taskbar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\tipdlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\treelist.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\wizard.h"\r
diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj

index 24847c9d03905c182a9b65c4a997fb731262a539..078db70378230ecdbf7ebc6aabcf4266bf86eca8 100644 (file)
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -1147,10 +1147,10 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\common\time.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\src\common\time.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\src\common\timercmn.cpp"\r
                                 >\r
                         </File>\r
@@ -1812,22 +1812,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\encconv.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\event.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\eventfilter.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\evtloop.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\except.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\features.h"\r
@@ -2150,10 +2150,10 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\time.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\time.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\timer.h"\r
                                 >\r
                         </File>\r
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj

index 262997a05bcff7561f38e060088d570e9593806e..860a305e056097ff0a50660280046edd87840d72 100644 (file)
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -2550,22 +2550,22 @@
                                         Name="DLL Universal Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
-                               <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\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\nonownedwnd.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\notebook.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 ObjectFile="vc_mswud\core\msw_notebook.obj"\r
                                         />\r
@@ -5778,42 +5778,42 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ctrlsub.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\cursor.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\custombgwin.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\ole\dataform.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\ole\dataobj.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\dataobj2.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\dc.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\dcclient.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\dcmemory.h"\r
@@ -6058,22 +6058,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\msgdlg.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\msvcrt.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\nonownedwnd.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\notebook.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\notifmsg.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\oleutils.h"\r
@@ -6186,22 +6186,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\textentry.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\tglbtn.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\toolbar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\tooltip.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\toplevel.h"\r
@@ -6224,14 +6224,14 @@
                                 >\r
                         </File>\r
                         <File\r
-                               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"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\msw\window.h"\r
                                 >\r
                         </File>\r
@@ -6287,22 +6287,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\generic\combo.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\ctrlsub.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\custombgwin.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\dataview.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\datectrl.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\dcpsg.h"\r
@@ -6475,22 +6475,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\generic\statusbr.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\textdlgg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\treectlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\wizard.h"\r
+                               >\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
@@ -6536,22 +6536,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\univ\combobox.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\control.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\custombgwin.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\dialog.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\frame.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\gauge.h"\r
@@ -6946,42 +6946,42 @@
                         <File\r
                                 RelativePath="..\..\include\wx\ctrlsub.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\cursor.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\custombgwin.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dataobj.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dataview.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\datectrl.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dateevt.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datetimectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dc.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dcbuffer.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dcclient.h"\r
@@ -7582,22 +7582,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextuicustomization.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextxml.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtooltip.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\sashwin.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\scopeguard.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\scrolbar.h"\r
@@ -7706,22 +7706,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\textwrapper.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\tglbtn.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\tipdlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\tipwin.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\ribbon\toolbar.h"\r
@@ -7804,14 +7804,14 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\webview.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\webviewarchivehandler.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\webview.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webviewarchivehandler.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\persist\window.h"\r
                                 >\r
                         </File>\r
@@ -8062,22 +8062,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_text.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tree.h"\r
diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj

index 4a464e4dbb788ed7d0b9b50ff6f86bd1920e497b..3f2bd2847ac2b27e6382ee54713001e13de27486 100644 (file)
--- a/build/msw/wx_vc9_xrc.vcproj
+++ b/build/msw/wx_vc9_xrc.vcproj
@@ -1265,22 +1265,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_text.h"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tree.h"\r
@@ -1523,22 +1523,22 @@
                         <File\r
                                 RelativePath="..\..\src\xrc\xh_text.cpp"\r
                                 >\r
-                       </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>\r
+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_tglbtn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_timectrl.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_toolb.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_toolbk.cpp"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\xrc\xh_tree.cpp"\r
diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp

index 26dead016ff2b1f53e8e4fbe72042aa5aaf4ae0b..a0c0fcbb00377a744c958a37fecd50bf3807836a 100644 (file)
--- a/build/msw/wx_xrc.dsp
+++ b/build/msw/wx_xrc.dsp
@@ -748,22 +748,22 @@ SOURCE=..\..\include\wx\xrc\xh_sttxt.h
  \r
  SOURCE=..\..\include\wx\xrc\xh_text.h\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\include\wx\xrc\xh_tglbtn.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\xrc\xh_timectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\xrc\xh_toolb.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\xrc\xh_toolbk.h\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\include\wx\xrc\xh_tree.h\r
@@ -1004,22 +1004,22 @@ SOURCE=..\..\src\xrc\xh_sttxt.cpp
  \r
  SOURCE=..\..\src\xrc\xh_text.cpp\r
  # End Source File\r
-# 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\r
+\r
+SOURCE=..\..\src\xrc\xh_tglbtn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\xrc\xh_timectrl.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\xrc\xh_toolb.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\xrc\xh_toolbk.cpp\r
+# End Source File\r
  # Begin Source File\r
  \r
  SOURCE=..\..\src\xrc\xh_tree.cpp\r
diff --git a/src/generic/richtooltip.cpp b/src/generic/richtooltip.cpp

deleted file mode 100644 (file)

index 7cb677a..0000000
--- a/src/generic/richtooltip.cpp
+++ /dev/null
@@ -1,673 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/generic/richtooltip.cpp
-// Purpose:     Implementation of wxRichToolTip.
-// Author:      Vadim Zeitlin
-// Created:     2011-10-07
-// RCS-ID:      $Id: wxhead.cpp,v 1.11 2010-04-22 12:44:51 zeitlin Exp $
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_RICHTOOLTIP
-
-#ifndef WX_PRECOMP
-    #include "wx/dcmemory.h"
-    #include "wx/icon.h"
-    #include "wx/region.h"
-    #include "wx/settings.h"
-    #include "wx/sizer.h"
-    #include "wx/statbmp.h"
-    #include "wx/stattext.h"
-    #include "wx/timer.h"
-    #include "wx/utils.h"
-#endif // WX_PRECOMP
-
-#include "wx/private/richtooltip.h"
-#include "wx/generic/private/richtooltip.h"
-
-#include "wx/artprov.h"
-#include "wx/custombgwin.h"
-#include "wx/display.h"
-#include "wx/graphics.h"
-#include "wx/popupwin.h"
-#include "wx/textwrapper.h"
-
-#ifdef __WXMSW__
-    #include "wx/msw/uxtheme.h"
-
-    static const int TTP_BALLOONTITLE = 4;
-
-    static const int TMT_TEXTCOLOR = 3803;
-    static const int TMT_GRADIENTCOLOR1 = 3810;
-    static const int TMT_GRADIENTCOLOR2 = 3811;
-#endif
-
-// ----------------------------------------------------------------------------
-// wxRichToolTipPopup: the popup window used by wxRichToolTip.
-// ----------------------------------------------------------------------------
-
-class wxRichToolTipPopup :
-    public wxCustomBackgroundWindow<wxPopupTransientWindow>
-{
-public:
-    wxRichToolTipPopup(wxWindow* parent,
-                       const wxString& title,
-                       const wxString& message,
-                       const wxIcon& icon,
-                       wxTipKind tipKind,
-                       const wxFont& titleFont_) :
-        m_timer(this)
-    {
-        Create(parent, wxFRAME_SHAPED);
-
-
-        wxBoxSizer* const sizerTitle = new wxBoxSizer(wxHORIZONTAL);
-        if ( icon.IsOk() )
-        {
-            sizerTitle->Add(new wxStaticBitmap(this, wxID_ANY, icon),
-                            wxSizerFlags().Centre().Border(wxRIGHT));
-        }
-        //else: Simply don't show any icon.
-
-        wxStaticText* const labelTitle = new wxStaticText(this, wxID_ANY, "");
-        labelTitle->SetLabelText(title);
-
-        wxFont titleFont(titleFont_);
-        if ( !titleFont.IsOk() )
-        {
-            // Determine the appropriate title font for the current platform.
-            titleFont = labelTitle->GetFont();
-
-#ifdef __WXMSW__
-            // When using themes MSW tooltips use larger bluish version of the
-            // normal font.
-            wxUxThemeEngine* const theme = GetTooltipTheme();
-            if ( theme )
-            {
-                titleFont.MakeLarger();
-
-                COLORREF c;
-                if ( FAILED(theme->GetThemeColor
-                                   (
-                                        wxUxThemeHandle(parent, L"TOOLTIP"),
-                                        TTP_BALLOONTITLE,
-                                        0,
-                                        TMT_TEXTCOLOR,
-                                        &c
-                                    )) )
-                {
-                    // Use the standard value of this colour as fallback.
-                    c = 0x993300;
-                }
-
-                labelTitle->SetForegroundColour(wxRGBToColour(c));
-            }
-            else
-#endif // __WXMSW__
-            {
-                // Everything else, including "classic" MSW look uses just the
-                // bold version of the base font.
-                titleFont.MakeBold();
-            }
-        }
-
-        labelTitle->SetFont(titleFont);
-        sizerTitle->Add(labelTitle, wxSizerFlags().Centre());
-
-        wxBoxSizer* const sizerTop = new wxBoxSizer(wxVERTICAL);
-        sizerTop->Add(sizerTitle,
-                        wxSizerFlags().DoubleBorder(wxLEFT|wxRIGHT|wxTOP));
-
-        // Use a spacer as we don't want to have a double border between the
-        // elements, just a simple one will do.
-        sizerTop->AddSpacer(wxSizerFlags::GetDefaultBorder());
-
-        wxTextSizerWrapper wrapper(this);
-        wxSizer* sizerText = wrapper.CreateSizer(message, -1 /* No wrapping */);
-
-#ifdef __WXMSW__
-        if ( icon.IsOk() && GetTooltipTheme() )
-        {
-            // Themed tooltips under MSW align the text with the title, not
-            // with the icon, so use a helper horizontal sizer in this case.
-            wxBoxSizer* const sizerTextIndent = new wxBoxSizer(wxHORIZONTAL);
-            sizerTextIndent->AddSpacer(icon.GetWidth());
-            sizerTextIndent->Add(sizerText,
-                                    wxSizerFlags().Border(wxLEFT).Centre());
-
-            sizerText = sizerTextIndent;
-        }
-#endif // !__WXMSW__
-        sizerTop->Add(sizerText,
-                        wxSizerFlags().DoubleBorder(wxLEFT|wxRIGHT|wxBOTTOM)
-                                      .Centre());
-
-        SetSizer(sizerTop);
-
-        const int offsetY = SetTipShapeAndSize(tipKind, GetBestSize());
-        if ( offsetY > 0 )
-        {
-            // Offset our contents by the tip height to make it appear in the
-            // main rectangle.
-            sizerTop->PrependSpacer(offsetY);
-        }
-
-        Layout();
-    }
-
-    void SetBackground(wxColour colStart, wxColour colEnd)
-    {
-        if ( !colStart.IsOk() )
-        {
-            // Determine the best colour(s) to use on our own.
-#ifdef __WXMSW__
-            wxUxThemeEngine* const theme = GetTooltipTheme();
-            if ( theme )
-            {
-                wxUxThemeHandle hTheme(GetParent(), L"TOOLTIP");
-
-                COLORREF c1, c2;
-                if ( FAILED(theme->GetThemeColor
-                                   (
-                                        hTheme,
-                                        TTP_BALLOONTITLE,
-                                        0,
-                                        TMT_GRADIENTCOLOR1,
-                                        &c1
-                                    )) ||
-                    FAILED(theme->GetThemeColor
-                                  (
-                                        hTheme,
-                                        TTP_BALLOONTITLE,
-                                        0,
-                                        TMT_GRADIENTCOLOR2,
-                                        &c2
-                                  )) )
-                {
-                    c1 = 0xffffff;
-                    c2 = 0xf0e5e4;
-                }
-
-                colStart = wxRGBToColour(c1);
-                colEnd = wxRGBToColour(c2);
-            }
-            else
-#endif // __WXMSW__
-            {
-                colStart = wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK);
-            }
-        }
-
-        if ( colEnd.IsOk() )
-        {
-            // Use gradient-filled background bitmap.
-            const wxSize size = GetClientSize();
-            wxBitmap bmp(size);
-            {
-                wxMemoryDC dc(bmp);
-                dc.Clear();
-                dc.GradientFillLinear(size, colStart, colEnd, wxDOWN);
-            }
-
-            SetBackgroundBitmap(bmp);
-        }
-        else // Use solid colour.
-        {
-            SetBackgroundColour(colStart);
-        }
-    }
-
-    void DoShow()
-    {
-        wxPoint pos = GetTipPoint();
-
-        // We want our anchor point to coincide with this position so offset
-        // the position of the top left corner passed to Move() accordingly.
-        pos -= m_anchorPos;
-
-        Move(pos, wxSIZE_NO_ADJUSTMENTS);
-
-        Popup();
-    }
-
-    void SetTimeout(unsigned timeout)
-    {
-        if ( !timeout )
-            return;
-
-        Connect(wxEVT_TIMER, wxTimerEventHandler(wxRichToolTipPopup::OnTimer));
-
-        m_timer.Start(timeout, true /* one shot */);
-    }
-
-protected:
-    virtual void OnDismiss()
-    {
-        Destroy();
-    }
-
-private:
-#ifdef __WXMSW__
-    // Returns non-NULL theme only if we're using Win7-style tooltips.
-    static wxUxThemeEngine* GetTooltipTheme()
-    {
-        // Even themed applications under XP still use "classic" tooltips.
-        if ( wxGetWinVersion() <= wxWinVersion_XP )
-            return NULL;
-
-        return wxUxThemeEngine::GetIfActive();
-    }
-#endif // __WXMSW__
-
-    // For now we just hard code the tip height, would be nice to do something
-    // smarter in the future.
-    static int GetTipHeight()
-    {
-#ifdef __WXMSW__
-        if ( GetTooltipTheme() )
-            return 20;
-#endif // __WXMSW__
-
-        return 15;
-    }
-
-    // Get the point to which our tip should point.
-    wxPoint GetTipPoint() const
-    {
-        // Currently we always use the middle of the window. It seems that MSW
-        // native tooltips use a different point but it's not really clear how
-        // do they determine it nor whether it's worth the trouble to emulate
-        // their behaviour.
-        const wxRect r = GetParent()->GetScreenRect();
-        return wxPoint(r.x + r.width/2, r.y + r.height/2);
-    }
-
-    // Choose the correct orientation depending on the window position.
-    //
-    // Also use the tip kind appropriate for the current environment. For MSW
-    // the right triangles are used and for Mac the equilateral ones as this is
-    // the prevailing kind under these systems. For everything else we go with
-    // right triangles as well but without any real rationale so this could be
-    // tweaked in the future.
-    wxTipKind GetBestTipKind() const
-    {
-        const wxPoint pos = GetTipPoint();
-
-        // Use GetFromWindow() and not GetFromPoint() here to try to get the
-        // correct display even if the tip point itself is not visible.
-        int dpy = wxDisplay::GetFromWindow(GetParent());
-        if ( dpy == wxNOT_FOUND )
-            dpy = 0; // What else can we do?
-
-        const wxRect rectDpy = wxDisplay(dpy).GetClientArea();
-
-#ifdef __WXMAC__
-        return pos.y > rectDpy.height/2 ? wxTipKind_Bottom : wxTipKind_Top;
-#else // !__WXMAC__
-        return pos.y > rectDpy.height/2
-                    ? pos.x > rectDpy.width/2
-                        ? wxTipKind_BottomRight
-                        : wxTipKind_BottomLeft
-                    : pos.x > rectDpy.width/2
-                        ? wxTipKind_TopRight
-                        : wxTipKind_TopLeft;
-#endif // __WXMAC__/!__WXMAC__
-    }
-
-    // Set the size and shape of the tip window and returns the offset of its
-    // content area from the top (horizontal offset is always 0 currently).
-    int SetTipShapeAndSize(wxTipKind tipKind, const wxSize& contentSize)
-    {
-#if wxUSE_GRAPHICS_CONTEXT
-        wxSize size = contentSize;
-
-        // The size is the vertical size and the offset is the distance from
-        // edge for asymmetric tips, currently hard-coded to be the same as the
-        // size.
-        const int tipSize = GetTipHeight();
-        const int tipOffset = tipSize;
-
-        // The horizontal position of the tip.
-        int x = -1;
-
-        // The vertical coordinates of the tip base and apex.
-        int yBase = -1,
-            yApex = -1;
-
-        // The offset of the content part of the window.
-        int dy = -1;
-
-        // Define symbolic names for the rectangle corners and mid-way points
-        // that we use below in an attempt to make the code more clear. Notice
-        // that these values must be consecutive as we iterate over them.
-        enum RectPoint
-        {
-            RectPoint_TopLeft,
-            RectPoint_Top,
-            RectPoint_TopRight,
-            RectPoint_Right,
-            RectPoint_BotRight,
-            RectPoint_Bot,
-            RectPoint_BotLeft,
-            RectPoint_Left,
-            RectPoint_Max
-        };
-
-        // The starting point for AddArcToPoint() calls below, we iterate over
-        // all RectPoints from it.
-        RectPoint pointStart = RectPoint_Max;
-
-
-        // Hard-coded radius of the round main rectangle corners.
-        const double RADIUS = 5;
-
-        // Create a path defining the shape of the tooltip window.
-        wxGraphicsPath
-            path = wxGraphicsRenderer::GetDefaultRenderer()->CreatePath();
-
-        if ( tipKind == wxTipKind_Auto )
-            tipKind = GetBestTipKind();
-
-        // Points defining the tip shape (in clockwise order as we must end at
-        // tipPoints[0] after drawing the rectangle outline in this order).
-        wxPoint2DDouble tipPoints[3];
-
-        switch ( tipKind )
-        {
-            case wxTipKind_Auto:
-                wxFAIL_MSG( "Impossible kind value" );
-                break;
-
-            case wxTipKind_TopLeft:
-                x = tipOffset;
-                yApex = 0;
-                yBase = tipSize;
-                dy = tipSize;
-
-                tipPoints[0] = wxPoint2DDouble(x, yBase);
-                tipPoints[1] = wxPoint2DDouble(x, yApex);
-                tipPoints[2] = wxPoint2DDouble(x + tipSize, yBase);
-
-                pointStart = RectPoint_TopRight;
-                break;
-
-            case wxTipKind_TopRight:
-                x = size.x - tipOffset;
-                yApex = 0;
-                yBase = tipSize;
-                dy = tipSize;
-
-                tipPoints[0] = wxPoint2DDouble(x - tipSize, yBase);
-                tipPoints[1] = wxPoint2DDouble(x, yApex);
-                tipPoints[2] = wxPoint2DDouble(x, yBase);
-
-                pointStart = RectPoint_TopRight;
-                break;
-
-            case wxTipKind_BottomLeft:
-                x = tipOffset;
-                yApex = size.y + tipSize;
-                yBase = size.y;
-                dy = 0;
-
-                tipPoints[0] = wxPoint2DDouble(x + tipSize, yBase);
-                tipPoints[1] = wxPoint2DDouble(x, yApex);
-                tipPoints[2] = wxPoint2DDouble(x, yBase);
-
-                pointStart = RectPoint_BotLeft;
-                break;
-
-            case wxTipKind_BottomRight:
-                x = size.x - tipOffset;
-                yApex = size.y + tipSize;
-                yBase = size.y;
-                dy = 0;
-
-                tipPoints[0] = wxPoint2DDouble(x, yBase);
-                tipPoints[1] = wxPoint2DDouble(x, yApex);
-                tipPoints[2] = wxPoint2DDouble(x - tipSize, yBase);
-
-                pointStart = RectPoint_BotLeft;
-                break;
-
-            case wxTipKind_Top:
-                x = size.x/2;
-                yApex = 0;
-                yBase = tipSize;
-                dy = tipSize;
-
-                {
-                    // A half-side of an equilateral triangle is its altitude
-                    // divided by sqrt(3) ~= 1.73.
-                    const double halfside = tipSize/1.73;
-
-                    tipPoints[0] = wxPoint2DDouble(x - halfside, yBase);
-                    tipPoints[1] = wxPoint2DDouble(x, yApex);
-                    tipPoints[2] = wxPoint2DDouble(x + halfside, yBase);
-                }
-
-                pointStart = RectPoint_TopRight;
-                break;
-
-            case wxTipKind_Bottom:
-                x = size.x/2;
-                yApex = size.y + tipSize;
-                yBase = size.y;
-                dy = 0;
-
-                {
-                    const double halfside = tipSize/1.73;
-
-                    tipPoints[0] = wxPoint2DDouble(x + halfside, yBase);
-                    tipPoints[1] = wxPoint2DDouble(x, yApex);
-                    tipPoints[2] = wxPoint2DDouble(x - halfside, yBase);
-                }
-
-                pointStart = RectPoint_BotLeft;
-                break;
-
-            case wxTipKind_None:
-                x = size.x/2;
-                dy = 0;
-
-                path.AddRoundedRectangle(0, 0, size.x, size.y, RADIUS);
-                break;
-        }
-
-        wxASSERT_MSG( dy != -1, wxS("Unknown tip kind?") );
-
-        size.y += tipSize;
-        SetSize(size);
-
-        if ( tipKind != wxTipKind_None )
-        {
-            path.MoveToPoint(tipPoints[0]);
-            path.AddLineToPoint(tipPoints[1]);
-            path.AddLineToPoint(tipPoints[2]);
-
-            const double xLeft = 0.;
-            const double xMid = size.x/2.;
-            const double xRight = size.x;
-
-            const double yTop = dy;
-            const double yMid = (dy + size.y)/2.;
-            const double yBot = dy + contentSize.y;
-
-            wxPoint2DDouble rectPoints[RectPoint_Max];
-            rectPoints[RectPoint_TopLeft]  = wxPoint2DDouble(xLeft,  yTop);
-            rectPoints[RectPoint_Top]      = wxPoint2DDouble(xMid,   yTop);
-            rectPoints[RectPoint_TopRight] = wxPoint2DDouble(xRight, yTop);
-            rectPoints[RectPoint_Right]    = wxPoint2DDouble(xRight, yMid);
-            rectPoints[RectPoint_BotRight] = wxPoint2DDouble(xRight, yBot);
-            rectPoints[RectPoint_Bot]      = wxPoint2DDouble(xMid,   yBot);
-            rectPoints[RectPoint_BotLeft]  = wxPoint2DDouble(xLeft,  yBot);
-            rectPoints[RectPoint_Left]     = wxPoint2DDouble(xLeft,  yMid);
-
-            // Iterate over all rectangle rectPoints for the first 3 corners.
-            unsigned n = pointStart;
-            for ( unsigned corner = 0; corner < 3; corner++ )
-            {
-                const wxPoint2DDouble& pt1 = rectPoints[n];
-
-                n = (n + 1) % RectPoint_Max;
-
-                const wxPoint2DDouble& pt2 = rectPoints[n];
-
-                path.AddArcToPoint(pt1.m_x, pt1.m_y, pt2.m_x, pt2.m_y, RADIUS);
-
-                n = (n + 1) % RectPoint_Max;
-            }
-
-            // Last one wraps to the first point of the tip.
-            const wxPoint2DDouble& pt1 = rectPoints[n];
-            const wxPoint2DDouble& pt2 = tipPoints[0];
-
-            path.AddArcToPoint(pt1.m_x, pt1.m_y, pt2.m_x, pt2.m_y, RADIUS);
-
-            path.CloseSubpath();
-        }
-
-        SetShape(path);
-#else // !wxUSE_GRAPHICS_CONTEXT
-        int x = contentSize.x/2,
-            yApex = 0,
-            dy = 0;
-
-        SetSize(contentSize);
-#endif // wxUSE_GRAPHICS_CONTEXT/!wxUSE_GRAPHICS_CONTEXT
-
-        m_anchorPos.x = x;
-        m_anchorPos.y = yApex;
-
-        return dy;
-    }
-
-    // Timer event handler hides the tooltip when the timeout expires.
-    void OnTimer(wxTimerEvent& WXUNUSED(event))
-    {
-        // Doing "Notify" here ensures that our OnDismiss() is called and so we
-        // also Destroy() ourselves. We could use Dismiss() and call Destroy()
-        // explicitly from here as well.
-        DismissAndNotify();
-    }
-
-
-    // The anchor point offset if we show a tip or the middle of the top side
-    // otherwise.
-    wxPoint m_anchorPos;
-
-    // The timer counting down the time until we're hidden.
-    wxTimer m_timer;
-
-    wxDECLARE_NO_COPY_CLASS(wxRichToolTipPopup);
-};
-
-// ----------------------------------------------------------------------------
-// wxRichToolTipGenericImpl: generic implementation of wxRichToolTip.
-// ----------------------------------------------------------------------------
-
-void
-wxRichToolTipGenericImpl::SetBackgroundColour(const wxColour& col,
-                                              const wxColour& colEnd)
-{
-    m_colStart = col;
-    m_colEnd = colEnd;
-}
-
-void wxRichToolTipGenericImpl::SetCustomIcon(const wxIcon& icon)
-{
-    m_icon = icon;
-}
-
-void wxRichToolTipGenericImpl::SetStandardIcon(int icon)
-{
-    switch ( icon & wxICON_MASK )
-    {
-        case wxICON_WARNING:
-        case wxICON_ERROR:
-        case wxICON_INFORMATION:
-            // Although we don't use this icon in a list, we need a smallish
-            // icon here and not an icon of a typical message box size so use
-            // wxART_LIST to get it.
-            m_icon = wxArtProvider::GetIcon
-                     (
-                        wxArtProvider::GetMessageBoxIconId(icon),
-                        wxART_LIST
-                     );
-            break;
-
-        case wxICON_QUESTION:
-            wxFAIL_MSG("Question icon doesn't make sense for a tooltip");
-            break;
-
-        case wxICON_NONE:
-            m_icon = wxNullIcon;
-            break;
-    }
-}
-
-void wxRichToolTipGenericImpl::SetTimeout(unsigned milliseconds)
-{
-    m_timeout = milliseconds;
-}
-
-void wxRichToolTipGenericImpl::SetTipKind(wxTipKind tipKind)
-{
-    m_tipKind = tipKind;
-}
-
-void wxRichToolTipGenericImpl::SetTitleFont(const wxFont& font)
-{
-    m_titleFont = font;
-}
-
-void wxRichToolTipGenericImpl::ShowFor(wxWindow* win)
-{
-    // Set the focus to the window the tooltip refers to to make it look active.
-    win->SetFocus();
-
-    wxRichToolTipPopup* const popup = new wxRichToolTipPopup
-                                          (
-                                            win,
-                                            m_title,
-                                            m_message,
-                                            m_icon,
-                                            m_tipKind,
-                                            m_titleFont
-                                          );
-
-    popup->SetBackground(m_colStart, m_colEnd);
-
-    popup->DoShow();
-
-    popup->SetTimeout(m_timeout);
-}
-
-// Currently only wxMSW provides a native implementation.
-#ifndef __WXMSW__
-
-/* static */
-wxRichToolTipImpl*
-wxRichToolTipImpl::Create(const wxString& title, const wxString& message)
-{
-    return new wxRichToolTipGenericImpl(title, message);
-}
-
-#endif // !__WXMSW__
-
-#endif // wxUSE_RICHTOOLTIP
diff --git a/src/generic/richtooltipg.cpp b/src/generic/richtooltipg.cpp

new file mode 100644 (file)

index 0000000..2cbce1e
--- /dev/null
+++ b/src/generic/richtooltipg.cpp
@@ -0,0 +1,673 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/generic/richtooltipg.cpp
+// Purpose:     Implementation of wxRichToolTip.
+// Author:      Vadim Zeitlin
+// Created:     2011-10-07
+// RCS-ID:      $Id: wxhead.cpp,v 1.11 2010-04-22 12:44:51 zeitlin Exp $
+// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_RICHTOOLTIP
+
+#ifndef WX_PRECOMP
+    #include "wx/dcmemory.h"
+    #include "wx/icon.h"
+    #include "wx/region.h"
+    #include "wx/settings.h"
+    #include "wx/sizer.h"
+    #include "wx/statbmp.h"
+    #include "wx/stattext.h"
+    #include "wx/timer.h"
+    #include "wx/utils.h"
+#endif // WX_PRECOMP
+
+#include "wx/private/richtooltip.h"
+#include "wx/generic/private/richtooltip.h"
+
+#include "wx/artprov.h"
+#include "wx/custombgwin.h"
+#include "wx/display.h"
+#include "wx/graphics.h"
+#include "wx/popupwin.h"
+#include "wx/textwrapper.h"
+
+#ifdef __WXMSW__
+    #include "wx/msw/uxtheme.h"
+
+    static const int TTP_BALLOONTITLE = 4;
+
+    static const int TMT_TEXTCOLOR = 3803;
+    static const int TMT_GRADIENTCOLOR1 = 3810;
+    static const int TMT_GRADIENTCOLOR2 = 3811;
+#endif
+
+// ----------------------------------------------------------------------------
+// wxRichToolTipPopup: the popup window used by wxRichToolTip.
+// ----------------------------------------------------------------------------
+
+class wxRichToolTipPopup :
+    public wxCustomBackgroundWindow<wxPopupTransientWindow>
+{
+public:
+    wxRichToolTipPopup(wxWindow* parent,
+                       const wxString& title,
+                       const wxString& message,
+                       const wxIcon& icon,
+                       wxTipKind tipKind,
+                       const wxFont& titleFont_) :
+        m_timer(this)
+    {
+        Create(parent, wxFRAME_SHAPED);
+
+
+        wxBoxSizer* const sizerTitle = new wxBoxSizer(wxHORIZONTAL);
+        if ( icon.IsOk() )
+        {
+            sizerTitle->Add(new wxStaticBitmap(this, wxID_ANY, icon),
+                            wxSizerFlags().Centre().Border(wxRIGHT));
+        }
+        //else: Simply don't show any icon.
+
+        wxStaticText* const labelTitle = new wxStaticText(this, wxID_ANY, "");
+        labelTitle->SetLabelText(title);
+
+        wxFont titleFont(titleFont_);
+        if ( !titleFont.IsOk() )
+        {
+            // Determine the appropriate title font for the current platform.
+            titleFont = labelTitle->GetFont();
+
+#ifdef __WXMSW__
+            // When using themes MSW tooltips use larger bluish version of the
+            // normal font.
+            wxUxThemeEngine* const theme = GetTooltipTheme();
+            if ( theme )
+            {
+                titleFont.MakeLarger();
+
+                COLORREF c;
+                if ( FAILED(theme->GetThemeColor
+                                   (
+                                        wxUxThemeHandle(parent, L"TOOLTIP"),
+                                        TTP_BALLOONTITLE,
+                                        0,
+                                        TMT_TEXTCOLOR,
+                                        &c
+                                    )) )
+                {
+                    // Use the standard value of this colour as fallback.
+                    c = 0x993300;
+                }
+
+                labelTitle->SetForegroundColour(wxRGBToColour(c));
+            }
+            else
+#endif // __WXMSW__
+            {
+                // Everything else, including "classic" MSW look uses just the
+                // bold version of the base font.
+                titleFont.MakeBold();
+            }
+        }
+
+        labelTitle->SetFont(titleFont);
+        sizerTitle->Add(labelTitle, wxSizerFlags().Centre());
+
+        wxBoxSizer* const sizerTop = new wxBoxSizer(wxVERTICAL);
+        sizerTop->Add(sizerTitle,
+                        wxSizerFlags().DoubleBorder(wxLEFT|wxRIGHT|wxTOP));
+
+        // Use a spacer as we don't want to have a double border between the
+        // elements, just a simple one will do.
+        sizerTop->AddSpacer(wxSizerFlags::GetDefaultBorder());
+
+        wxTextSizerWrapper wrapper(this);
+        wxSizer* sizerText = wrapper.CreateSizer(message, -1 /* No wrapping */);
+
+#ifdef __WXMSW__
+        if ( icon.IsOk() && GetTooltipTheme() )
+        {
+            // Themed tooltips under MSW align the text with the title, not
+            // with the icon, so use a helper horizontal sizer in this case.
+            wxBoxSizer* const sizerTextIndent = new wxBoxSizer(wxHORIZONTAL);
+            sizerTextIndent->AddSpacer(icon.GetWidth());
+            sizerTextIndent->Add(sizerText,
+                                    wxSizerFlags().Border(wxLEFT).Centre());
+
+            sizerText = sizerTextIndent;
+        }
+#endif // !__WXMSW__
+        sizerTop->Add(sizerText,
+                        wxSizerFlags().DoubleBorder(wxLEFT|wxRIGHT|wxBOTTOM)
+                                      .Centre());
+
+        SetSizer(sizerTop);
+
+        const int offsetY = SetTipShapeAndSize(tipKind, GetBestSize());
+        if ( offsetY > 0 )
+        {
+            // Offset our contents by the tip height to make it appear in the
+            // main rectangle.
+            sizerTop->PrependSpacer(offsetY);
+        }
+
+        Layout();
+    }
+
+    void SetBackground(wxColour colStart, wxColour colEnd)
+    {
+        if ( !colStart.IsOk() )
+        {
+            // Determine the best colour(s) to use on our own.
+#ifdef __WXMSW__
+            wxUxThemeEngine* const theme = GetTooltipTheme();
+            if ( theme )
+            {
+                wxUxThemeHandle hTheme(GetParent(), L"TOOLTIP");
+
+                COLORREF c1, c2;
+                if ( FAILED(theme->GetThemeColor
+                                   (
+                                        hTheme,
+                                        TTP_BALLOONTITLE,
+                                        0,
+                                        TMT_GRADIENTCOLOR1,
+                                        &c1
+                                    )) ||
+                    FAILED(theme->GetThemeColor
+                                  (
+                                        hTheme,
+                                        TTP_BALLOONTITLE,
+                                        0,
+                                        TMT_GRADIENTCOLOR2,
+                                        &c2
+                                  )) )
+                {
+                    c1 = 0xffffff;
+                    c2 = 0xf0e5e4;
+                }
+
+                colStart = wxRGBToColour(c1);
+                colEnd = wxRGBToColour(c2);
+            }
+            else
+#endif // __WXMSW__
+            {
+                colStart = wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK);
+            }
+        }
+
+        if ( colEnd.IsOk() )
+        {
+            // Use gradient-filled background bitmap.
+            const wxSize size = GetClientSize();
+            wxBitmap bmp(size);
+            {
+                wxMemoryDC dc(bmp);
+                dc.Clear();
+                dc.GradientFillLinear(size, colStart, colEnd, wxDOWN);
+            }
+
+            SetBackgroundBitmap(bmp);
+        }
+        else // Use solid colour.
+        {
+            SetBackgroundColour(colStart);
+        }
+    }
+
+    void DoShow()
+    {
+        wxPoint pos = GetTipPoint();
+
+        // We want our anchor point to coincide with this position so offset
+        // the position of the top left corner passed to Move() accordingly.
+        pos -= m_anchorPos;
+
+        Move(pos, wxSIZE_NO_ADJUSTMENTS);
+
+        Popup();
+    }
+
+    void SetTimeout(unsigned timeout)
+    {
+        if ( !timeout )
+            return;
+
+        Connect(wxEVT_TIMER, wxTimerEventHandler(wxRichToolTipPopup::OnTimer));
+
+        m_timer.Start(timeout, true /* one shot */);
+    }
+
+protected:
+    virtual void OnDismiss()
+    {
+        Destroy();
+    }
+
+private:
+#ifdef __WXMSW__
+    // Returns non-NULL theme only if we're using Win7-style tooltips.
+    static wxUxThemeEngine* GetTooltipTheme()
+    {
+        // Even themed applications under XP still use "classic" tooltips.
+        if ( wxGetWinVersion() <= wxWinVersion_XP )
+            return NULL;
+
+        return wxUxThemeEngine::GetIfActive();
+    }
+#endif // __WXMSW__
+
+    // For now we just hard code the tip height, would be nice to do something
+    // smarter in the future.
+    static int GetTipHeight()
+    {
+#ifdef __WXMSW__
+        if ( GetTooltipTheme() )
+            return 20;
+#endif // __WXMSW__
+
+        return 15;
+    }
+
+    // Get the point to which our tip should point.
+    wxPoint GetTipPoint() const
+    {
+        // Currently we always use the middle of the window. It seems that MSW
+        // native tooltips use a different point but it's not really clear how
+        // do they determine it nor whether it's worth the trouble to emulate
+        // their behaviour.
+        const wxRect r = GetParent()->GetScreenRect();
+        return wxPoint(r.x + r.width/2, r.y + r.height/2);
+    }
+
+    // Choose the correct orientation depending on the window position.
+    //
+    // Also use the tip kind appropriate for the current environment. For MSW
+    // the right triangles are used and for Mac the equilateral ones as this is
+    // the prevailing kind under these systems. For everything else we go with
+    // right triangles as well but without any real rationale so this could be
+    // tweaked in the future.
+    wxTipKind GetBestTipKind() const
+    {
+        const wxPoint pos = GetTipPoint();
+
+        // Use GetFromWindow() and not GetFromPoint() here to try to get the
+        // correct display even if the tip point itself is not visible.
+        int dpy = wxDisplay::GetFromWindow(GetParent());
+        if ( dpy == wxNOT_FOUND )
+            dpy = 0; // What else can we do?
+
+        const wxRect rectDpy = wxDisplay(dpy).GetClientArea();
+
+#ifdef __WXMAC__
+        return pos.y > rectDpy.height/2 ? wxTipKind_Bottom : wxTipKind_Top;
+#else // !__WXMAC__
+        return pos.y > rectDpy.height/2
+                    ? pos.x > rectDpy.width/2
+                        ? wxTipKind_BottomRight
+                        : wxTipKind_BottomLeft
+                    : pos.x > rectDpy.width/2
+                        ? wxTipKind_TopRight
+                        : wxTipKind_TopLeft;
+#endif // __WXMAC__/!__WXMAC__
+    }
+
+    // Set the size and shape of the tip window and returns the offset of its
+    // content area from the top (horizontal offset is always 0 currently).
+    int SetTipShapeAndSize(wxTipKind tipKind, const wxSize& contentSize)
+    {
+#if wxUSE_GRAPHICS_CONTEXT
+        wxSize size = contentSize;
+
+        // The size is the vertical size and the offset is the distance from
+        // edge for asymmetric tips, currently hard-coded to be the same as the
+        // size.
+        const int tipSize = GetTipHeight();
+        const int tipOffset = tipSize;
+
+        // The horizontal position of the tip.
+        int x = -1;
+
+        // The vertical coordinates of the tip base and apex.
+        int yBase = -1,
+            yApex = -1;
+
+        // The offset of the content part of the window.
+        int dy = -1;
+
+        // Define symbolic names for the rectangle corners and mid-way points
+        // that we use below in an attempt to make the code more clear. Notice
+        // that these values must be consecutive as we iterate over them.
+        enum RectPoint
+        {
+            RectPoint_TopLeft,
+            RectPoint_Top,
+            RectPoint_TopRight,
+            RectPoint_Right,
+            RectPoint_BotRight,
+            RectPoint_Bot,
+            RectPoint_BotLeft,
+            RectPoint_Left,
+            RectPoint_Max
+        };
+
+        // The starting point for AddArcToPoint() calls below, we iterate over
+        // all RectPoints from it.
+        RectPoint pointStart = RectPoint_Max;
+
+
+        // Hard-coded radius of the round main rectangle corners.
+        const double RADIUS = 5;
+
+        // Create a path defining the shape of the tooltip window.
+        wxGraphicsPath
+            path = wxGraphicsRenderer::GetDefaultRenderer()->CreatePath();
+
+        if ( tipKind == wxTipKind_Auto )
+            tipKind = GetBestTipKind();
+
+        // Points defining the tip shape (in clockwise order as we must end at
+        // tipPoints[0] after drawing the rectangle outline in this order).
+        wxPoint2DDouble tipPoints[3];
+
+        switch ( tipKind )
+        {
+            case wxTipKind_Auto:
+                wxFAIL_MSG( "Impossible kind value" );
+                break;
+
+            case wxTipKind_TopLeft:
+                x = tipOffset;
+                yApex = 0;
+                yBase = tipSize;
+                dy = tipSize;
+
+                tipPoints[0] = wxPoint2DDouble(x, yBase);
+                tipPoints[1] = wxPoint2DDouble(x, yApex);
+                tipPoints[2] = wxPoint2DDouble(x + tipSize, yBase);
+
+                pointStart = RectPoint_TopRight;
+                break;
+
+            case wxTipKind_TopRight:
+                x = size.x - tipOffset;
+                yApex = 0;
+                yBase = tipSize;
+                dy = tipSize;
+
+                tipPoints[0] = wxPoint2DDouble(x - tipSize, yBase);
+                tipPoints[1] = wxPoint2DDouble(x, yApex);
+                tipPoints[2] = wxPoint2DDouble(x, yBase);
+
+                pointStart = RectPoint_TopRight;
+                break;
+
+            case wxTipKind_BottomLeft:
+                x = tipOffset;
+                yApex = size.y + tipSize;
+                yBase = size.y;
+                dy = 0;
+
+                tipPoints[0] = wxPoint2DDouble(x + tipSize, yBase);
+                tipPoints[1] = wxPoint2DDouble(x, yApex);
+                tipPoints[2] = wxPoint2DDouble(x, yBase);
+
+                pointStart = RectPoint_BotLeft;
+                break;
+
+            case wxTipKind_BottomRight:
+                x = size.x - tipOffset;
+                yApex = size.y + tipSize;
+                yBase = size.y;
+                dy = 0;
+
+                tipPoints[0] = wxPoint2DDouble(x, yBase);
+                tipPoints[1] = wxPoint2DDouble(x, yApex);
+                tipPoints[2] = wxPoint2DDouble(x - tipSize, yBase);
+
+                pointStart = RectPoint_BotLeft;
+                break;
+
+            case wxTipKind_Top:
+                x = size.x/2;
+                yApex = 0;
+                yBase = tipSize;
+                dy = tipSize;
+
+                {
+                    // A half-side of an equilateral triangle is its altitude
+                    // divided by sqrt(3) ~= 1.73.
+                    const double halfside = tipSize/1.73;
+
+                    tipPoints[0] = wxPoint2DDouble(x - halfside, yBase);
+                    tipPoints[1] = wxPoint2DDouble(x, yApex);
+                    tipPoints[2] = wxPoint2DDouble(x + halfside, yBase);
+                }
+
+                pointStart = RectPoint_TopRight;
+                break;
+
+            case wxTipKind_Bottom:
+                x = size.x/2;
+                yApex = size.y + tipSize;
+                yBase = size.y;
+                dy = 0;
+
+                {
+                    const double halfside = tipSize/1.73;
+
+                    tipPoints[0] = wxPoint2DDouble(x + halfside, yBase);
+                    tipPoints[1] = wxPoint2DDouble(x, yApex);
+                    tipPoints[2] = wxPoint2DDouble(x - halfside, yBase);
+                }
+
+                pointStart = RectPoint_BotLeft;
+                break;
+
+            case wxTipKind_None:
+                x = size.x/2;
+                dy = 0;
+
+                path.AddRoundedRectangle(0, 0, size.x, size.y, RADIUS);
+                break;
+        }
+
+        wxASSERT_MSG( dy != -1, wxS("Unknown tip kind?") );
+
+        size.y += tipSize;
+        SetSize(size);
+
+        if ( tipKind != wxTipKind_None )
+        {
+            path.MoveToPoint(tipPoints[0]);
+            path.AddLineToPoint(tipPoints[1]);
+            path.AddLineToPoint(tipPoints[2]);
+
+            const double xLeft = 0.;
+            const double xMid = size.x/2.;
+            const double xRight = size.x;
+
+            const double yTop = dy;
+            const double yMid = (dy + size.y)/2.;
+            const double yBot = dy + contentSize.y;
+
+            wxPoint2DDouble rectPoints[RectPoint_Max];
+            rectPoints[RectPoint_TopLeft]  = wxPoint2DDouble(xLeft,  yTop);
+            rectPoints[RectPoint_Top]      = wxPoint2DDouble(xMid,   yTop);
+            rectPoints[RectPoint_TopRight] = wxPoint2DDouble(xRight, yTop);
+            rectPoints[RectPoint_Right]    = wxPoint2DDouble(xRight, yMid);
+            rectPoints[RectPoint_BotRight] = wxPoint2DDouble(xRight, yBot);
+            rectPoints[RectPoint_Bot]      = wxPoint2DDouble(xMid,   yBot);
+            rectPoints[RectPoint_BotLeft]  = wxPoint2DDouble(xLeft,  yBot);
+            rectPoints[RectPoint_Left]     = wxPoint2DDouble(xLeft,  yMid);
+
+            // Iterate over all rectangle rectPoints for the first 3 corners.
+            unsigned n = pointStart;
+            for ( unsigned corner = 0; corner < 3; corner++ )
+            {
+                const wxPoint2DDouble& pt1 = rectPoints[n];
+
+                n = (n + 1) % RectPoint_Max;
+
+                const wxPoint2DDouble& pt2 = rectPoints[n];
+
+                path.AddArcToPoint(pt1.m_x, pt1.m_y, pt2.m_x, pt2.m_y, RADIUS);
+
+                n = (n + 1) % RectPoint_Max;
+            }
+
+            // Last one wraps to the first point of the tip.
+            const wxPoint2DDouble& pt1 = rectPoints[n];
+            const wxPoint2DDouble& pt2 = tipPoints[0];
+
+            path.AddArcToPoint(pt1.m_x, pt1.m_y, pt2.m_x, pt2.m_y, RADIUS);
+
+            path.CloseSubpath();
+        }
+
+        SetShape(path);
+#else // !wxUSE_GRAPHICS_CONTEXT
+        int x = contentSize.x/2,
+            yApex = 0,
+            dy = 0;
+
+        SetSize(contentSize);
+#endif // wxUSE_GRAPHICS_CONTEXT/!wxUSE_GRAPHICS_CONTEXT
+
+        m_anchorPos.x = x;
+        m_anchorPos.y = yApex;
+
+        return dy;
+    }
+
+    // Timer event handler hides the tooltip when the timeout expires.
+    void OnTimer(wxTimerEvent& WXUNUSED(event))
+    {
+        // Doing "Notify" here ensures that our OnDismiss() is called and so we
+        // also Destroy() ourselves. We could use Dismiss() and call Destroy()
+        // explicitly from here as well.
+        DismissAndNotify();
+    }
+
+
+    // The anchor point offset if we show a tip or the middle of the top side
+    // otherwise.
+    wxPoint m_anchorPos;
+
+    // The timer counting down the time until we're hidden.
+    wxTimer m_timer;
+
+    wxDECLARE_NO_COPY_CLASS(wxRichToolTipPopup);
+};
+
+// ----------------------------------------------------------------------------
+// wxRichToolTipGenericImpl: generic implementation of wxRichToolTip.
+// ----------------------------------------------------------------------------
+
+void
+wxRichToolTipGenericImpl::SetBackgroundColour(const wxColour& col,
+                                              const wxColour& colEnd)
+{
+    m_colStart = col;
+    m_colEnd = colEnd;
+}
+
+void wxRichToolTipGenericImpl::SetCustomIcon(const wxIcon& icon)
+{
+    m_icon = icon;
+}
+
+void wxRichToolTipGenericImpl::SetStandardIcon(int icon)
+{
+    switch ( icon & wxICON_MASK )
+    {
+        case wxICON_WARNING:
+        case wxICON_ERROR:
+        case wxICON_INFORMATION:
+            // Although we don't use this icon in a list, we need a smallish
+            // icon here and not an icon of a typical message box size so use
+            // wxART_LIST to get it.
+            m_icon = wxArtProvider::GetIcon
+                     (
+                        wxArtProvider::GetMessageBoxIconId(icon),
+                        wxART_LIST
+                     );
+            break;
+
+        case wxICON_QUESTION:
+            wxFAIL_MSG("Question icon doesn't make sense for a tooltip");
+            break;
+
+        case wxICON_NONE:
+            m_icon = wxNullIcon;
+            break;
+    }
+}
+
+void wxRichToolTipGenericImpl::SetTimeout(unsigned milliseconds)
+{
+    m_timeout = milliseconds;
+}
+
+void wxRichToolTipGenericImpl::SetTipKind(wxTipKind tipKind)
+{
+    m_tipKind = tipKind;
+}
+
+void wxRichToolTipGenericImpl::SetTitleFont(const wxFont& font)
+{
+    m_titleFont = font;
+}
+
+void wxRichToolTipGenericImpl::ShowFor(wxWindow* win)
+{
+    // Set the focus to the window the tooltip refers to to make it look active.
+    win->SetFocus();
+
+    wxRichToolTipPopup* const popup = new wxRichToolTipPopup
+                                          (
+                                            win,
+                                            m_title,
+                                            m_message,
+                                            m_icon,
+                                            m_tipKind,
+                                            m_titleFont
+                                          );
+
+    popup->SetBackground(m_colStart, m_colEnd);
+
+    popup->DoShow();
+
+    popup->SetTimeout(m_timeout);
+}
+
+// Currently only wxMSW provides a native implementation.
+#ifndef __WXMSW__
+
+/* static */
+wxRichToolTipImpl*
+wxRichToolTipImpl::Create(const wxString& title, const wxString& message)
+{
+    return new wxRichToolTipGenericImpl(title, message);
+}
+
+#endif // !__WXMSW__
+
+#endif // wxUSE_RICHTOOLTIP
author	Vadim Zeitlin <vadim@wxwidgets.org>
	Fri, 2 Dec 2011 00:56:44 +0000 (00:56 +0000)
committer	Vadim Zeitlin <vadim@wxwidgets.org>
	Fri, 2 Dec 2011 00:56:44 +0000 (00:56 +0000)
Makefile.in		patch \| blob \| blame \| history
build/bakefiles/files.bkl		patch \| blob \| blame \| history
build/msw/makefile.bcc		patch \| blob \| blame \| history
build/msw/makefile.gcc		patch \| blob \| blame \| history
build/msw/makefile.vc		patch \| blob \| blame \| history
build/msw/makefile.wat		patch \| blob \| blame \| history
build/msw/wx_adv.dsp		patch \| blob \| blame \| history
build/msw/wx_base.dsp		patch \| blob \| blame \| history
build/msw/wx_core.dsp		patch \| blob \| blame \| history
build/msw/wx_vc7_adv.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_base.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_core.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc7_xrc.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_adv.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_base.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_core.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc8_xrc.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_adv.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_base.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_core.vcproj		patch \| blob \| blame \| history
build/msw/wx_vc9_xrc.vcproj		patch \| blob \| blame \| history
build/msw/wx_xrc.dsp		patch \| blob \| blame \| history
src/generic/richtooltip.cpp	[deleted file]	patch \| blob \| blame \| history
src/generic/richtooltipg.cpp	[new file with mode: 0644]	patch \| blob