]> git.saurik.com Git - wxWidgets.git/commitdiff
Extracted private GetTimeZone() to public wxGetTimeZone() function.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 27 Nov 2011 19:50:19 +0000 (19:50 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 27 Nov 2011 19:50:19 +0000 (19:50 +0000)
Created new wx/time.h header for this function, more time-related functions
will be added to it later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

30 files changed:
Makefile.in
build/bakefiles/files.bkl
build/msw/makefile.bcc
build/msw/makefile.gcc
build/msw/makefile.vc
build/msw/makefile.wat
build/msw/wx_adv.dsp
build/msw/wx_base.dsp
build/msw/wx_core.dsp
build/msw/wx_vc7_adv.vcproj
build/msw/wx_vc7_base.vcproj
build/msw/wx_vc7_core.vcproj
build/msw/wx_vc7_xrc.vcproj
build/msw/wx_vc8_adv.vcproj
build/msw/wx_vc8_base.vcproj
build/msw/wx_vc8_core.vcproj
build/msw/wx_vc8_xrc.vcproj
build/msw/wx_vc9_adv.vcproj
build/msw/wx_vc9_base.vcproj
build/msw/wx_vc9_core.vcproj
build/msw/wx_vc9_xrc.vcproj
build/msw/wx_xrc.dsp
include/wx/time.h [new file with mode: 0644]
interface/wx/time.h [new file with mode: 0644]
src/common/datetime.cpp
src/common/datetimefmt.cpp
src/common/time.cpp [new file with mode: 0644]
wxGTK.spec
wxMotif.spec
wxX11.spec

index 2c8397719da30365ec6ac91a8910b2538f4c21d4..70083bcab2f8ddf07a5e56dbbcee5dac766c48d9 100644 (file)
@@ -439,6 +439,7 @@ ALL_BASE_HEADERS =  \
        wx/textfile.h \
        wx/thread.h \
        wx/thrimpl.cpp \
+       wx/time.h \
        wx/timer.h \
        wx/tls.h \
        wx/tokenzr.h \
@@ -618,6 +619,7 @@ ALL_PORTS_BASE_HEADERS =  \
        wx/textfile.h \
        wx/thread.h \
        wx/thrimpl.cpp \
+       wx/time.h \
        wx/timer.h \
        wx/tls.h \
        wx/tokenzr.h \
@@ -785,6 +787,7 @@ ALL_BASE_SOURCES =  \
        src/common/tarstrm.cpp \
        src/common/textbuf.cpp \
        src/common/textfile.cpp \
+       src/common/time.cpp \
        src/common/timercmn.cpp \
        src/common/timerimpl.cpp \
        src/common/tokenzr.cpp \
@@ -984,6 +987,7 @@ MONODLL_OBJECTS =  \
        monodll_tarstrm.o \
        monodll_textbuf.o \
        monodll_textfile.o \
+       monodll_common_time.o \
        monodll_timercmn.o \
        monodll_timerimpl.o \
        monodll_tokenzr.o \
@@ -1117,6 +1121,7 @@ MONOLIB_OBJECTS =  \
        monolib_tarstrm.o \
        monolib_textbuf.o \
        monolib_textfile.o \
+       monolib_common_time.o \
        monolib_timercmn.o \
        monolib_timerimpl.o \
        monolib_tokenzr.o \
@@ -1245,6 +1250,7 @@ BASEDLL_OBJECTS =  \
        basedll_tarstrm.o \
        basedll_textbuf.o \
        basedll_textfile.o \
+       basedll_common_time.o \
        basedll_timercmn.o \
        basedll_timerimpl.o \
        basedll_tokenzr.o \
@@ -1356,6 +1362,7 @@ BASELIB_OBJECTS =  \
        baselib_tarstrm.o \
        baselib_textbuf.o \
        baselib_textfile.o \
+       baselib_common_time.o \
        baselib_timercmn.o \
        baselib_timerimpl.o \
        baselib_tokenzr.o \
@@ -4419,7 +4426,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS =  \
        monodll_fswatcher.o \
        $(__BASE_WINCE_SRC_OBJECTS)
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS)
-@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS = monodll_time.o
+@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS = monodll_wince_time.o
 @COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = 
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_WIN32_1@        = monodll_msw_evtloop.o monodll_msw_main.o \
@@ -6377,7 +6384,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
        monolib_fswatcher.o \
        $(__BASE_WINCE_SRC_OBJECTS_1)
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1)
-@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_1 = monolib_time.o
+@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_1 = monolib_wince_time.o
 @COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = 
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_WIN32_1@        = monolib_msw_evtloop.o monolib_msw_main.o \
@@ -8388,7 +8395,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
        basedll_fswatcher.o \
        $(__BASE_WINCE_SRC_OBJECTS_2)
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2)
-@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_2 = basedll_time.o
+@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_2 = basedll_wince_time.o
 @COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 = 
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_WIN32_1@        = basedll_evtloop.o basedll_main.o basedll_mslu.o \
@@ -8488,7 +8495,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
        baselib_fswatcher.o \
        $(__BASE_WINCE_SRC_OBJECTS_3)
 @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3)
-@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_3 = baselib_time.o
+@COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_3 = baselib_wince_time.o
 @COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 = 
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_WIN32_1@        = baselib_evtloop.o baselib_main.o baselib_mslu.o \
@@ -15877,6 +15884,9 @@ monodll_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(MONODLL_ODEP)
 monodll_textfile.o: $(srcdir)/src/common/textfile.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
 
+monodll_common_time.o: $(srcdir)/src/common/time.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/time.cpp
+
 monodll_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp
 
@@ -15994,7 +16004,7 @@ monodll_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(MONODLL_ODEP)
 monodll_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp
 
-monodll_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONODLL_ODEP)
+monodll_wince_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
 
 monodll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONODLL_ODEP)
@@ -21262,6 +21272,9 @@ monolib_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(MONOLIB_ODEP)
 monolib_textfile.o: $(srcdir)/src/common/textfile.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
 
+monolib_common_time.o: $(srcdir)/src/common/time.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/time.cpp
+
 monolib_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp
 
@@ -21379,7 +21392,7 @@ monolib_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(MONOLIB_ODEP)
 monolib_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp
 
-monolib_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONOLIB_ODEP)
+monolib_wince_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
 
 monolib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONOLIB_ODEP)
@@ -26647,6 +26660,9 @@ basedll_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(BASEDLL_ODEP)
 basedll_textfile.o: $(srcdir)/src/common/textfile.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
 
+basedll_common_time.o: $(srcdir)/src/common/time.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/time.cpp
+
 basedll_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp
 
@@ -26764,7 +26780,7 @@ basedll_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASEDLL_ODEP)
 basedll_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp
 
-basedll_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASEDLL_ODEP)
+basedll_wince_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASEDLL_ODEP)
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
 
 basedll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASEDLL_ODEP)
@@ -27151,6 +27167,9 @@ baselib_textbuf.o: $(srcdir)/src/common/textbuf.cpp $(BASELIB_ODEP)
 baselib_textfile.o: $(srcdir)/src/common/textfile.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/textfile.cpp
 
+baselib_common_time.o: $(srcdir)/src/common/time.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/time.cpp
+
 baselib_timercmn.o: $(srcdir)/src/common/timercmn.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/timercmn.cpp
 
@@ -27268,7 +27287,7 @@ baselib_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASELIB_ODEP)
 baselib_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp
 
-baselib_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASELIB_ODEP)
+baselib_wince_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASELIB_ODEP)
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
 
 baselib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASELIB_ODEP)
index fba0e2690b38bfb65bd60b690cdd70716350806d..f8aa57fcc15e361f9ceb2b935af6346a4f2b6d17 100644 (file)
@@ -382,6 +382,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/tarstrm.cpp
     src/common/textbuf.cpp
     src/common/textfile.cpp
+    src/common/time.cpp
     src/common/timercmn.cpp
     src/common/timerimpl.cpp
     src/common/tokenzr.cpp
@@ -527,6 +528,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/textfile.h
     wx/thread.h
     wx/thrimpl.cpp
+    wx/time.h
     wx/timer.h
     wx/tls.h
     wx/tokenzr.h
index 47b46c3e3c498c668e7a37f18c7be365f79489fa..a74195709eae2aac6cc02c8c00914cc93317d465 100644 (file)
@@ -390,6 +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_timercmn.obj \\r
        $(OBJS)\monodll_timerimpl.obj \\r
        $(OBJS)\monodll_tokenzr.obj \\r
@@ -538,6 +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_timercmn.obj \\r
        $(OBJS)\monolib_timerimpl.obj \\r
        $(OBJS)\monolib_tokenzr.obj \\r
@@ -684,6 +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_timercmn.obj \\r
        $(OBJS)\basedll_timerimpl.obj \\r
        $(OBJS)\basedll_tokenzr.obj \\r
@@ -814,6 +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_timercmn.obj \\r
        $(OBJS)\baselib_timerimpl.obj \\r
        $(OBJS)\baselib_tokenzr.obj \\r
@@ -1213,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 \\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_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 \\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_xh_toolb.obj \
+       $(OBJS)\xrcdll_xh_toolbk.obj \
+       $(OBJS)\xrcdll_xh_tree.obj \
+       $(OBJS)\xrcdll_xh_treebk.obj \
+       $(OBJS)\xrcdll_xh_unkwn.obj \
+       $(OBJS)\xrcdll_xh_wizrd.obj \
        $(OBJS)\xrcdll_xmlres.obj \\r
        $(OBJS)\xrcdll_xmladv.obj \\r
        $(OBJS)\xrcdll_xmlrsall.obj\r
@@ -1289,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 \\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_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 \\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_xh_toolb.obj \
+       $(OBJS)\xrclib_xh_toolbk.obj \
+       $(OBJS)\xrclib_xh_tree.obj \
+       $(OBJS)\xrclib_xh_treebk.obj \
+       $(OBJS)\xrclib_xh_unkwn.obj \
+       $(OBJS)\xrclib_xh_wizrd.obj \
        $(OBJS)\xrclib_xmlres.obj \\r
        $(OBJS)\xrclib_xmladv.obj \\r
        $(OBJS)\xrclib_xmlrsall.obj\r
@@ -1662,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 \\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_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 \\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_xh_toolb.obj \
+       $(OBJS)\monodll_xh_toolbk.obj \
+       $(OBJS)\monodll_xh_tree.obj \
+       $(OBJS)\monodll_xh_treebk.obj \
+       $(OBJS)\monodll_xh_unkwn.obj \
+       $(OBJS)\monodll_xh_wizrd.obj \
        $(OBJS)\monodll_xmlres.obj \\r
        $(OBJS)\monodll_xmladv.obj \\r
        $(OBJS)\monodll_xmlrsall.obj \\r
@@ -1740,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\monodll_dropsrc.obj \
+       $(OBJS)\monodll_droptgt.obj \
+       $(OBJS)\monodll_oleutils.obj \
+       $(OBJS)\monodll_palette.obj \
+       $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \\r
        $(OBJS)\monodll_printdlg.obj \\r
        $(OBJS)\monodll_printwin.obj \\r
@@ -2012,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\monodll_dropsrc.obj \
+       $(OBJS)\monodll_droptgt.obj \
+       $(OBJS)\monodll_oleutils.obj \
+       $(OBJS)\monodll_palette.obj \
+       $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \\r
        $(OBJS)\monodll_printdlg.obj \\r
        $(OBJS)\monodll_printwin.obj \\r
@@ -2257,49 +2261,49 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 !if "$(WXUNIV)" == "0"\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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\monodll_bannerwindow.obj \
+       $(OBJS)\monodll_bmpcboxg.obj \
+       $(OBJS)\monodll_calctrlg.obj \
+       $(OBJS)\monodll_commandlinkbuttong.obj \
+       $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\monodll_splash.obj \\r
+       $(OBJS)\monodll_sashwin.obj \
+       $(OBJS)\monodll_splash.obj \
        $(OBJS)\monodll_generic_timectrl.obj \
-       $(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_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 \\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_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 \
@@ -2308,49 +2312,49 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
-       $(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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\monodll_bannerwindow.obj \
+       $(OBJS)\monodll_bmpcboxg.obj \
+       $(OBJS)\monodll_calctrlg.obj \
+       $(OBJS)\monodll_commandlinkbuttong.obj \
+       $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\monodll_splash.obj \\r
+       $(OBJS)\monodll_sashwin.obj \
+       $(OBJS)\monodll_splash.obj \
        $(OBJS)\monodll_generic_timectrl.obj \
-       $(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_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 \\r
-       $(OBJS)\monodll_taskbar.obj \\r
-       $(OBJS)\monodll_joystick.obj \\r
-       $(OBJS)\monodll_animateg.obj\r
-!endif\r
-!if "$(USE_STC)" == "1"\r
+       $(OBJS)\monodll_sound.obj \
+       $(OBJS)\monodll_taskbar.obj \
+       $(OBJS)\monodll_joystick.obj \
+       $(OBJS)\monodll_animateg.obj
+!endif
+!if "$(USE_STC)" == "1"
 __wxscintilla_library_link_DEP = $(__wxscintilla)\r
 !endif\r
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"\r
@@ -2445,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 \\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_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 \\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_xh_toolb.obj \
+       $(OBJS)\monolib_xh_toolbk.obj \
+       $(OBJS)\monolib_xh_tree.obj \
+       $(OBJS)\monolib_xh_treebk.obj \
+       $(OBJS)\monolib_xh_unkwn.obj \
+       $(OBJS)\monolib_xh_wizrd.obj \
        $(OBJS)\monolib_xmlres.obj \\r
        $(OBJS)\monolib_xmladv.obj \\r
        $(OBJS)\monolib_xmlrsall.obj \\r
@@ -2523,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\monolib_dropsrc.obj \
+       $(OBJS)\monolib_droptgt.obj \
+       $(OBJS)\monolib_oleutils.obj \
+       $(OBJS)\monolib_palette.obj \
+       $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \\r
        $(OBJS)\monolib_printdlg.obj \\r
        $(OBJS)\monolib_printwin.obj \\r
@@ -2795,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\monolib_dropsrc.obj \
+       $(OBJS)\monolib_droptgt.obj \
+       $(OBJS)\monolib_oleutils.obj \
+       $(OBJS)\monolib_palette.obj \
+       $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \\r
        $(OBJS)\monolib_printdlg.obj \\r
        $(OBJS)\monolib_printwin.obj \\r
@@ -3040,49 +3044,49 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !if "$(WXUNIV)" == "0"\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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\monolib_bannerwindow.obj \
+       $(OBJS)\monolib_bmpcboxg.obj \
+       $(OBJS)\monolib_calctrlg.obj \
+       $(OBJS)\monolib_commandlinkbuttong.obj \
+       $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\monolib_splash.obj \\r
+       $(OBJS)\monolib_sashwin.obj \
+       $(OBJS)\monolib_splash.obj \
        $(OBJS)\monolib_generic_timectrl.obj \
-       $(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_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 \\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_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 \
@@ -3091,49 +3095,49 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
-       $(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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\monolib_bannerwindow.obj \
+       $(OBJS)\monolib_bmpcboxg.obj \
+       $(OBJS)\monolib_calctrlg.obj \
+       $(OBJS)\monolib_commandlinkbuttong.obj \
+       $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\monolib_splash.obj \\r
+       $(OBJS)\monolib_sashwin.obj \
+       $(OBJS)\monolib_splash.obj \
        $(OBJS)\monolib_generic_timectrl.obj \
-       $(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_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 \\r
-       $(OBJS)\monolib_taskbar.obj \\r
-       $(OBJS)\monolib_joystick.obj \\r
-       $(OBJS)\monolib_animateg.obj\r
-!endif\r
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
+       $(OBJS)\monolib_sound.obj \
+       $(OBJS)\monolib_taskbar.obj \
+       $(OBJS)\monolib_joystick.obj \
+       $(OBJS)\monolib_animateg.obj
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __basedll___depname = \\r
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_bcc$(VENDORTAG).dll\r
 !endif\r
@@ -3189,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\coredll_dropsrc.obj \
+       $(OBJS)\coredll_droptgt.obj \
+       $(OBJS)\coredll_oleutils.obj \
+       $(OBJS)\coredll_palette.obj \
+       $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \\r
        $(OBJS)\coredll_printdlg.obj \\r
        $(OBJS)\coredll_printwin.obj \\r
@@ -3461,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\coredll_dropsrc.obj \
+       $(OBJS)\coredll_droptgt.obj \
+       $(OBJS)\coredll_oleutils.obj \
+       $(OBJS)\coredll_palette.obj \
+       $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \\r
        $(OBJS)\coredll_printdlg.obj \\r
        $(OBJS)\coredll_printwin.obj \\r
@@ -3731,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\corelib_dropsrc.obj \
+       $(OBJS)\corelib_droptgt.obj \
+       $(OBJS)\corelib_oleutils.obj \
+       $(OBJS)\corelib_palette.obj \
+       $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \\r
        $(OBJS)\corelib_printdlg.obj \\r
        $(OBJS)\corelib_printwin.obj \\r
@@ -4003,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\corelib_dropsrc.obj \
+       $(OBJS)\corelib_droptgt.obj \
+       $(OBJS)\corelib_oleutils.obj \
+       $(OBJS)\corelib_palette.obj \
+       $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \\r
        $(OBJS)\corelib_printdlg.obj \\r
        $(OBJS)\corelib_printwin.obj \\r
@@ -4258,49 +4262,49 @@ __advdll___depname = \
 !if "$(WXUNIV)" == "0"\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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\advdll_bannerwindow.obj \
+       $(OBJS)\advdll_bmpcboxg.obj \
+       $(OBJS)\advdll_calctrlg.obj \
+       $(OBJS)\advdll_commandlinkbuttong.obj \
+       $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\advdll_splash.obj \\r
+       $(OBJS)\advdll_sashwin.obj \
+       $(OBJS)\advdll_splash.obj \
        $(OBJS)\advdll_generic_timectrl.obj \
-       $(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_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 \\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_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 \
@@ -4309,98 +4313,98 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
-       $(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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\advdll_bannerwindow.obj \
+       $(OBJS)\advdll_bmpcboxg.obj \
+       $(OBJS)\advdll_calctrlg.obj \
+       $(OBJS)\advdll_commandlinkbuttong.obj \
+       $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\advdll_splash.obj \\r
+       $(OBJS)\advdll_sashwin.obj \
+       $(OBJS)\advdll_splash.obj \
        $(OBJS)\advdll_generic_timectrl.obj \
-       $(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_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 \\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
+       $(OBJS)\advdll_sound.obj \
+       $(OBJS)\advdll_taskbar.obj \
+       $(OBJS)\advdll_joystick.obj \
+       $(OBJS)\advdll_animateg.obj
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
 __advlib___depname = \\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 \\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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\advlib_bannerwindow.obj \
+       $(OBJS)\advlib_bmpcboxg.obj \
+       $(OBJS)\advlib_calctrlg.obj \
+       $(OBJS)\advlib_commandlinkbuttong.obj \
+       $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\advlib_splash.obj \\r
+       $(OBJS)\advlib_sashwin.obj \
+       $(OBJS)\advlib_splash.obj \
        $(OBJS)\advlib_generic_timectrl.obj \
-       $(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_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 \\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_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 \
@@ -4409,49 +4413,49 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
-       $(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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\advlib_bannerwindow.obj \
+       $(OBJS)\advlib_bmpcboxg.obj \
+       $(OBJS)\advlib_calctrlg.obj \
+       $(OBJS)\advlib_commandlinkbuttong.obj \
+       $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\advlib_splash.obj \\r
+       $(OBJS)\advlib_sashwin.obj \
+       $(OBJS)\advlib_splash.obj \
        $(OBJS)\advlib_generic_timectrl.obj \
-       $(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_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 \\r
-       $(OBJS)\advlib_taskbar.obj \\r
-       $(OBJS)\advlib_joystick.obj \\r
-       $(OBJS)\advlib_animateg.obj\r
-!endif\r
-!if "$(SHARED)" == "1"\r
+       $(OBJS)\advlib_sound.obj \
+       $(OBJS)\advlib_taskbar.obj \
+       $(OBJS)\advlib_joystick.obj \
+       $(OBJS)\advlib_animateg.obj
+!endif
+!if "$(SHARED)" == "1"
 ____wxadv_namedll_DEP = $(__advdll___depname)\r
 !endif\r
 !if "$(SHARED)" == "0"\r
@@ -6246,6 +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_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r
@@ -6732,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\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_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\r
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
-\r
+$(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\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_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
+
+$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
+
 $(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp\r
 \r
@@ -7011,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\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_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\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_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\monodll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
 \r
@@ -7299,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"\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
+!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\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
+$(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
 !endif\r
 \r
@@ -8269,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"\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
+!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\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
+$(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp\r
 !endif\r
 \r
@@ -8364,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"\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
+!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\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_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\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
+$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treelist.cpp\r
 !endif\r
 \r
@@ -8414,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"\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
+!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\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
+$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp\r
 !endif\r
 \r
@@ -8648,6 +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_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r
@@ -9134,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\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_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\r
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
-\r
+$(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\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_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
+
+$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
+
 $(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp\r
 \r
@@ -9413,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\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_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\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_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\monolib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
 \r
@@ -9701,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"\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
+!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\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
+$(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
 !endif\r
 \r
@@ -10671,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"\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
+!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\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
+$(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp\r
 !endif\r
 \r
@@ -10766,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"\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
+!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\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_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\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
+$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp\r
 !endif\r
 \r
@@ -10816,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"\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
+!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\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
+$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp\r
 !endif\r
 \r
@@ -11050,6 +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_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r
@@ -11386,6 +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_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r
@@ -12073,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"\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
+!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\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
+$(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
 !endif\r
 \r
@@ -13481,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"\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
+!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\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
+$(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
 !endif\r
 \r
@@ -14436,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\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_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\r
-       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
-\r
+$(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\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_animatecmn.obj: ..\..\src\common\animatecmn.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
+
+$(OBJS)\advdll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+
 $(OBJS)\advdll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
 \r
@@ -14466,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\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_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\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_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+
+$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
+
 $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp\r
 \r
@@ -14523,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\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_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\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_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\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_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+
+$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp
+
 $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp\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\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_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\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_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+
+$(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
+       $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+
 $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp\r
        $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp\r
 \r
@@ -14586,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\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_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\r
-       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
-\r
+$(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\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_animatecmn.obj: ..\..\src\common\animatecmn.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
+
+$(OBJS)\advlib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+
 $(OBJS)\advlib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
 \r
@@ -14616,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\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_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\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_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+
+$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
+
 $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp\r
 \r
@@ -14673,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\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_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\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_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\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_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+
+$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp
+
 $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp\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\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_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\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_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+
+$(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
+       $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+
 $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp\r
        $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp\r
 \r
@@ -15156,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\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_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\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_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\xrcdll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+       $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
        $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
 \r
@@ -15354,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\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_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\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_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\xrclib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+       $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
        $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
 \r
index 1d29168a4cdaf876ed5127d0363a82fbb571ce0f..3d4f9a8d3dab70687c8ee4295f1944dbb2ee0e7e 100644 (file)
@@ -375,6 +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_timercmn.o \\r
        $(OBJS)\monodll_timerimpl.o \\r
        $(OBJS)\monodll_tokenzr.o \\r
@@ -524,6 +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_timercmn.o \\r
        $(OBJS)\monolib_timerimpl.o \\r
        $(OBJS)\monolib_tokenzr.o \\r
@@ -671,6 +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_timercmn.o \\r
        $(OBJS)\basedll_timerimpl.o \\r
        $(OBJS)\basedll_tokenzr.o \\r
@@ -802,6 +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_timercmn.o \\r
        $(OBJS)\baselib_timerimpl.o \\r
        $(OBJS)\baselib_tokenzr.o \\r
@@ -1212,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 \\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_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 \\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_xh_toolb.o \
+       $(OBJS)\xrcdll_xh_toolbk.o \
+       $(OBJS)\xrcdll_xh_tree.o \
+       $(OBJS)\xrcdll_xh_treebk.o \
+       $(OBJS)\xrcdll_xh_unkwn.o \
+       $(OBJS)\xrcdll_xh_wizrd.o \
        $(OBJS)\xrcdll_xmlres.o \\r
        $(OBJS)\xrcdll_xmladv.o \\r
        $(OBJS)\xrcdll_xmlrsall.o\r
@@ -1287,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 \\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_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 \\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_xh_toolb.o \
+       $(OBJS)\xrclib_xh_toolbk.o \
+       $(OBJS)\xrclib_xh_tree.o \
+       $(OBJS)\xrclib_xh_treebk.o \
+       $(OBJS)\xrclib_xh_unkwn.o \
+       $(OBJS)\xrclib_xh_wizrd.o \
        $(OBJS)\xrclib_xmlres.o \\r
        $(OBJS)\xrclib_xmladv.o \\r
        $(OBJS)\xrclib_xmlrsall.o\r
@@ -1673,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 \\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_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 \\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_xh_toolb.o \
+       $(OBJS)\monodll_xh_toolbk.o \
+       $(OBJS)\monodll_xh_tree.o \
+       $(OBJS)\monodll_xh_treebk.o \
+       $(OBJS)\monodll_xh_unkwn.o \
+       $(OBJS)\monodll_xh_wizrd.o \
        $(OBJS)\monodll_xmlres.o \\r
        $(OBJS)\monodll_xmladv.o \\r
        $(OBJS)\monodll_xmlrsall.o \\r
@@ -1752,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 \\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_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 \\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_dataobj.o \
+       $(OBJS)\monodll_dropsrc.o \
+       $(OBJS)\monodll_droptgt.o \
+       $(OBJS)\monodll_oleutils.o \
+       $(OBJS)\monodll_palette.o \
+       $(OBJS)\monodll_pen.o \
        $(OBJS)\monodll_popupwin.o \\r
        $(OBJS)\monodll_printdlg.o \\r
        $(OBJS)\monodll_printwin.o \\r
@@ -2026,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 \\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_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 \\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_dataobj.o \
+       $(OBJS)\monodll_dropsrc.o \
+       $(OBJS)\monodll_droptgt.o \
+       $(OBJS)\monodll_oleutils.o \
+       $(OBJS)\monodll_palette.o \
+       $(OBJS)\monodll_pen.o \
        $(OBJS)\monodll_popupwin.o \\r
        $(OBJS)\monodll_printdlg.o \\r
        $(OBJS)\monodll_printwin.o \\r
@@ -2272,49 +2276,49 @@ endif
 ifeq ($(WXUNIV),0)\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_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 \\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_aboutdlgg.o \
+       $(OBJS)\monodll_bannerwindow.o \
+       $(OBJS)\monodll_bmpcboxg.o \
+       $(OBJS)\monodll_calctrlg.o \
+       $(OBJS)\monodll_commandlinkbuttong.o \
+       $(OBJS)\monodll_datavgen.o \
        $(OBJS)\monodll_datectlg.o \\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 \\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_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 \\r
-       $(OBJS)\monodll_splash.o \\r
+       $(OBJS)\monodll_sashwin.o \
+       $(OBJS)\monodll_splash.o \
        $(OBJS)\monodll_generic_timectrl.o \
-       $(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_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 \\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_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 \
@@ -2323,49 +2327,49 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
-       $(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_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 \\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_aboutdlgg.o \
+       $(OBJS)\monodll_bannerwindow.o \
+       $(OBJS)\monodll_bmpcboxg.o \
+       $(OBJS)\monodll_calctrlg.o \
+       $(OBJS)\monodll_commandlinkbuttong.o \
+       $(OBJS)\monodll_datavgen.o \
        $(OBJS)\monodll_datectlg.o \\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 \\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_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 \\r
-       $(OBJS)\monodll_splash.o \\r
+       $(OBJS)\monodll_sashwin.o \
+       $(OBJS)\monodll_splash.o \
        $(OBJS)\monodll_generic_timectrl.o \
-       $(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_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 \\r
-       $(OBJS)\monodll_taskbar.o \\r
-       $(OBJS)\monodll_joystick.o \\r
-       $(OBJS)\monodll_animateg.o\r
-endif\r
-ifeq ($(USE_STC),1)\r
+       $(OBJS)\monodll_sound.o \
+       $(OBJS)\monodll_taskbar.o \
+       $(OBJS)\monodll_joystick.o \
+       $(OBJS)\monodll_animateg.o
+endif
+ifeq ($(USE_STC),1)
 __wxscintilla_library_link_DEP = $(__wxscintilla)\r
 endif\r
 ifeq ($(MONOLITHIC),1)\r
@@ -2462,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 \\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_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 \\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_xh_toolb.o \
+       $(OBJS)\monolib_xh_toolbk.o \
+       $(OBJS)\monolib_xh_tree.o \
+       $(OBJS)\monolib_xh_treebk.o \
+       $(OBJS)\monolib_xh_unkwn.o \
+       $(OBJS)\monolib_xh_wizrd.o \
        $(OBJS)\monolib_xmlres.o \\r
        $(OBJS)\monolib_xmladv.o \\r
        $(OBJS)\monolib_xmlrsall.o \\r
@@ -2541,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 \\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_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 \\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_dataobj.o \
+       $(OBJS)\monolib_dropsrc.o \
+       $(OBJS)\monolib_droptgt.o \
+       $(OBJS)\monolib_oleutils.o \
+       $(OBJS)\monolib_palette.o \
+       $(OBJS)\monolib_pen.o \
        $(OBJS)\monolib_popupwin.o \\r
        $(OBJS)\monolib_printdlg.o \\r
        $(OBJS)\monolib_printwin.o \\r
@@ -2815,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 \\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_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 \\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_dataobj.o \
+       $(OBJS)\monolib_dropsrc.o \
+       $(OBJS)\monolib_droptgt.o \
+       $(OBJS)\monolib_oleutils.o \
+       $(OBJS)\monolib_palette.o \
+       $(OBJS)\monolib_pen.o \
        $(OBJS)\monolib_popupwin.o \\r
        $(OBJS)\monolib_printdlg.o \\r
        $(OBJS)\monolib_printwin.o \\r
@@ -3061,49 +3065,49 @@ endif
 ifeq ($(WXUNIV),0)\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_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 \\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_aboutdlgg.o \
+       $(OBJS)\monolib_bannerwindow.o \
+       $(OBJS)\monolib_bmpcboxg.o \
+       $(OBJS)\monolib_calctrlg.o \
+       $(OBJS)\monolib_commandlinkbuttong.o \
+       $(OBJS)\monolib_datavgen.o \
        $(OBJS)\monolib_datectlg.o \\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 \\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_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 \\r
-       $(OBJS)\monolib_splash.o \\r
+       $(OBJS)\monolib_sashwin.o \
+       $(OBJS)\monolib_splash.o \
        $(OBJS)\monolib_generic_timectrl.o \
-       $(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_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 \\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_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 \
@@ -3112,49 +3116,49 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
-       $(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_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 \\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_aboutdlgg.o \
+       $(OBJS)\monolib_bannerwindow.o \
+       $(OBJS)\monolib_bmpcboxg.o \
+       $(OBJS)\monolib_calctrlg.o \
+       $(OBJS)\monolib_commandlinkbuttong.o \
+       $(OBJS)\monolib_datavgen.o \
        $(OBJS)\monolib_datectlg.o \\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 \\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_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 \\r
-       $(OBJS)\monolib_splash.o \\r
+       $(OBJS)\monolib_sashwin.o \
+       $(OBJS)\monolib_splash.o \
        $(OBJS)\monolib_generic_timectrl.o \
-       $(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_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 \\r
-       $(OBJS)\monolib_taskbar.o \\r
-       $(OBJS)\monolib_joystick.o \\r
-       $(OBJS)\monolib_animateg.o\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
+       $(OBJS)\monolib_sound.o \
+       $(OBJS)\monolib_taskbar.o \
+       $(OBJS)\monolib_joystick.o \
+       $(OBJS)\monolib_animateg.o
+endif
+ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),1)\r
 __basedll___depname = \\r
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gcc$(VENDORTAG).dll\r
@@ -3223,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 \\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_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 \\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_dataobj.o \
+       $(OBJS)\coredll_dropsrc.o \
+       $(OBJS)\coredll_droptgt.o \
+       $(OBJS)\coredll_oleutils.o \
+       $(OBJS)\coredll_palette.o \
+       $(OBJS)\coredll_pen.o \
        $(OBJS)\coredll_popupwin.o \\r
        $(OBJS)\coredll_printdlg.o \\r
        $(OBJS)\coredll_printwin.o \\r
@@ -3497,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 \\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_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 \\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_dataobj.o \
+       $(OBJS)\coredll_dropsrc.o \
+       $(OBJS)\coredll_droptgt.o \
+       $(OBJS)\coredll_oleutils.o \
+       $(OBJS)\coredll_palette.o \
+       $(OBJS)\coredll_pen.o \
        $(OBJS)\coredll_popupwin.o \\r
        $(OBJS)\coredll_printdlg.o \\r
        $(OBJS)\coredll_printwin.o \\r
@@ -3773,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 \\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_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 \\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_dataobj.o \
+       $(OBJS)\corelib_dropsrc.o \
+       $(OBJS)\corelib_droptgt.o \
+       $(OBJS)\corelib_oleutils.o \
+       $(OBJS)\corelib_palette.o \
+       $(OBJS)\corelib_pen.o \
        $(OBJS)\corelib_popupwin.o \\r
        $(OBJS)\corelib_printdlg.o \\r
        $(OBJS)\corelib_printwin.o \\r
@@ -4047,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 \\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_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 \\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_dataobj.o \
+       $(OBJS)\corelib_dropsrc.o \
+       $(OBJS)\corelib_droptgt.o \
+       $(OBJS)\corelib_oleutils.o \
+       $(OBJS)\corelib_palette.o \
+       $(OBJS)\corelib_pen.o \
        $(OBJS)\corelib_popupwin.o \\r
        $(OBJS)\corelib_printdlg.o \\r
        $(OBJS)\corelib_printwin.o \\r
@@ -4307,49 +4311,49 @@ endif
 ifeq ($(WXUNIV),0)\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_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 \\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_aboutdlgg.o \
+       $(OBJS)\advdll_bannerwindow.o \
+       $(OBJS)\advdll_bmpcboxg.o \
+       $(OBJS)\advdll_calctrlg.o \
+       $(OBJS)\advdll_commandlinkbuttong.o \
+       $(OBJS)\advdll_datavgen.o \
        $(OBJS)\advdll_datectlg.o \\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 \\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_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 \\r
-       $(OBJS)\advdll_splash.o \\r
+       $(OBJS)\advdll_sashwin.o \
+       $(OBJS)\advdll_splash.o \
        $(OBJS)\advdll_generic_timectrl.o \
-       $(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_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 \\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_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 \
@@ -4358,49 +4362,49 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
-       $(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_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 \\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_aboutdlgg.o \
+       $(OBJS)\advdll_bannerwindow.o \
+       $(OBJS)\advdll_bmpcboxg.o \
+       $(OBJS)\advdll_calctrlg.o \
+       $(OBJS)\advdll_commandlinkbuttong.o \
+       $(OBJS)\advdll_datavgen.o \
        $(OBJS)\advdll_datectlg.o \\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 \\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_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 \\r
-       $(OBJS)\advdll_splash.o \\r
+       $(OBJS)\advdll_sashwin.o \
+       $(OBJS)\advdll_splash.o \
        $(OBJS)\advdll_generic_timectrl.o \
-       $(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_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 \\r
-       $(OBJS)\advdll_taskbar.o \\r
-       $(OBJS)\advdll_joystick.o \\r
-       $(OBJS)\advdll_animateg.o\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
+       $(OBJS)\advdll_sound.o \
+       $(OBJS)\advdll_taskbar.o \
+       $(OBJS)\advdll_joystick.o \
+       $(OBJS)\advdll_animateg.o
+endif
+ifeq ($(MONOLITHIC),0)
 ifeq ($(SHARED),0)\r
 ifeq ($(USE_GUI),1)\r
 __advlib___depname = \\r
@@ -4411,49 +4415,49 @@ endif
 ifeq ($(WXUNIV),0)\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_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 \\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_aboutdlgg.o \
+       $(OBJS)\advlib_bannerwindow.o \
+       $(OBJS)\advlib_bmpcboxg.o \
+       $(OBJS)\advlib_calctrlg.o \
+       $(OBJS)\advlib_commandlinkbuttong.o \
+       $(OBJS)\advlib_datavgen.o \
        $(OBJS)\advlib_datectlg.o \\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 \\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_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 \\r
-       $(OBJS)\advlib_splash.o \\r
+       $(OBJS)\advlib_sashwin.o \
+       $(OBJS)\advlib_splash.o \
        $(OBJS)\advlib_generic_timectrl.o \
-       $(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_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 \\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_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 \
@@ -4462,49 +4466,49 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 endif
 ifeq ($(WXUNIV),1)
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
-       $(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_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 \\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_aboutdlgg.o \
+       $(OBJS)\advlib_bannerwindow.o \
+       $(OBJS)\advlib_bmpcboxg.o \
+       $(OBJS)\advlib_calctrlg.o \
+       $(OBJS)\advlib_commandlinkbuttong.o \
+       $(OBJS)\advlib_datavgen.o \
        $(OBJS)\advlib_datectlg.o \\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 \\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_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 \\r
-       $(OBJS)\advlib_splash.o \\r
+       $(OBJS)\advlib_sashwin.o \
+       $(OBJS)\advlib_splash.o \
        $(OBJS)\advlib_generic_timectrl.o \
-       $(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_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 \\r
-       $(OBJS)\advlib_taskbar.o \\r
-       $(OBJS)\advlib_joystick.o \\r
-       $(OBJS)\advlib_animateg.o\r
-endif\r
-ifeq ($(SHARED),1)\r
+       $(OBJS)\advlib_sound.o \
+       $(OBJS)\advlib_taskbar.o \
+       $(OBJS)\advlib_joystick.o \
+       $(OBJS)\advlib_animateg.o
+endif
+ifeq ($(SHARED),1)
 ____wxadv_namedll_DEP = $(__advdll___depname)\r
 endif\r
 ifeq ($(SHARED),0)\r
@@ -6414,6 +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_timercmn.o: ../../src/common/timercmn.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -6900,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\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_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\r
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
-\r
+$(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\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_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -7179,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\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_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\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_toolb.o: ../../src/xrc/xh_toolb.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monodll_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_xh_tree.o: ../../src/xrc/xh_tree.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -7467,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)\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
+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\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
+$(OBJS)\monodll_dataobj.o: ../../src/msw/ole/dataobj.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_dropsrc.o: ../../src/msw/ole/dropsrc.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
@@ -8437,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)\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
+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\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
+$(OBJS)\monodll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_bannerwindow.o: ../../src/generic/bannerwindow.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
@@ -8532,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)\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
+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\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_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\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
+$(OBJS)\monodll_tipdlg.o: ../../src/generic/tipdlg.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_treelist.o: ../../src/generic/treelist.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
@@ -8582,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)\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
+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\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
+$(OBJS)\monodll_sound.o: ../../src/msw/sound.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_taskbar.o: ../../src/msw/taskbar.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
@@ -8816,6 +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_timercmn.o: ../../src/common/timercmn.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -9302,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\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_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\r
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
-\r
+$(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\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_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -9581,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\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_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\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_toolb.o: ../../src/xrc/xh_toolb.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\monolib_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_xh_tree.o: ../../src/xrc/xh_tree.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -9869,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)\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
+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\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
+$(OBJS)\monolib_dataobj.o: ../../src/msw/ole/dataobj.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_dropsrc.o: ../../src/msw/ole/dropsrc.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
@@ -10839,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)\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
+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\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
+$(OBJS)\monolib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_bannerwindow.o: ../../src/generic/bannerwindow.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
@@ -10934,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)\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
+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\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_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\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
+$(OBJS)\monolib_tipdlg.o: ../../src/generic/tipdlg.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_treelist.o: ../../src/generic/treelist.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
@@ -10984,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)\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
+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\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
+$(OBJS)\monolib_sound.o: ../../src/msw/sound.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_taskbar.o: ../../src/msw/taskbar.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
@@ -11218,6 +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_timercmn.o: ../../src/common/timercmn.cpp\r
        $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -11554,6 +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_timercmn.o: ../../src/common/timercmn.cpp\r
        $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -12241,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)\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
+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\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
+$(OBJS)\coredll_dataobj.o: ../../src/msw/ole/dataobj.cpp
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_dropsrc.o: ../../src/msw/ole/dropsrc.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
@@ -13649,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)\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
+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\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
+$(OBJS)\corelib_dataobj.o: ../../src/msw/ole/dataobj.cpp
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_dropsrc.o: ../../src/msw/ole/dropsrc.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
 \r
@@ -14604,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\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_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\r
-       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
-\r
+$(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\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_animatecmn.o: ../../src/common/animatecmn.cpp
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advdll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp\r
        $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -14634,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\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_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\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_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_bannerwindow.o: ../../src/generic/bannerwindow.cpp
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advdll_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp\r
        $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -14691,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\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_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\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_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\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_tipdlg.o: ../../src/generic/tipdlg.cpp
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_treelist.o: ../../src/generic/treelist.cpp
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advdll_wizard.o: ../../src/generic/wizard.cpp\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\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_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\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_sound.o: ../../src/msw/sound.cpp
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advdll_taskbar.o: ../../src/msw/taskbar.cpp
+       $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advdll_joystick.o: ../../src/msw/joystick.cpp\r
        $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -14754,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\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_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\r
-       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
-\r
+$(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\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_animatecmn.o: ../../src/common/animatecmn.cpp
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advlib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp\r
        $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -14784,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\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_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\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_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_bannerwindow.o: ../../src/generic/bannerwindow.cpp
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advlib_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp\r
        $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -14841,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\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_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\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_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\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_tipdlg.o: ../../src/generic/tipdlg.cpp
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_treelist.o: ../../src/generic/treelist.cpp
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advlib_wizard.o: ../../src/generic/wizard.cpp\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\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_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\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_sound.o: ../../src/msw/sound.cpp
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\advlib_taskbar.o: ../../src/msw/taskbar.cpp
+       $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\advlib_joystick.o: ../../src/msw/joystick.cpp\r
        $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -15324,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\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_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\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_toolb.o: ../../src/xrc/xh_toolb.cpp
+       $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\xrcdll_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp
+       $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\xrcdll_xh_tree.o: ../../src/xrc/xh_tree.cpp\r
        $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -15522,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\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_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\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_toolb.o: ../../src/xrc/xh_toolb.cpp
+       $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\xrclib_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp
+       $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\xrclib_xh_tree.o: ../../src/xrc/xh_tree.cpp\r
        $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
index 42bae81a2492b15e5f0ad3730b0ffbd6f28490a7..748e1e1eeb654334a93f5cdab709a857313d0a0a 100644 (file)
@@ -393,6 +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_timercmn.obj \\r
        $(OBJS)\monodll_timerimpl.obj \\r
        $(OBJS)\monodll_tokenzr.obj \\r
@@ -548,6 +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_timercmn.obj \\r
        $(OBJS)\monolib_timerimpl.obj \\r
        $(OBJS)\monolib_tokenzr.obj \\r
@@ -699,6 +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_timercmn.obj \\r
        $(OBJS)\basedll_timerimpl.obj \\r
        $(OBJS)\basedll_tokenzr.obj \\r
@@ -836,6 +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_timercmn.obj \\r
        $(OBJS)\baselib_timerimpl.obj \\r
        $(OBJS)\baselib_tokenzr.obj \\r
@@ -1294,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 \\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_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 \\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_xh_toolb.obj \
+       $(OBJS)\xrcdll_xh_toolbk.obj \
+       $(OBJS)\xrcdll_xh_tree.obj \
+       $(OBJS)\xrcdll_xh_treebk.obj \
+       $(OBJS)\xrcdll_xh_unkwn.obj \
+       $(OBJS)\xrcdll_xh_wizrd.obj \
        $(OBJS)\xrcdll_xmlres.obj \\r
        $(OBJS)\xrcdll_xmladv.obj \\r
        $(OBJS)\xrcdll_xmlrsall.obj\r
@@ -1374,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 \\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_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 \\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_xh_toolb.obj \
+       $(OBJS)\xrclib_xh_toolbk.obj \
+       $(OBJS)\xrclib_xh_tree.obj \
+       $(OBJS)\xrclib_xh_treebk.obj \
+       $(OBJS)\xrclib_xh_unkwn.obj \
+       $(OBJS)\xrclib_xh_wizrd.obj \
        $(OBJS)\xrclib_xmlres.obj \\r
        $(OBJS)\xrclib_xmladv.obj \\r
        $(OBJS)\xrclib_xmlrsall.obj\r
@@ -1876,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 \\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_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 \\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_xh_toolb.obj \
+       $(OBJS)\monodll_xh_toolbk.obj \
+       $(OBJS)\monodll_xh_tree.obj \
+       $(OBJS)\monodll_xh_treebk.obj \
+       $(OBJS)\monodll_xh_unkwn.obj \
+       $(OBJS)\monodll_xh_wizrd.obj \
        $(OBJS)\monodll_xmlres.obj \\r
        $(OBJS)\monodll_xmladv.obj \\r
        $(OBJS)\monodll_xmlrsall.obj \\r
@@ -1954,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\monodll_dropsrc.obj \
+       $(OBJS)\monodll_droptgt.obj \
+       $(OBJS)\monodll_oleutils.obj \
+       $(OBJS)\monodll_palette.obj \
+       $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \\r
        $(OBJS)\monodll_printdlg.obj \\r
        $(OBJS)\monodll_printwin.obj \\r
@@ -2226,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\monodll_dropsrc.obj \
+       $(OBJS)\monodll_droptgt.obj \
+       $(OBJS)\monodll_oleutils.obj \
+       $(OBJS)\monodll_palette.obj \
+       $(OBJS)\monodll_pen.obj \
        $(OBJS)\monodll_popupwin.obj \\r
        $(OBJS)\monodll_printdlg.obj \\r
        $(OBJS)\monodll_printwin.obj \\r
@@ -2471,49 +2475,49 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 !if "$(WXUNIV)" == "0"\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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\monodll_bannerwindow.obj \
+       $(OBJS)\monodll_bmpcboxg.obj \
+       $(OBJS)\monodll_calctrlg.obj \
+       $(OBJS)\monodll_commandlinkbuttong.obj \
+       $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\monodll_splash.obj \\r
+       $(OBJS)\monodll_sashwin.obj \
+       $(OBJS)\monodll_splash.obj \
        $(OBJS)\monodll_generic_timectrl.obj \
-       $(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_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 \\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_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 \
@@ -2522,49 +2526,49 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
-       $(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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\monodll_bannerwindow.obj \
+       $(OBJS)\monodll_bmpcboxg.obj \
+       $(OBJS)\monodll_calctrlg.obj \
+       $(OBJS)\monodll_commandlinkbuttong.obj \
+       $(OBJS)\monodll_datavgen.obj \
        $(OBJS)\monodll_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\monodll_splash.obj \\r
+       $(OBJS)\monodll_sashwin.obj \
+       $(OBJS)\monodll_splash.obj \
        $(OBJS)\monodll_generic_timectrl.obj \
-       $(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_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 \\r
-       $(OBJS)\monodll_taskbar.obj \\r
-       $(OBJS)\monodll_joystick.obj \\r
-       $(OBJS)\monodll_animateg.obj\r
-!endif\r
-!if "$(USE_STC)" == "1"\r
+       $(OBJS)\monodll_sound.obj \
+       $(OBJS)\monodll_taskbar.obj \
+       $(OBJS)\monodll_joystick.obj \
+       $(OBJS)\monodll_animateg.obj
+!endif
+!if "$(USE_STC)" == "1"
 __wxscintilla_library_link_DEP = $(__wxscintilla)\r
 !endif\r
 !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0"\r
@@ -2665,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 \\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_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 \\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_xh_toolb.obj \
+       $(OBJS)\monolib_xh_toolbk.obj \
+       $(OBJS)\monolib_xh_tree.obj \
+       $(OBJS)\monolib_xh_treebk.obj \
+       $(OBJS)\monolib_xh_unkwn.obj \
+       $(OBJS)\monolib_xh_wizrd.obj \
        $(OBJS)\monolib_xmlres.obj \\r
        $(OBJS)\monolib_xmladv.obj \\r
        $(OBJS)\monolib_xmlrsall.obj \\r
@@ -2743,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\monolib_dropsrc.obj \
+       $(OBJS)\monolib_droptgt.obj \
+       $(OBJS)\monolib_oleutils.obj \
+       $(OBJS)\monolib_palette.obj \
+       $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \\r
        $(OBJS)\monolib_printdlg.obj \\r
        $(OBJS)\monolib_printwin.obj \\r
@@ -3015,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\monolib_dropsrc.obj \
+       $(OBJS)\monolib_droptgt.obj \
+       $(OBJS)\monolib_oleutils.obj \
+       $(OBJS)\monolib_palette.obj \
+       $(OBJS)\monolib_pen.obj \
        $(OBJS)\monolib_popupwin.obj \\r
        $(OBJS)\monolib_printdlg.obj \\r
        $(OBJS)\monolib_printwin.obj \\r
@@ -3260,49 +3264,49 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 !if "$(WXUNIV)" == "0"\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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\monolib_bannerwindow.obj \
+       $(OBJS)\monolib_bmpcboxg.obj \
+       $(OBJS)\monolib_calctrlg.obj \
+       $(OBJS)\monolib_commandlinkbuttong.obj \
+       $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\monolib_splash.obj \\r
+       $(OBJS)\monolib_sashwin.obj \
+       $(OBJS)\monolib_splash.obj \
        $(OBJS)\monolib_generic_timectrl.obj \
-       $(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_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 \\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_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 \
@@ -3311,49 +3315,49 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
-       $(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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\monolib_bannerwindow.obj \
+       $(OBJS)\monolib_bmpcboxg.obj \
+       $(OBJS)\monolib_calctrlg.obj \
+       $(OBJS)\monolib_commandlinkbuttong.obj \
+       $(OBJS)\monolib_datavgen.obj \
        $(OBJS)\monolib_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\monolib_splash.obj \\r
+       $(OBJS)\monolib_sashwin.obj \
+       $(OBJS)\monolib_splash.obj \
        $(OBJS)\monolib_generic_timectrl.obj \
-       $(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_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 \\r
-       $(OBJS)\monolib_taskbar.obj \\r
-       $(OBJS)\monolib_joystick.obj \\r
-       $(OBJS)\monolib_animateg.obj\r
-!endif\r
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"\r
+       $(OBJS)\monolib_sound.obj \
+       $(OBJS)\monolib_taskbar.obj \
+       $(OBJS)\monolib_joystick.obj \
+       $(OBJS)\monolib_animateg.obj
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
 __basedll___depname = \\r
        $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll\r
 !endif\r
@@ -3475,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\coredll_dropsrc.obj \
+       $(OBJS)\coredll_droptgt.obj \
+       $(OBJS)\coredll_oleutils.obj \
+       $(OBJS)\coredll_palette.obj \
+       $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \\r
        $(OBJS)\coredll_printdlg.obj \\r
        $(OBJS)\coredll_printwin.obj \\r
@@ -3747,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\coredll_dropsrc.obj \
+       $(OBJS)\coredll_droptgt.obj \
+       $(OBJS)\coredll_oleutils.obj \
+       $(OBJS)\coredll_palette.obj \
+       $(OBJS)\coredll_pen.obj \
        $(OBJS)\coredll_popupwin.obj \\r
        $(OBJS)\coredll_printdlg.obj \\r
        $(OBJS)\coredll_printwin.obj \\r
@@ -4023,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\corelib_dropsrc.obj \
+       $(OBJS)\corelib_droptgt.obj \
+       $(OBJS)\corelib_oleutils.obj \
+       $(OBJS)\corelib_palette.obj \
+       $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \\r
        $(OBJS)\corelib_printdlg.obj \\r
        $(OBJS)\corelib_printwin.obj \\r
@@ -4295,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 \\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_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 \\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_dataobj.obj \
+       $(OBJS)\corelib_dropsrc.obj \
+       $(OBJS)\corelib_droptgt.obj \
+       $(OBJS)\corelib_oleutils.obj \
+       $(OBJS)\corelib_palette.obj \
+       $(OBJS)\corelib_pen.obj \
        $(OBJS)\corelib_popupwin.obj \\r
        $(OBJS)\corelib_printdlg.obj \\r
        $(OBJS)\corelib_printwin.obj \\r
@@ -4568,49 +4572,49 @@ __RUNTIME_LIBS_240 = $(__THREADSFLAG)
 !if "$(WXUNIV)" == "0"\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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\advdll_bannerwindow.obj \
+       $(OBJS)\advdll_bmpcboxg.obj \
+       $(OBJS)\advdll_calctrlg.obj \
+       $(OBJS)\advdll_commandlinkbuttong.obj \
+       $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\advdll_splash.obj \\r
+       $(OBJS)\advdll_sashwin.obj \
+       $(OBJS)\advdll_splash.obj \
        $(OBJS)\advdll_generic_timectrl.obj \
-       $(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_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 \\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_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 \
@@ -4619,49 +4623,49 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
-       $(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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\advdll_bannerwindow.obj \
+       $(OBJS)\advdll_bmpcboxg.obj \
+       $(OBJS)\advdll_calctrlg.obj \
+       $(OBJS)\advdll_commandlinkbuttong.obj \
+       $(OBJS)\advdll_datavgen.obj \
        $(OBJS)\advdll_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\advdll_splash.obj \\r
+       $(OBJS)\advdll_sashwin.obj \
+       $(OBJS)\advdll_splash.obj \
        $(OBJS)\advdll_generic_timectrl.obj \
-       $(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_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 \\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
+       $(OBJS)\advdll_sound.obj \
+       $(OBJS)\advdll_taskbar.obj \
+       $(OBJS)\advdll_joystick.obj \
+       $(OBJS)\advdll_animateg.obj
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1"
 __advlib___depname = \\r
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
 !endif\r
@@ -4674,49 +4678,49 @@ __RUNTIME_LIBS_255 = $(__THREADSFLAG)
 !if "$(WXUNIV)" == "0"\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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\advlib_bannerwindow.obj \
+       $(OBJS)\advlib_bmpcboxg.obj \
+       $(OBJS)\advlib_calctrlg.obj \
+       $(OBJS)\advlib_commandlinkbuttong.obj \
+       $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\advlib_splash.obj \\r
+       $(OBJS)\advlib_sashwin.obj \
+       $(OBJS)\advlib_splash.obj \
        $(OBJS)\advlib_generic_timectrl.obj \
-       $(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_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 \\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_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 \
@@ -4725,49 +4729,49 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 !endif
 !if "$(WXUNIV)" == "1"
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
-       $(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_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 \\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_aboutdlgg.obj \
+       $(OBJS)\advlib_bannerwindow.obj \
+       $(OBJS)\advlib_bmpcboxg.obj \
+       $(OBJS)\advlib_calctrlg.obj \
+       $(OBJS)\advlib_commandlinkbuttong.obj \
+       $(OBJS)\advlib_datavgen.obj \
        $(OBJS)\advlib_datectlg.obj \\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 \\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_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 \\r
-       $(OBJS)\advlib_splash.obj \\r
+       $(OBJS)\advlib_sashwin.obj \
+       $(OBJS)\advlib_splash.obj \
        $(OBJS)\advlib_generic_timectrl.obj \
-       $(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_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 \\r
-       $(OBJS)\advlib_taskbar.obj \\r
-       $(OBJS)\advlib_joystick.obj \\r
-       $(OBJS)\advlib_animateg.obj\r
-!endif\r
-!if "$(SHARED)" == "1"\r
+       $(OBJS)\advlib_sound.obj \
+       $(OBJS)\advlib_taskbar.obj \
+       $(OBJS)\advlib_joystick.obj \
+       $(OBJS)\advlib_animateg.obj
+!endif
+!if "$(SHARED)" == "1"
 ____wxadv_namedll_DEP = $(__advdll___depname)\r
 !endif\r
 !if "$(SHARED)" == "0"\r
@@ -6852,6 +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_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r
@@ -7338,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\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_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\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
-\r
+$(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\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_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
+
+$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
+
 $(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp\r
 \r
@@ -7617,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\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_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\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_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\monodll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
 \r
@@ -7905,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"\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
+!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\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
+$(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
 !endif\r
 \r
@@ -8875,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"\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
+!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\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
+$(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp\r
 !endif\r
 \r
@@ -8970,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"\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
+!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\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_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\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
+$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treelist.cpp\r
 !endif\r
 \r
@@ -9020,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"\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
+!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\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
+$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp\r
 !endif\r
 \r
@@ -9254,6 +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_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r
@@ -9740,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\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_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\r
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
-\r
+$(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\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_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
+
+$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp
+
 $(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp\r
 \r
@@ -10019,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\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_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\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_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\monolib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
 \r
@@ -10307,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"\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
+!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\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
+$(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
 !endif\r
 \r
@@ -11277,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"\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
+!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\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
+$(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp\r
 !endif\r
 \r
@@ -11372,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"\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
+!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\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_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\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
+$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp\r
 !endif\r
 \r
@@ -11422,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"\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
+!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\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
+$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp\r
 !endif\r
 \r
@@ -11656,6 +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_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r
@@ -11992,6 +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_timercmn.obj: ..\..\src\common\timercmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp\r
 \r
@@ -12679,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"\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
+!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\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
+$(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
 !endif\r
 \r
@@ -14087,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"\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
+!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\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
+$(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp\r
 !endif\r
 \r
@@ -15042,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\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_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\r
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
-\r
+$(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\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_animatecmn.obj: ..\..\src\common\animatecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
+
+$(OBJS)\advdll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+
 $(OBJS)\advdll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
 \r
@@ -15072,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\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_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\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_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+
+$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
+
 $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp\r
 \r
@@ -15129,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\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_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\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_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\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_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+
+$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp
+
 $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp\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\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_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\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_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp
+
+$(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+
 $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp\r
 \r
@@ -15192,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\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_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\r
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp\r
-\r
+$(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\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_animatecmn.obj: ..\..\src\common\animatecmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
+
+$(OBJS)\advlib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+
 $(OBJS)\advlib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp\r
 \r
@@ -15222,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\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_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\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_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp
+
+$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp
+
 $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp\r
 \r
@@ -15279,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\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_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\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_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\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_tipdlg.obj: ..\..\src\generic\tipdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp
+
+$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp
+
 $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp\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\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_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\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_sound.obj: ..\..\src\msw\sound.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp
+
+$(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp
+
 $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp\r
 \r
@@ -15762,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\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_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\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_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\xrcdll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
 \r
@@ -15960,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\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_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\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_toolb.obj: ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp
+
+$(OBJS)\xrclib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp
+
 $(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp\r
 \r
index 60ca3f5095810ff0d10dc27ffe90ff3502bdabc7..86026d18176aabf6ef64591428c9c72351516d28 100644 (file)
@@ -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 &\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_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 &\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_xh_toolb.obj &
+       $(OBJS)\monodll_xh_toolbk.obj &
+       $(OBJS)\monodll_xh_tree.obj &
+       $(OBJS)\monodll_xh_treebk.obj &
+       $(OBJS)\monodll_xh_unkwn.obj &
+       $(OBJS)\monodll_xh_wizrd.obj &
        $(OBJS)\monodll_xmlres.obj &\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 &\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_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 &\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_dataobj.obj &
+       $(OBJS)\monodll_dropsrc.obj &
+       $(OBJS)\monodll_droptgt.obj &
+       $(OBJS)\monodll_oleutils.obj &
+       $(OBJS)\monodll_palette.obj &
+       $(OBJS)\monodll_pen.obj &
        $(OBJS)\monodll_popupwin.obj &\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 &\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_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 &\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_dataobj.obj &
+       $(OBJS)\monodll_dropsrc.obj &
+       $(OBJS)\monodll_droptgt.obj &
+       $(OBJS)\monodll_oleutils.obj &
+       $(OBJS)\monodll_palette.obj &
+       $(OBJS)\monodll_pen.obj &
        $(OBJS)\monodll_popupwin.obj &\r
        $(OBJS)\monodll_printdlg.obj &\r
        $(OBJS)\monodll_printwin.obj &\r
@@ -790,49 +790,49 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =
 !ifeq WXUNIV 0\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_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 &\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_aboutdlgg.obj &
+       $(OBJS)\monodll_bannerwindow.obj &
+       $(OBJS)\monodll_bmpcboxg.obj &
+       $(OBJS)\monodll_calctrlg.obj &
+       $(OBJS)\monodll_commandlinkbuttong.obj &
+       $(OBJS)\monodll_datavgen.obj &
        $(OBJS)\monodll_datectlg.obj &\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 &\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_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 &\r
-       $(OBJS)\monodll_splash.obj &\r
+       $(OBJS)\monodll_sashwin.obj &
+       $(OBJS)\monodll_splash.obj &
        $(OBJS)\monodll_generic_timectrl.obj &
-       $(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_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 &\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_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 &
@@ -841,49 +841,49 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
-       $(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_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 &\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_aboutdlgg.obj &
+       $(OBJS)\monodll_bannerwindow.obj &
+       $(OBJS)\monodll_bmpcboxg.obj &
+       $(OBJS)\monodll_calctrlg.obj &
+       $(OBJS)\monodll_commandlinkbuttong.obj &
+       $(OBJS)\monodll_datavgen.obj &
        $(OBJS)\monodll_datectlg.obj &\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 &\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_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 &\r
-       $(OBJS)\monodll_splash.obj &\r
+       $(OBJS)\monodll_sashwin.obj &
+       $(OBJS)\monodll_splash.obj &
        $(OBJS)\monodll_generic_timectrl.obj &
-       $(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_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 &\r
-       $(OBJS)\monodll_taskbar.obj &\r
-       $(OBJS)\monodll_joystick.obj &\r
-       $(OBJS)\monodll_animateg.obj\r
-!endif\r
-__wxscintilla_library_link_DEP =\r
+       $(OBJS)\monodll_sound.obj &
+       $(OBJS)\monodll_taskbar.obj &
+       $(OBJS)\monodll_joystick.obj &
+       $(OBJS)\monodll_animateg.obj
+!endif
+__wxscintilla_library_link_DEP =
 !ifeq USE_STC 1\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 &\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_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 &\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_xh_toolb.obj &
+       $(OBJS)\monolib_xh_toolbk.obj &
+       $(OBJS)\monolib_xh_tree.obj &
+       $(OBJS)\monolib_xh_treebk.obj &
+       $(OBJS)\monolib_xh_unkwn.obj &
+       $(OBJS)\monolib_xh_wizrd.obj &
        $(OBJS)\monolib_xmlres.obj &\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 &\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_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 &\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_dataobj.obj &
+       $(OBJS)\monolib_dropsrc.obj &
+       $(OBJS)\monolib_droptgt.obj &
+       $(OBJS)\monolib_oleutils.obj &
+       $(OBJS)\monolib_palette.obj &
+       $(OBJS)\monolib_pen.obj &
        $(OBJS)\monolib_popupwin.obj &\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 &\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_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 &\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_dataobj.obj &
+       $(OBJS)\monolib_dropsrc.obj &
+       $(OBJS)\monolib_droptgt.obj &
+       $(OBJS)\monolib_oleutils.obj &
+       $(OBJS)\monolib_palette.obj &
+       $(OBJS)\monolib_pen.obj &
        $(OBJS)\monolib_popupwin.obj &\r
        $(OBJS)\monolib_printdlg.obj &\r
        $(OBJS)\monolib_printwin.obj &\r
@@ -1584,49 +1584,49 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =
 !ifeq WXUNIV 0\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_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 &\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_aboutdlgg.obj &
+       $(OBJS)\monolib_bannerwindow.obj &
+       $(OBJS)\monolib_bmpcboxg.obj &
+       $(OBJS)\monolib_calctrlg.obj &
+       $(OBJS)\monolib_commandlinkbuttong.obj &
+       $(OBJS)\monolib_datavgen.obj &
        $(OBJS)\monolib_datectlg.obj &\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 &\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_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 &\r
-       $(OBJS)\monolib_splash.obj &\r
+       $(OBJS)\monolib_sashwin.obj &
+       $(OBJS)\monolib_splash.obj &
        $(OBJS)\monolib_generic_timectrl.obj &
-       $(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_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 &\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_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 &
@@ -1635,49 +1635,49 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
-       $(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_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 &\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_aboutdlgg.obj &
+       $(OBJS)\monolib_bannerwindow.obj &
+       $(OBJS)\monolib_bmpcboxg.obj &
+       $(OBJS)\monolib_calctrlg.obj &
+       $(OBJS)\monolib_commandlinkbuttong.obj &
+       $(OBJS)\monolib_datavgen.obj &
        $(OBJS)\monolib_datectlg.obj &\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 &\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_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 &\r
-       $(OBJS)\monolib_splash.obj &\r
+       $(OBJS)\monolib_sashwin.obj &
+       $(OBJS)\monolib_splash.obj &
        $(OBJS)\monolib_generic_timectrl.obj &
-       $(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_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 &\r
-       $(OBJS)\monolib_taskbar.obj &\r
-       $(OBJS)\monolib_joystick.obj &\r
-       $(OBJS)\monolib_animateg.obj\r
-!endif\r
-__basedll___depname =\r
+       $(OBJS)\monolib_sound.obj &
+       $(OBJS)\monolib_taskbar.obj &
+       $(OBJS)\monolib_joystick.obj &
+       $(OBJS)\monolib_animateg.obj
+!endif
+__basedll___depname =
 !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 &\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_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 &\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_dataobj.obj &
+       $(OBJS)\coredll_dropsrc.obj &
+       $(OBJS)\coredll_droptgt.obj &
+       $(OBJS)\coredll_oleutils.obj &
+       $(OBJS)\coredll_palette.obj &
+       $(OBJS)\coredll_pen.obj &
        $(OBJS)\coredll_popupwin.obj &\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 &\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_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 &\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_dataobj.obj &
+       $(OBJS)\coredll_dropsrc.obj &
+       $(OBJS)\coredll_droptgt.obj &
+       $(OBJS)\coredll_oleutils.obj &
+       $(OBJS)\coredll_palette.obj &
+       $(OBJS)\coredll_pen.obj &
        $(OBJS)\coredll_popupwin.obj &\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 &\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_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 &\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_dataobj.obj &
+       $(OBJS)\corelib_dropsrc.obj &
+       $(OBJS)\corelib_droptgt.obj &
+       $(OBJS)\corelib_oleutils.obj &
+       $(OBJS)\corelib_palette.obj &
+       $(OBJS)\corelib_pen.obj &
        $(OBJS)\corelib_popupwin.obj &\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 &\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_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 &\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_dataobj.obj &
+       $(OBJS)\corelib_dropsrc.obj &
+       $(OBJS)\corelib_droptgt.obj &
+       $(OBJS)\corelib_oleutils.obj &
+       $(OBJS)\corelib_palette.obj &
+       $(OBJS)\corelib_pen.obj &
        $(OBJS)\corelib_popupwin.obj &\r
        $(OBJS)\corelib_printdlg.obj &\r
        $(OBJS)\corelib_printwin.obj &\r
@@ -2846,49 +2846,49 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =
 !ifeq WXUNIV 0\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_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 &\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_aboutdlgg.obj &
+       $(OBJS)\advdll_bannerwindow.obj &
+       $(OBJS)\advdll_bmpcboxg.obj &
+       $(OBJS)\advdll_calctrlg.obj &
+       $(OBJS)\advdll_commandlinkbuttong.obj &
+       $(OBJS)\advdll_datavgen.obj &
        $(OBJS)\advdll_datectlg.obj &\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 &\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_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 &\r
-       $(OBJS)\advdll_splash.obj &\r
+       $(OBJS)\advdll_sashwin.obj &
+       $(OBJS)\advdll_splash.obj &
        $(OBJS)\advdll_generic_timectrl.obj &
-       $(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_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 &\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_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 &
@@ -2897,49 +2897,49 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
-       $(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_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 &\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_aboutdlgg.obj &
+       $(OBJS)\advdll_bannerwindow.obj &
+       $(OBJS)\advdll_bmpcboxg.obj &
+       $(OBJS)\advdll_calctrlg.obj &
+       $(OBJS)\advdll_commandlinkbuttong.obj &
+       $(OBJS)\advdll_datavgen.obj &
        $(OBJS)\advdll_datectlg.obj &\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 &\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_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 &\r
-       $(OBJS)\advdll_splash.obj &\r
+       $(OBJS)\advdll_sashwin.obj &
+       $(OBJS)\advdll_splash.obj &
        $(OBJS)\advdll_generic_timectrl.obj &
-       $(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_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 &\r
-       $(OBJS)\advdll_taskbar.obj &\r
-       $(OBJS)\advdll_joystick.obj &\r
-       $(OBJS)\advdll_animateg.obj\r
-!endif\r
-__advlib___depname =\r
+       $(OBJS)\advdll_sound.obj &
+       $(OBJS)\advdll_taskbar.obj &
+       $(OBJS)\advdll_joystick.obj &
+       $(OBJS)\advdll_animateg.obj
+!endif
+__advlib___depname =
 !ifeq MONOLITHIC 0\r
 !ifeq SHARED 0\r
 !ifeq USE_GUI 1\r
@@ -2952,49 +2952,49 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =
 !ifeq WXUNIV 0\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_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 &\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_aboutdlgg.obj &
+       $(OBJS)\advlib_bannerwindow.obj &
+       $(OBJS)\advlib_bmpcboxg.obj &
+       $(OBJS)\advlib_calctrlg.obj &
+       $(OBJS)\advlib_commandlinkbuttong.obj &
+       $(OBJS)\advlib_datavgen.obj &
        $(OBJS)\advlib_datectlg.obj &\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 &\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_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 &\r
-       $(OBJS)\advlib_splash.obj &\r
+       $(OBJS)\advlib_sashwin.obj &
+       $(OBJS)\advlib_splash.obj &
        $(OBJS)\advlib_generic_timectrl.obj &
-       $(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_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 &\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_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 &
@@ -3003,49 +3003,49 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
 !endif
 !ifeq WXUNIV 1
 ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
-       $(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_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 &\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_aboutdlgg.obj &
+       $(OBJS)\advlib_bannerwindow.obj &
+       $(OBJS)\advlib_bmpcboxg.obj &
+       $(OBJS)\advlib_calctrlg.obj &
+       $(OBJS)\advlib_commandlinkbuttong.obj &
+       $(OBJS)\advlib_datavgen.obj &
        $(OBJS)\advlib_datectlg.obj &\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 &\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_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 &\r
-       $(OBJS)\advlib_splash.obj &\r
+       $(OBJS)\advlib_sashwin.obj &
+       $(OBJS)\advlib_splash.obj &
        $(OBJS)\advlib_generic_timectrl.obj &
-       $(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_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 &\r
-       $(OBJS)\advlib_taskbar.obj &\r
-       $(OBJS)\advlib_joystick.obj &\r
-       $(OBJS)\advlib_animateg.obj\r
-!endif\r
-____wxadv_namedll_DEP =\r
+       $(OBJS)\advlib_sound.obj &
+       $(OBJS)\advlib_taskbar.obj &
+       $(OBJS)\advlib_joystick.obj &
+       $(OBJS)\advlib_animateg.obj
+!endif
+____wxadv_namedll_DEP =
 !ifeq SHARED 1\r
 ____wxadv_namedll_DEP = $(__advdll___depname)\r
 !endif\r
@@ -3911,6 +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_timercmn.obj &\r
        $(OBJS)\monodll_timerimpl.obj &\r
        $(OBJS)\monodll_tokenzr.obj &\r
@@ -4058,6 +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_timercmn.obj &\r
        $(OBJS)\monolib_timerimpl.obj &\r
        $(OBJS)\monolib_tokenzr.obj &\r
@@ -4203,6 +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_timercmn.obj &\r
        $(OBJS)\basedll_timerimpl.obj &\r
        $(OBJS)\basedll_tokenzr.obj &\r
@@ -4333,6 +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_timercmn.obj &\r
        $(OBJS)\baselib_timerimpl.obj &\r
        $(OBJS)\baselib_tokenzr.obj &\r
@@ -4732,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 &\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_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 &\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_xh_toolb.obj &
+       $(OBJS)\xrcdll_xh_toolbk.obj &
+       $(OBJS)\xrcdll_xh_tree.obj &
+       $(OBJS)\xrcdll_xh_treebk.obj &
+       $(OBJS)\xrcdll_xh_unkwn.obj &
+       $(OBJS)\xrcdll_xh_wizrd.obj &
        $(OBJS)\xrcdll_xmlres.obj &\r
        $(OBJS)\xrcdll_xmladv.obj &\r
        $(OBJS)\xrcdll_xmlrsall.obj\r
@@ -4808,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 &\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_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 &\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_xh_toolb.obj &
+       $(OBJS)\xrclib_xh_toolbk.obj &
+       $(OBJS)\xrclib_xh_tree.obj &
+       $(OBJS)\xrclib_xh_treebk.obj &
+       $(OBJS)\xrclib_xh_unkwn.obj &
+       $(OBJS)\xrclib_xh_wizrd.obj &
        $(OBJS)\xrclib_xmlres.obj &\r
        $(OBJS)\xrclib_xmladv.obj &\r
        $(OBJS)\xrclib_xmlrsall.obj\r
@@ -6685,6 +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_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
@@ -7171,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\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_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\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
-\r
+$(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\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_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_mediactrl_am.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_mediactrl_wmp10.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
@@ -7450,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\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_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\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_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
+$(OBJS)\monodll_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
@@ -7738,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\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
+!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\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
+$(OBJS)\monodll_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
@@ -8708,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\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
+!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\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
+$(OBJS)\monodll_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
@@ -8803,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\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
+!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\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_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\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
+$(OBJS)\monodll_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
@@ -8853,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\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
+!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\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
+$(OBJS)\monodll_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
 \r
@@ -9087,6 +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_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
@@ -9573,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\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_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\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
-\r
+$(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\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_mediactrlcmn.obj :  .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_mediactrl_am.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_mediactrl_wmp10.obj :  .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
@@ -9852,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\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_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\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_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
+$(OBJS)\monolib_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
@@ -10140,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\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
+!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\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
+$(OBJS)\monolib_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
@@ -11110,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\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
+!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\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
+$(OBJS)\monolib_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
@@ -11205,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\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
+!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\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_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\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
+$(OBJS)\monolib_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
@@ -11255,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\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
+!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\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
+$(OBJS)\monolib_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monolib_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
 \r
@@ -11489,6 +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_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $<\r
 \r
@@ -11825,6 +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_timercmn.obj :  .AUTODEPEND ..\..\src\common\timercmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $<\r
 \r
@@ -12512,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\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
+!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\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
+$(OBJS)\coredll_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\coredll_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
 \r
@@ -13920,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\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
+!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\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
+$(OBJS)\corelib_dataobj.obj :  .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\corelib_dropsrc.obj :  .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
 \r
@@ -14875,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\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_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\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
-\r
+$(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\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_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_bmpcboxcmn.obj :  .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
 \r
@@ -14905,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\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_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\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_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
 \r
@@ -14962,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\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_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\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_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\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_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp\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\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_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\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_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
+$(OBJS)\advdll_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
 $(OBJS)\advdll_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<\r
 \r
@@ -15025,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\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_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\r
-       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
-\r
+$(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\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_animatecmn.obj :  .AUTODEPEND ..\..\src\common\animatecmn.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_bmpcboxcmn.obj :  .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_calctrlcmn.obj :  .AUTODEPEND ..\..\src\common\calctrlcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
 \r
@@ -15055,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\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_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\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_aboutdlgg.obj :  .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_bannerwindow.obj :  .AUTODEPEND ..\..\src\generic\bannerwindow.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_bmpcboxg.obj :  .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
 \r
@@ -15112,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\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_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\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_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\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_tipdlg.obj :  .AUTODEPEND ..\..\src\generic\tipdlg.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_treelist.obj :  .AUTODEPEND ..\..\src\generic\treelist.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_wizard.obj :  .AUTODEPEND ..\..\src\generic\wizard.cpp\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\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_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\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_sound.obj :  .AUTODEPEND ..\..\src\msw\sound.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
+$(OBJS)\advlib_taskbar.obj :  .AUTODEPEND ..\..\src\msw\taskbar.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
 $(OBJS)\advlib_joystick.obj :  .AUTODEPEND ..\..\src\msw\joystick.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<\r
 \r
@@ -15595,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\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_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\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_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
+$(OBJS)\xrcdll_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
 $(OBJS)\xrcdll_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<\r
 \r
@@ -15793,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\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_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\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_toolb.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
+$(OBJS)\xrclib_xh_toolbk.obj :  .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
 $(OBJS)\xrclib_xh_tree.obj :  .AUTODEPEND ..\..\src\xrc\xh_tree.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<\r
 \r
index d9445c26070886cef8385140e90c10f35d7da5b6..8c23b15b10dd1044f5a0624cd11f651cd8fdb463 100644 (file)
@@ -272,22 +272,22 @@ SOURCE=..\..\src\common\gridcmn.cpp
 \r
 SOURCE=..\..\src\common\hyperlnkcmn.cpp\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\common\odcombocmn.cpp\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# End Group\r
-# Begin Group "MSW Sources"\r
-\r
-# PROP Default_Filter ""\r
+SOURCE=..\..\src\common\taskbarcmn.cpp
+# End Source File
+# End Group
+# Begin Group "MSW Sources"
+
+# PROP Default_Filter ""
 # Begin Source File\r
 \r
 SOURCE=..\..\src\msw\aboutdlg.cpp\r
@@ -463,12 +463,12 @@ SOURCE=..\..\src\msw\datectrl.cpp
 \r
 !ELSEIF  "$(CFG)" == "adv - Win32 Debug"\r
 \r
-\r
-!ENDIF\r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\datetimectrl.cpp
 
 !IF  "$(CFG)" == "adv - Win32 DLL Universal Release"
@@ -504,12 +504,12 @@ SOURCE=..\..\src\msw\datetimectrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\hyperlink.cpp\r
-\r
-!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
+SOURCE=..\..\src\msw\hyperlink.cpp
+
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
 !ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"\r
 \r
 # PROP Exclude_From_Build 1\r
@@ -541,24 +541,24 @@ SOURCE=..\..\src\msw\hyperlink.cpp
 \r
 SOURCE=..\..\src\msw\joystick.cpp\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\msw\notifmsg.cpp\r
-# End Source File\r
-# Begin Source File\r
-\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\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\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"
@@ -594,12 +594,12 @@ SOURCE=..\..\src\msw\timectrl.cpp
 # End Source File
 # Begin Source File
 
-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
+SOURCE=..\..\src\msw\version.rc
+
+!IF  "$(CFG)" == "adv - Win32 DLL Universal Release"
+
+
+!ELSEIF  "$(CFG)" == "adv - Win32 DLL Universal Debug"
 \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\r
-\r
-SOURCE=..\..\src\generic\propdlg.cpp\r
-# End Source File\r
-# Begin Source File\r
-\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\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\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\generic\treelist.cpp\r
-# End Source File\r
+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\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\r
-\r
-SOURCE=..\..\include\wx\msw\datectrl.h\r
-# End Source File\r
-# Begin Source File\r
-\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\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
+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
 \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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\msw\taskbar.h\r
-# End Source File\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\r
-# Begin Group "Generic Headers"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
+# End Group
+# Begin Group "Generic Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
 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\r
-\r
-SOURCE=..\..\include\wx\generic\splash.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# End Group\r
-# Begin Group "Common Headers"\r
-\r
-# PROP Default_Filter ""\r
+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\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\r
-\r
-SOURCE=..\..\include\wx\dateevt.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\dvrenderers.h\r
-# End Source File\r
+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\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\r
-\r
-SOURCE=..\..\include\wx\propdlg.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\sound.h\r
-# End Source File\r
+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\splash.h\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\taskbar.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\treelist.h\r
-# End Source File\r
+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\wizard.h\r
index 88e1fd1665e8e76a977568287f27a8569a9f4ff6..c00ef57ce88f49555e88a8f5c5cc897b53b0d935 100644 (file)
@@ -531,6 +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\timercmn.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -1225,22 +1229,22 @@ SOURCE=..\..\include\wx\dynload.h
 \r
 SOURCE=..\..\include\wx\encconv.h\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\event.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\except.h\r
-# End Source File\r
+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\features.h\r
@@ -1563,6 +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\timer.h\r
 # End Source File\r
 # Begin Source File\r
index d027ce89a475337232ac49d40ed0bac596c9d1c7..7cd78d10d848e27003cb3ce6aacffa68ab43dd64 100644 (file)
@@ -2028,22 +2028,22 @@ SOURCE=..\..\src\msw\nativewin.cpp
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
-\r
-!ENDIF\r
-\r
-# End Source File\r
-# Begin Source File\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\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
+SOURCE=..\..\src\msw\notebook.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
 !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\r
-\r
-SOURCE=..\..\include\wx\msw\cursor.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\msw\ole\dataobj.h\r
-# End Source File\r
+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\ole\dataobj2.h\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\msw\datectrl.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\msw\dcclient.h\r
-# End Source File\r
+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\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\r
-\r
-SOURCE=..\..\include\wx\msw\msvcrt.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\msw\notifmsg.h\r
-# End Source File\r
+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\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\r
-\r
-SOURCE=..\..\include\wx\msw\tglbtn.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\msw\tooltip.h\r
-# End Source File\r
+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\toplevel.h\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\r
-\r
-SOURCE=..\..\include\wx\generic\ctrlsub.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\generic\datectrl.h\r
-# End Source File\r
+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\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\r
-\r
-SOURCE=..\..\include\wx\generic\textdlgg.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\generic\wizard.h\r
-# End Source File\r
+SOURCE=..\..\include\wx\generic\treectlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\wizard.h
+# End Source File
 # 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\r
-\r
-SOURCE=..\..\include\wx\univ\control.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\univ\frame.h\r
-# End Source File\r
+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\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\r
-\r
-SOURCE=..\..\include\wx\cursor.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\dataview.h\r
-# End Source File\r
+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\datectrl.h\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\dateevt.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\dcbuffer.h\r
-# End Source File\r
+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\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\r
-\r
-SOURCE=..\..\include\wx\richtext\richtextxml.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\scopeguard.h\r
-# End Source File\r
+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\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\r
-\r
-SOURCE=..\..\include\wx\tglbtn.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\tipwin.h\r
-# End Source File\r
+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\ribbon\toolbar.h\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\r
-\r
-SOURCE=..\..\include\wx\xrc\xh_tglbtn.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\xrc\xh_toolbk.h\r
-# End Source File\r
+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_tree.h\r
index 5f8489eecad23247ef389e1b6c640a3df9e1a772..0c8e869b8bde14dfea8179ad68244b5033cf4b50 100644 (file)
                                RelativePath="..\..\src\common\gridcmn.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\common\hyperlnkcmn.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\common\odcombocmn.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">\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="MSW Sources"\r
-                       UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">\r
+                               RelativePath="..\..\src\common\taskbarcmn.cpp">
+                       </File>
+               </Filter>
+               <Filter
+                       Name="MSW Sources"
+                       UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">
                        <File\r
                                RelativePath="..\..\src\msw\aboutdlg.cpp">\r
                        </File>\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
+                                       ExcludedFromBuild="TRUE"/>
+                               <FileConfiguration
+                                       Name="DLL Universal Release|Win32"
+                                       ExcludedFromBuild="TRUE"/>
+                       </File>
+                       <File
                                RelativePath="..\..\src\msw\datetimectrl.cpp">
                                <FileConfiguration
                                        Name="Universal Debug|Win32"
                                        ExcludedFromBuild="TRUE"/>
                        </File>
                        <File
-                               RelativePath="..\..\src\msw\hyperlink.cpp">\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
+                               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 Debug|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\joystick.cpp">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\msw\notifmsg.cpp">
+                       </File>
+                       <File
                                RelativePath="..\..\src\msw\richtooltip.cpp">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\src\msw\sound.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\taskbar.cpp">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\src\msw\sound.cpp">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\msw\taskbar.cpp">
+                       </File>
+                       <File
                                RelativePath="..\..\src\msw\timectrl.cpp">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                        ExcludedFromBuild="TRUE"/>
                        </File>
                        <File
-                               RelativePath="..\..\src\msw\version.rc">\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                               RelativePath="..\..\src\msw\version.rc">
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="TRUE"/>
+                               <FileConfiguration
+                                       Name="Release|Win32"
                                        ExcludedFromBuild="TRUE"/>\r
                                <FileConfiguration\r
                                        Name="Universal Debug|Win32"\r
                                RelativePath="..\..\src\generic\notifmsgg.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\generic\odcombo.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\propdlg.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">
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\src\generic\sashwin.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\splash.cpp">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\src\generic\sashwin.cpp">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\generic\splash.cpp">
+                       </File>
+                       <File
                                RelativePath="..\..\src\generic\timectrl.cpp">
                                <FileConfiguration
                                        Name="Debug|Win32">
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\src\generic\tipdlg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\treelist.cpp">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\src\generic\tipdlg.cpp">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\generic\treelist.cpp">
+                       </File>
+                       <File
                                RelativePath="..\..\src\generic\wizard.cpp">\r
                        </File>\r
                </Filter>\r
                                RelativePath="..\..\include\wx\msw\calctrl.h">\r
                        </File>\r
                        <File\r
-                               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\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">\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                               RelativePath="..\..\include\wx\msw\genrcdefs.h">
+                               <FileConfiguration
+                                       Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
                                                Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
                                                AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\notifmsg.h">\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\sound.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\taskbar.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>\r
-               <Filter\r
-                       Name="Generic Headers"\r
-                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\aboutdlgg.h">\r
+               </Filter>
+               <Filter
+                       Name="Generic Headers"
+                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">
+                       <File
+                               RelativePath="..\..\include\wx\generic\aboutdlgg.h">
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\animate.h">\r
                                RelativePath="..\..\include\wx\generic\propdlg.h">\r
                        </File>\r
                        <File\r
-                               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\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">\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Common Headers"\r
-                       UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">\r
+                               RelativePath="..\..\include\wx\generic\wizard.h">
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Common Headers"
+                       UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
                        <File\r
                                RelativePath="..\..\include\wx\aboutdlg.h">\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\datectrl.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\dateevt.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\datetimectrl.h">
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\dcbuffer.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\dvrenderers.h">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\include\wx\dcbuffer.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\dvrenderers.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\editlbox.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\notifmsg.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\odcombo.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\propdlg.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">\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\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">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\treelist.h">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\include\wx\tipdlg.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\treelist.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\wizard.h">\r
                        </File>\r
                </Filter>\r
index cf6c2e6d2ae2fe487f2fa1fa69d57a4e0833994d..d00673452a894400799a34bd8cd3a08025258a30 100644 (file)
                                RelativePath="..\..\src\common\textfile.cpp">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\src\common\time.cpp">
+                       </File>
+                       <File
                                RelativePath="..\..\src\common\timercmn.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\dynload.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\encconv.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\event.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">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\except.h">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\include\wx\evtloop.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\except.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\features.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\thread.h">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\include\wx\time.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\timer.h">\r
                        </File>\r
                        <File\r
index 70196ca4b67d25a9de43acae69e11c10cfa505f8..319379098d5d472757f46ff7d827db09266336b5 100644 (file)
                                        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
+                                       ExcludedFromBuild="TRUE"/>
+                               <FileConfiguration
+                                       Name="DLL Universal Release|Win32"
+                                       ExcludedFromBuild="TRUE"/>
+                       </File>
+                       <File
                                RelativePath="..\..\src\msw\nonownedwnd.cpp">
                        </File>
                        <File
-                               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
+                               RelativePath="..\..\src\msw\notebook.cpp">
+                               <FileConfiguration
+                                       Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               ObjectFile="vc_mswud\core\msw_notebook.obj"/>
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="Release|Win32">\r
                                RelativePath="..\..\include\wx\msw\control.h">\r
                        </File>\r
                        <File\r
-                               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\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">\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\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">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\dcclient.h">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\include\wx\msw\dc.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\msw\dcclient.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\msw\dcmemory.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\missing.h">\r
                        </File>\r
                        <File\r
-                               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\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">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\notifmsg.h">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\include\wx\msw\notebook.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\msw\notifmsg.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\msw\ole\oleutils.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\textctrl.h">\r
                        </File>\r
                        <File\r
-                               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\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">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\tooltip.h">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\include\wx\msw\toolbar.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\msw\tooltip.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\msw\toplevel.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\colrdlgg.h">\r
                        </File>\r
                        <File\r
-                               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\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">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\datectrl.h">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\include\wx\generic\dataview.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\generic\datectrl.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\generic\dcpsg.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\stattextg.h">\r
                        </File>\r
                        <File\r
-                               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\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">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\wizard.h">\r
-                       </File>\r
-               </Filter>\r
+                               RelativePath="..\..\include\wx\generic\treectlg.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\generic\wizard.h">
+                       </File>
+               </Filter>
                <Filter\r
                        Name="wxUniv Headers"\r
                        UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}">\r
                                RelativePath="..\..\include\wx\univ\colschem.h">\r
                        </File>\r
                        <File\r
-                               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\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">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\frame.h">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\include\wx\univ\dialog.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\univ\frame.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\univ\gauge.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\cshelp.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\ctrlsub.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\cursor.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">\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\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">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\dcbuffer.h">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\include\wx\dc.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\dcbuffer.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\dcclient.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h">\r
                        </File>\r
                        <File\r
-                               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\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">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\scopeguard.h">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\include\wx\sashwin.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\scopeguard.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\scrolbar.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\textentry.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\textwrapper.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\tglbtn.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">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\tipwin.h">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\include\wx\tipdlg.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\tipwin.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\ribbon\toolbar.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_sttxt.h">\r
                        </File>\r
                        <File\r
-                               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_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">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolb.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\xrc\xh_tree.h">\r
                        </File>\r
                        <File\r
index b623b4a361d036d8c80266d6b5f3e779ec6dcebb..5fde1d7ac96f48d15fcb3be2a2a9e3d39d13d6e4 100644 (file)
                                RelativePath="..\..\include\wx\xrc\xh_sttxt.h">\r
                        </File>\r
                        <File\r
-                               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_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">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolb.h">
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h">
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\xrc\xh_tree.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_sttxt.cpp">\r
                        </File>\r
                        <File\r
-                               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_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">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\xrc\xh_toolbk.cpp">\r
-                       </File>\r
-                       <File\r
+                               RelativePath="..\..\src\xrc\xh_toolb.cpp">
+                       </File>
+                       <File
+                               RelativePath="..\..\src\xrc\xh_toolbk.cpp">
+                       </File>
+                       <File
                                RelativePath="..\..\src\xrc\xh_tree.cpp">\r
                        </File>\r
                        <File\r
index 0d67b22b675b194b12ce1b0df0e5dac541280549..ffc90f0d82c1fcd5aabff6889e078063594fb1f4 100644 (file)
                        <File\r
                                RelativePath="..\..\src\common\hyperlnkcmn.cpp"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\common\odcombocmn.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\src\common\odcombocmn.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\src\common\richtooltipcmn.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\src\common\taskbarcmn.cpp"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="MSW Sources"\r
+                               RelativePath="..\..\src\common\taskbarcmn.cpp"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="MSW Sources"
                        UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"\r
                        >\r
                        <File\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
+                               <FileConfiguration
+                                       Name="DLL Universal Release|Win32"
+                                       ExcludedFromBuild="true"
+                               />
+                       </File>
+                       <File
                                RelativePath="..\..\src\msw\datetimectrl.cpp"
                                >
                                <FileConfiguration
                                />
                        </File>
                        <File
-                               RelativePath="..\..\src\msw\hyperlink.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                               RelativePath="..\..\src\msw\hyperlink.cpp"
+                               >
+                               <FileConfiguration
+                                       Name="Universal Debug|Win32"
+                                       ExcludedFromBuild="true"
+                               />
                                <FileConfiguration\r
                                        Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                        <File\r
                                RelativePath="..\..\src\msw\joystick.cpp"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\notifmsg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\src\msw\notifmsg.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\src\msw\richtooltip.cpp"
                                >
                                <FileConfiguration
                                </FileConfiguration>
                        </File>
                        <File
-                               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\sound.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\src\msw\taskbar.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\src\msw\timectrl.cpp"
                                >
                                <FileConfiguration
                                />
                        </File>
                        <File
-                               RelativePath="..\..\src\msw\version.rc"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                               RelativePath="..\..\src\msw\version.rc"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                               />
                                <FileConfiguration\r
                                        Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                        <File\r
                                RelativePath="..\..\src\generic\odcombo.cpp"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\propdlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\src\generic\propdlg.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\src\generic\richtooltip.cpp"
                                >
                                <FileConfiguration
                                </FileConfiguration>
                        </File>
                        <File
-                               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\sashwin.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\src\generic\splash.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\src\generic\timectrl.cpp"
                                >
                                <FileConfiguration
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\src\generic\tipdlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\treelist.cpp"\r
-                               >\r
+                               RelativePath="..\..\src\generic\tipdlg.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\src\generic\treelist.cpp"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\wizard.cpp"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\commandlinkbutton.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\datectrl.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
+                               RelativePath="..\..\include\wx\msw\genrcdefs.h"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
                                                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
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\sound.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\taskbar.h"\r
-                               >\r
-                       </File>\r
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\msw\taskbar.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\include\wx\msw\timectrl.h"
                                >
                        </File>
-               </Filter>\r
-               <Filter\r
-                       Name="Generic Headers"\r
-                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"\r
-                       >\r
-                       <File\r
+               </Filter>
+               <Filter
+                       Name="Generic Headers"
+                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
+                       >
+                       <File
                                RelativePath="..\..\include\wx\generic\aboutdlgg.h"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\sashwin.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\splash.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Common Headers"\r
+                               RelativePath="..\..\include\wx\generic\wizard.h"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Common Headers"
                        UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"\r
                        >\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\datectrl.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\dateevt.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\dateevt.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\datetimectrl.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\dcbuffer.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\dvrenderers.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\dcbuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\dvrenderers.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\editlbox.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\odcombo.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\propdlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\propdlg.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\richtooltip.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\sashwin.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\sound.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\sashwin.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\sound.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\splash.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\taskbar.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\taskbar.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\timectrl.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\tipdlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\treelist.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\tipdlg.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\treelist.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\wizard.h"\r
index daae54782ed5fb394b3f06f3496405b8d3a5ee1e..1e83f9b5ab4003f31072e1439b28fb2090ab19f2 100644 (file)
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\src\common\time.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\src\common\timercmn.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\encconv.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\event.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\event.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\eventfilter.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\evtloop.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\except.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\evtloop.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\except.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\features.h"\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\include\wx\time.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\timer.h"\r
                                >\r
                        </File>\r
index 1897ac41df2f9bf38e3872ff8f669920b7ead4c9..a653721643dd1cd921705e0c974f64d7257380c8 100644 (file)
                                        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
+                               <FileConfiguration
+                                       Name="DLL Universal Release|Win32"
+                                       ExcludedFromBuild="true"
+                               />
+                       </File>
+                       <File
                                RelativePath="..\..\src\msw\nonownedwnd.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\src\msw\notebook.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
+                               RelativePath="..\..\src\msw\notebook.cpp"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
                                                Name="VCCLCompilerTool"\r
                                                ObjectFile="vc_mswud\core\msw_notebook.obj"\r
                                        />\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\ctrlsub.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\cursor.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\ole\dataobj.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\msw\ole\dataform.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\msw\ole\dataobj.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\ole\dataobj2.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\datectrl.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\dcclient.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\msw\dc.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\msw\dcclient.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\dcmemory.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\msgdlg.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\msvcrt.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\notifmsg.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\msw\notebook.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\msw\notifmsg.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\ole\oleutils.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\textentry.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\tglbtn.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\tooltip.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\msw\toolbar.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\msw\tooltip.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\toplevel.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\combo.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\ctrlsub.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\datectrl.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\generic\dataview.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\generic\datectrl.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\dcpsg.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\statusbr.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\textdlgg.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\wizard.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\generic\treectlg.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\generic\wizard.h"
+                               >
                        </File>\r
                </Filter>\r
                <Filter\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\combobox.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\control.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\frame.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\univ\dialog.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\univ\frame.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\gauge.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\ctrlsub.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\cursor.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\cursor.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\custombgwin.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\dataobj.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\dataview.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\dataobj.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\dataview.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\datectrl.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\dateevt.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\dateevt.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\datetimectrl.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\dc.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\dcbuffer.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\dc.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\dcbuffer.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\dcclient.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextuicustomization.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\richtext\richtextxml.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\richtext\richtextxml.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\richtooltip.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\sashwin.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\scopeguard.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\sashwin.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\scopeguard.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\scrolbar.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\textwrapper.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\tglbtn.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\tglbtn.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\timectrl.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\tipdlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\tipwin.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\tipdlg.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\tipwin.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\ribbon\toolbar.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_text.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h"\r
-                               >\r
+                               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_tree.h"\r
index c66cb7927d9d5466e480b47a9cd993c07ab1ebbe..82ee966b34cc5005fe4451a40267ff433f77ee6a 100644 (file)
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_text.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h"\r
-                               >\r
+                               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_tree.h"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_text.cpp"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\xrc\xh_tglbtn.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\xrc\xh_toolbk.cpp"\r
-                               >\r
+                               RelativePath="..\..\src\xrc\xh_toolb.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\src\xrc\xh_toolbk.cpp"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_tree.cpp"\r
index eb64dbf0df7ced4a8e1075003c80216f2ecc0c19..24233502bcb705d976e7784ee3a3c3a52c05ce17 100644 (file)
                        <File\r
                                RelativePath="..\..\src\common\hyperlnkcmn.cpp"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\common\odcombocmn.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\src\common\odcombocmn.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\src\common\richtooltipcmn.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\src\common\taskbarcmn.cpp"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="MSW Sources"\r
+                               RelativePath="..\..\src\common\taskbarcmn.cpp"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="MSW Sources"
                        UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"\r
                        >\r
                        <File\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
+                               <FileConfiguration
+                                       Name="DLL Universal Release|Win32"
+                                       ExcludedFromBuild="true"
+                               />
+                       </File>
+                       <File
                                RelativePath="..\..\src\msw\datetimectrl.cpp"
                                >
                                <FileConfiguration
                                />
                        </File>
                        <File
-                               RelativePath="..\..\src\msw\hyperlink.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                               RelativePath="..\..\src\msw\hyperlink.cpp"
+                               >
+                               <FileConfiguration
+                                       Name="Universal Debug|Win32"
+                                       ExcludedFromBuild="true"
+                               />
                                <FileConfiguration\r
                                        Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                        <File\r
                                RelativePath="..\..\src\msw\joystick.cpp"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\notifmsg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\src\msw\notifmsg.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\src\msw\richtooltip.cpp"
                                >
                                <FileConfiguration
                                </FileConfiguration>
                        </File>
                        <File
-                               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\sound.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\src\msw\taskbar.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\src\msw\timectrl.cpp"
                                >
                                <FileConfiguration
                                />
                        </File>
                        <File
-                               RelativePath="..\..\src\msw\version.rc"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                               RelativePath="..\..\src\msw\version.rc"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                               />
                                <FileConfiguration\r
                                        Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                        <File\r
                                RelativePath="..\..\src\generic\odcombo.cpp"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\propdlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\src\generic\propdlg.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\src\generic\richtooltip.cpp"
                                >
                                <FileConfiguration
                                </FileConfiguration>
                        </File>
                        <File
-                               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\sashwin.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\src\generic\splash.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\src\generic\timectrl.cpp"
                                >
                                <FileConfiguration
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="..\..\src\generic\tipdlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\treelist.cpp"\r
-                               >\r
+                               RelativePath="..\..\src\generic\tipdlg.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\src\generic\treelist.cpp"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\wizard.cpp"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\commandlinkbutton.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\datectrl.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
+                               RelativePath="..\..\include\wx\msw\genrcdefs.h"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
                                                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
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\sound.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\taskbar.h"\r
-                               >\r
-                       </File>\r
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\msw\taskbar.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\include\wx\msw\timectrl.h"
                                >
                        </File>
-               </Filter>\r
-               <Filter\r
-                       Name="Generic Headers"\r
-                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"\r
-                       >\r
-                       <File\r
+               </Filter>
+               <Filter
+                       Name="Generic Headers"
+                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
+                       >
+                       <File
                                RelativePath="..\..\include\wx\generic\aboutdlgg.h"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\sashwin.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\splash.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Common Headers"\r
+                               RelativePath="..\..\include\wx\generic\wizard.h"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Common Headers"
                        UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"\r
                        >\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\datectrl.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\dateevt.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\dateevt.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\datetimectrl.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\dcbuffer.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\dvrenderers.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\dcbuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\dvrenderers.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\editlbox.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\odcombo.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\propdlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\propdlg.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\richtooltip.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\sashwin.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\sound.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\sashwin.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\sound.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\splash.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\taskbar.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\taskbar.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\timectrl.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\tipdlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\treelist.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\tipdlg.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\treelist.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\wizard.h"\r
index dd7944e16e83a5be3826f6d1048ad04a45dcd82a..24847c9d03905c182a9b65c4a997fb731262a539 100644 (file)
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\src\common\time.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\src\common\timercmn.cpp"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\encconv.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\event.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\event.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\eventfilter.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\evtloop.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\except.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\evtloop.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\except.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\features.h"\r
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\include\wx\time.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\timer.h"\r
                                >\r
                        </File>\r
index 8edaed47e941b0e47d19be84089d2f0390f4b593..262997a05bcff7561f38e060088d570e9593806e 100644 (file)
                                        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
+                               <FileConfiguration
+                                       Name="DLL Universal Release|Win32"
+                                       ExcludedFromBuild="true"
+                               />
+                       </File>
+                       <File
                                RelativePath="..\..\src\msw\nonownedwnd.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\src\msw\notebook.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
+                               RelativePath="..\..\src\msw\notebook.cpp"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
                                                Name="VCCLCompilerTool"\r
                                                ObjectFile="vc_mswud\core\msw_notebook.obj"\r
                                        />\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\ctrlsub.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\cursor.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\ole\dataobj.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\msw\ole\dataform.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\msw\ole\dataobj.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\ole\dataobj2.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\datectrl.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\dcclient.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\msw\dc.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\msw\dcclient.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\dcmemory.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\msgdlg.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\msvcrt.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\notifmsg.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\msw\notebook.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\msw\notifmsg.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\ole\oleutils.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\textentry.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\tglbtn.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\tooltip.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\msw\toolbar.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\msw\tooltip.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\toplevel.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\combo.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\ctrlsub.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\datectrl.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\generic\dataview.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\generic\datectrl.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\dcpsg.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\statusbr.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\textdlgg.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\wizard.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\generic\treectlg.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\generic\wizard.h"
+                               >
                        </File>\r
                </Filter>\r
                <Filter\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\combobox.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\control.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\frame.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\univ\dialog.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\univ\frame.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\gauge.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\ctrlsub.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\cursor.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\cursor.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\custombgwin.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\dataobj.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\dataview.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\dataobj.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\dataview.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\datectrl.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\dateevt.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\dateevt.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\datetimectrl.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\dc.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\dcbuffer.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\dc.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\dcbuffer.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\dcclient.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\richtext\richtextuicustomization.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\richtext\richtextxml.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\richtext\richtextxml.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\richtooltip.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\sashwin.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\scopeguard.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\sashwin.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\scopeguard.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\scrolbar.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\textwrapper.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\tglbtn.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\tglbtn.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\include\wx\timectrl.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\wx\tipdlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\tipwin.h"\r
-                               >\r
+                               RelativePath="..\..\include\wx\tipdlg.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\include\wx\tipwin.h"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\ribbon\toolbar.h"\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_text.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h"\r
-                               >\r
+                               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_tree.h"\r
index 94ad36ebd24f6b7e95942c6b4254fe60fc9d9ce1..4a464e4dbb788ed7d0b9b50ff6f86bd1920e497b 100644 (file)
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_text.h"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h"\r
-                               >\r
+                               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_tree.h"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_text.cpp"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\xrc\xh_tglbtn.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\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"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\xrc\xh_toolbk.cpp"\r
-                               >\r
+                               RelativePath="..\..\src\xrc\xh_toolb.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\src\xrc\xh_toolbk.cpp"
+                               >
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_tree.cpp"\r
index c9fae43551007f4409a8470952f0df6e0b3e9e4a..26dead016ff2b1f53e8e4fbe72042aa5aaf4ae0b 100644 (file)
@@ -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\r
-\r
-SOURCE=..\..\include\wx\xrc\xh_tglbtn.h\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\xrc\xh_toolbk.h\r
-# End Source File\r
+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_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\r
-\r
-SOURCE=..\..\src\xrc\xh_tglbtn.cpp\r
-# End Source File\r
-# Begin Source File\r
-\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\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\xrc\xh_toolbk.cpp\r
-# End Source File\r
+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_tree.cpp\r
diff --git a/include/wx/time.h b/include/wx/time.h
new file mode 100644 (file)
index 0000000..29ca102
--- /dev/null
@@ -0,0 +1,17 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/time.h
+// Purpose:     Miscellaneous time-related functions.
+// Author:      Vadim Zeitlin
+// Created:     2011-11-26
+// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
+// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_TIME_H_
+#define _WX_TIME_H_
+
+// Returns the difference between UTC and local time in seconds.
+WXDLLIMPEXP_BASE int wxGetTimeZone();
+
+#endif // _WX_TIME_H_
diff --git a/interface/wx/time.h b/interface/wx/time.h
new file mode 100644 (file)
index 0000000..23db295
--- /dev/null
@@ -0,0 +1,21 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/time.h
+// Purpose:     Time-related functions.
+// Author:      Vadim Zeitlin
+// Created:     2011-11-27
+// RCS-ID:      $Id$
+// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+/** @addtogroup group_funcmacro_time */
+//@{
+
+/**
+    Returns the difference between UTC and local time in seconds.
+
+    @header{wx/time.h}
+ */
+int wxGetTimeZone();
+
+//@}
index c08a5c3fc20f4d160a6bda0ffff4480a333d7475..066ac07047df687dad66265d747b6c4cc105b457 100644 (file)
@@ -75,6 +75,7 @@
 #endif // WX_PRECOMP
 
 #include "wx/thread.h"
+#include "wx/time.h"
 #include "wx/tokenzr.h"
 
 #include <ctype.h>
@@ -122,14 +123,6 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringCon
     #include <values.h>
 #endif
 
-#ifndef WX_GMTOFF_IN_TM
-    // Define it for some systems which don't (always) use configure but are
-    // known to have tm_gmtoff field.
-    #if defined(__WXPALMOS__) || defined(__DARWIN__)
-        #define WX_GMTOFF_IN_TM
-    #endif
-#endif
-
 // NB: VC8 safe time functions could/should be used for wxMSW as well probably
 #if defined(__WXWINCE__) && defined(__VISUALC8__)
 
@@ -327,69 +320,6 @@ wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month)
     return daysInMonth[wxDateTime::IsLeapYear(year)][month];
 }
 
-// returns the time zone in the C sense, i.e. the difference UTC - local
-// (in seconds)
-// NOTE: not static because used by datetimefmt.cpp
-int GetTimeZone()
-{
-#ifdef WX_GMTOFF_IN_TM
-    // set to true when the timezone is set
-    static bool s_timezoneSet = false;
-    static long gmtoffset = LONG_MAX; // invalid timezone
-
-    // ensure that the timezone variable is set by calling wxLocaltime_r
-    if ( !s_timezoneSet )
-    {
-        // just call wxLocaltime_r() instead of figuring out whether this
-        // system supports tzset(), _tzset() or something else
-        time_t t = time(NULL);
-        struct tm tm;
-
-        wxLocaltime_r(&t, &tm);
-        s_timezoneSet = true;
-
-        // note that GMT offset is the opposite of time zone and so to return
-        // consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM
-        // cases we have to negate it
-        gmtoffset = -tm.tm_gmtoff;
-
-        // this function is supposed to return the same value whether DST is
-        // enabled or not, so we need to use an additional offset if DST is on
-        // as tm_gmtoff already does include it
-        if ( tm.tm_isdst )
-            gmtoffset += 3600;
-    }
-    return (int)gmtoffset;
-#elif defined(__DJGPP__) || defined(__WINE__)
-    struct timeb tb;
-    ftime(&tb);
-    return tb.timezone*60;
-#elif defined(__VISUALC__)
-    // We must initialize the time zone information before using it (this will
-    // be done only once internally).
-    _tzset();
-
-    // Starting with VC++ 8 timezone variable is deprecated and is not even
-    // available in some standard library version so use the new function for
-    // accessing it instead.
-    #if wxCHECK_VISUALC_VERSION(8)
-        long t;
-        _get_timezone(&t);
-        return t;
-    #else // VC++ < 8
-        return timezone;
-    #endif
-#elif defined(WX_TIMEZONE) // If WX_TIMEZONE was defined by configure, use it.
-    return WX_TIMEZONE;
-#elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
-    return _timezone;
-#elif defined(__MWERKS__)
-    return 28800;
-#else // unknown platform -- assume it has timezone
-    return timezone;
-#endif // WX_GMTOFF_IN_TM/!WX_GMTOFF_IN_TM
-}
-
 // return the integral part of the JDN for the midnight of the given date (to
 // get the real JDN you need to add 0.5, this is, in fact, JDN of the
 // noon of the previous day)
@@ -615,7 +545,7 @@ wxDateTime::TimeZone::TimeZone(wxDateTime::TZ tz)
         case wxDateTime::Local:
             // get the offset from C RTL: it returns the difference GMT-local
             // while we want to have the offset _from_ GMT, hence the '-'
-            m_offset = -GetTimeZone();
+            m_offset = -wxGetTimeZone();
             break;
 
         case wxDateTime::GMT_12:
@@ -1272,7 +1202,7 @@ wxDateTime& wxDateTime::Set(const struct tm& tm)
         if ( tm2.tm_year == 70 && tm2.tm_mon == 0 && tm2.tm_mday == 1 )
         {
             return Set((time_t)(
-                       GetTimeZone() +
+                       wxGetTimeZone() +
                        tm2.tm_hour * MIN_PER_HOUR * SEC_PER_MIN +
                        tm2.tm_min * SEC_PER_MIN +
                        tm2.tm_sec));
@@ -1386,7 +1316,7 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day,
         m_time *= SECONDS_PER_DAY * TIME_T_FACTOR;
 
         // JDN corresponds to GMT, we take localtime
-        Add(wxTimeSpan(hour, minute, second + GetTimeZone(), millisec));
+        Add(wxTimeSpan(hour, minute, second + wxGetTimeZone(), millisec));
     }
 
     return *this;
@@ -1525,7 +1455,7 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
         // use C RTL functions
         struct tm tmstruct;
         tm *tm;
-        if ( tz.GetOffset() == -GetTimeZone() )
+        if ( tz.GetOffset() == -wxGetTimeZone() )
         {
             // we are working with local time
             tm = wxLocaltime_r(&time, &tmstruct);
@@ -2159,7 +2089,7 @@ int wxDateTime::IsDST(wxDateTime::Country country) const
 
 wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
 {
-    long secDiff = GetTimeZone() + tz.GetOffset();
+    long secDiff = wxGetTimeZone() + tz.GetOffset();
 
     // we need to know whether DST is or not in effect for this date unless
     // the test disabled by the caller
@@ -2174,7 +2104,7 @@ wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
 
 wxDateTime& wxDateTime::MakeFromTimezone(const TimeZone& tz, bool noDST)
 {
-    long secDiff = GetTimeZone() + tz.GetOffset();
+    long secDiff = wxGetTimeZone() + tz.GetOffset();
 
     // we need to know whether DST is or not in effect for this date unless
     // the test disabled by the caller
index 254c7034369f516ddc61a8fb9e6e35960acd9293..77194b0a2095a02fae297f2f7f7d91a49b540008 100644 (file)
@@ -57,6 +57,7 @@
 #endif
 
 #include "wx/datetime.h"
+#include "wx/time.h"
 
 // ============================================================================
 // implementation of wxDateTime
@@ -68,8 +69,6 @@
 
 extern void InitTm(struct tm& tm);
 
-extern int GetTimeZone();
-
 extern wxString CallStrftime(const wxString& format, const tm* tm);
 
 // ----------------------------------------------------------------------------
@@ -329,7 +328,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
         // use strftime()
         struct tm tmstruct;
         struct tm *tm;
-        if ( tz.GetOffset() == -GetTimeZone() )
+        if ( tz.GetOffset() == -wxGetTimeZone() )
         {
             // we are working with local time
             tm = wxLocaltime_r(&time, &tmstruct);
diff --git a/src/common/time.cpp b/src/common/time.cpp
new file mode 100644 (file)
index 0000000..d3e1bd6
--- /dev/null
@@ -0,0 +1,100 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/time.cpp
+// Purpose:     Implementation of time-related functions.
+// Author:      Vadim Zeitlin
+// Created:     2011-11-26
+// 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
+
+#include "wx/time.h"
+
+#ifndef WX_GMTOFF_IN_TM
+    // Define it for some systems which don't (always) use configure but are
+    // known to have tm_gmtoff field.
+    #if defined(__WXPALMOS__) || defined(__DARWIN__)
+        #define WX_GMTOFF_IN_TM
+    #endif
+#endif
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// returns the time zone in the C sense, i.e. the difference UTC - local
+// (in seconds)
+int wxGetTimeZone()
+{
+#ifdef WX_GMTOFF_IN_TM
+    // set to true when the timezone is set
+    static bool s_timezoneSet = false;
+    static long gmtoffset = LONG_MAX; // invalid timezone
+
+    // ensure that the timezone variable is set by calling wxLocaltime_r
+    if ( !s_timezoneSet )
+    {
+        // just call wxLocaltime_r() instead of figuring out whether this
+        // system supports tzset(), _tzset() or something else
+        time_t t = time(NULL);
+        struct tm tm;
+
+        wxLocaltime_r(&t, &tm);
+        s_timezoneSet = true;
+
+        // note that GMT offset is the opposite of time zone and so to return
+        // consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM
+        // cases we have to negate it
+        gmtoffset = -tm.tm_gmtoff;
+
+        // this function is supposed to return the same value whether DST is
+        // enabled or not, so we need to use an additional offset if DST is on
+        // as tm_gmtoff already does include it
+        if ( tm.tm_isdst )
+            gmtoffset += 3600;
+    }
+    return (int)gmtoffset;
+#elif defined(__DJGPP__) || defined(__WINE__)
+    struct timeb tb;
+    ftime(&tb);
+    return tb.timezone*60;
+#elif defined(__VISUALC__)
+    // We must initialize the time zone information before using it (this will
+    // be done only once internally).
+    _tzset();
+
+    // Starting with VC++ 8 timezone variable is deprecated and is not even
+    // available in some standard library version so use the new function for
+    // accessing it instead.
+    #if wxCHECK_VISUALC_VERSION(8)
+        long t;
+        _get_timezone(&t);
+        return t;
+    #else // VC++ < 8
+        return timezone;
+    #endif
+#elif defined(WX_TIMEZONE) // If WX_TIMEZONE was defined by configure, use it.
+    return WX_TIMEZONE;
+#elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
+    return _timezone;
+#elif defined(__MWERKS__)
+    return 28800;
+#else // unknown platform -- assume it has timezone
+    return timezone;
+#endif // WX_GMTOFF_IN_TM/!WX_GMTOFF_IN_TM
+}
index cd310242db9080ffa51f6d4c61dce065045664fa..ac8b684162603c112d32296863b284ace581e92a 100644 (file)
@@ -306,6 +306,7 @@ wx/textbuf.h
 wx/textfile.h
 wx/thread.h
 wx/thrimpl.cpp
+wx/time.h
 wx/timer.h
 wx/tls.h
 wx/tokenzr.h
index 656e960308d879e3fd3d320634396130d7a1028c..3f0fc55331c41a3ef30df38f98a4ddc85a68fff5 100644 (file)
@@ -208,6 +208,7 @@ wx/textbuf.h
 wx/textfile.h
 wx/thread.h
 wx/thrimpl.cpp
+wx/time.h
 wx/timer.h
 wx/tls.h
 wx/tokenzr.h
index 8d0d4d5f288d69e6d82957f3da47d6878be259c2..f9e2c8540e4af0cc3d024f7353fda61f1674abb2 100644 (file)
@@ -232,6 +232,7 @@ wx/textbuf.h
 wx/textfile.h
 wx/thread.h
 wx/thrimpl.cpp
+wx/time.h
 wx/timer.h
 wx/tls.h
 wx/tokenzr.h