Update to Bakefile 0.2.8.

[wxWidgets.git] / build / msw / makefile.vc
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc

index d5a3c2bf914cad5fbcdcb6974d3c6aaad68690c1..1cefca865271eb7ad9eafa10375c5c5a69dfe028 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.7 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -19,6 +19,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
         DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
         MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
         USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
         DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
         MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
         USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
         USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
         USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
         USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
         USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
         USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
         USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
@@ -28,7 +29,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
         CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
         RUNTIME_LIBS="$(RUNTIME_LIBS)"
  WX_RELEASE_NODOT = 29
         CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
         RUNTIME_LIBS="$(RUNTIME_LIBS)"
  WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
  COMPILER_PREFIX = vc
  OBJS = \
         $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
  COMPILER_PREFIX = vc
  OBJS = \
         $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
@@ -36,19 +37,19 @@ LIBDIRNAME = \
         ..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
  SETUPHDIR = \
         $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
         ..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
  SETUPHDIR = \
         $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
-       /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\include \
-       /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) \
-       $(CPPFLAGS) $(CFLAGS)
+WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
+       /I..\..\include /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS)
  WXREGEX_OBJECTS =  \
         $(OBJS)\wxregex_regcomp.obj \
         $(OBJS)\wxregex_regexec.obj \
         $(OBJS)\wxregex_regerror.obj \
         $(OBJS)\wxregex_regfree.obj
  WXREGEX_OBJECTS =  \
         $(OBJS)\wxregex_regcomp.obj \
         $(OBJS)\wxregex_regexec.obj \
         $(OBJS)\wxregex_regerror.obj \
         $(OBJS)\wxregex_regfree.obj
-WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_21)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_25)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
         /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG $(CPPFLAGS) $(CFLAGS)
  WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_adler32.obj \
         $(OBJS)\wxzlib_compress.obj \
  WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_adler32.obj \
         $(OBJS)\wxzlib_compress.obj \
@@ -62,9 +63,10 @@ WXZLIB_OBJECTS =  \
         $(OBJS)\wxzlib_infback.obj \
         $(OBJS)\wxzlib_inftrees.obj \
         $(OBJS)\wxzlib_inffast.obj
         $(OBJS)\wxzlib_infback.obj \
         $(OBJS)\wxzlib_inftrees.obj \
         $(OBJS)\wxzlib_inffast.obj
-WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_34)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_40)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
         /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I..\..\src\zlib $(CPPFLAGS) \
+       $(CFLAGS)
  WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_png.obj \
         $(OBJS)\wxpng_pngerror.obj \
  WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_png.obj \
         $(OBJS)\wxpng_pngerror.obj \
@@ -83,9 +85,10 @@ WXPNG_OBJECTS =  \
         $(OBJS)\wxpng_pngwrite.obj \
         $(OBJS)\wxpng_pngwtran.obj \
         $(OBJS)\wxpng_pngwutil.obj
         $(OBJS)\wxpng_pngwrite.obj \
         $(OBJS)\wxpng_pngwtran.obj \
         $(OBJS)\wxpng_pngwutil.obj
-WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_47)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_55)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
         /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I$(SETUPHDIR) $(CPPFLAGS) \
+       $(CFLAGS)
  WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jcomapi.obj \
         $(OBJS)\wxjpeg_jutils.obj \
  WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jcomapi.obj \
         $(OBJS)\wxjpeg_jutils.obj \
@@ -133,10 +136,10 @@ WXJPEG_OBJECTS =  \
         $(OBJS)\wxjpeg_jquant1.obj \
         $(OBJS)\wxjpeg_jquant2.obj \
         $(OBJS)\wxjpeg_jdmerge.obj
         $(OBJS)\wxjpeg_jquant1.obj \
         $(OBJS)\wxjpeg_jquant2.obj \
         $(OBJS)\wxjpeg_jdmerge.obj
-WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_60)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
+WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_70)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
         /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \
-       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I..\..\src\zlib /I..\..\src\jpeg \
-       /I..\..\src\tiff\libtiff $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I..\..\src\zlib \
+       /I..\..\src\jpeg /I..\..\src\tiff\libtiff $(CPPFLAGS) $(CFLAGS)
  WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_win32.obj \
         $(OBJS)\wxtiff_tif_aux.obj \
  WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_win32.obj \
         $(OBJS)\wxtiff_tif_aux.obj \
@@ -174,17 +177,17 @@ WXTIFF_OBJECTS =  \
         $(OBJS)\wxtiff_tif_warning.obj \
         $(OBJS)\wxtiff_tif_write.obj \
         $(OBJS)\wxtiff_tif_zip.obj
         $(OBJS)\wxtiff_tif_warning.obj \
         $(OBJS)\wxtiff_tif_write.obj \
         $(OBJS)\wxtiff_tif_zip.obj
-WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_73)$(__DEBUGRUNTIME) /DWIN32 \
+WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_85)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
         $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /I$(LIBDIRNAME) \
-       /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
+       /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS)
  WXEXPAT_OBJECTS =  \
         $(OBJS)\wxexpat_xmlparse.obj \
         $(OBJS)\wxexpat_xmlrole.obj \
         $(OBJS)\wxexpat_xmltok.obj
  WXEXPAT_OBJECTS =  \
         $(OBJS)\wxexpat_xmlparse.obj \
         $(OBJS)\wxexpat_xmlrole.obj \
         $(OBJS)\wxexpat_xmltok.obj
-WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_86)$(__DEBUGRUNTIME) /DWIN32 \
+WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb \
         $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb \
-       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \
         /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
         /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
         $(CXXFLAGS)
         /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
         /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \
         $(CXXFLAGS)
@@ -281,7 +284,7 @@ WXSCINTILLA_OBJECTS =  \
         $(OBJS)\wxscintilla_ViewStyle.obj \
         $(OBJS)\wxscintilla_WindowAccessor.obj \
         $(OBJS)\wxscintilla_XPM.obj
         $(OBJS)\wxscintilla_ViewStyle.obj \
         $(OBJS)\wxscintilla_WindowAccessor.obj \
         $(OBJS)\wxscintilla_XPM.obj
-MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
+MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -293,7 +296,7 @@ MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
         /DWXMAKINGDLL /I..\..\src\stc\scintilla\include \
         /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) \
         $(CFLAGS)
         /DWXMAKINGDLL /I..\..\src\stc\scintilla\include \
         /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) \
         $(CFLAGS)
-MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
+MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -308,6 +311,7 @@ MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \
         /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS)
  MONODLL_OBJECTS =  \
         $(OBJS)\monodll_dummy.obj \
         /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS)
  MONODLL_OBJECTS =  \
         $(OBJS)\monodll_dummy.obj \
+       $(OBJS)\monodll_any.obj \
         $(OBJS)\monodll_appbase.obj \
         $(OBJS)\monodll_arcall.obj \
         $(OBJS)\monodll_arcfind.obj \
         $(OBJS)\monodll_appbase.obj \
         $(OBJS)\monodll_arcall.obj \
         $(OBJS)\monodll_arcfind.obj \
@@ -319,6 +323,7 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_config.obj \
         $(OBJS)\monodll_convauto.obj \
         $(OBJS)\monodll_datetime.obj \
         $(OBJS)\monodll_config.obj \
         $(OBJS)\monodll_convauto.obj \
         $(OBJS)\monodll_datetime.obj \
+       $(OBJS)\monodll_datetimefmt.obj \
         $(OBJS)\monodll_datstrm.obj \
         $(OBJS)\monodll_dircmn.obj \
         $(OBJS)\monodll_dynarray.obj \
         $(OBJS)\monodll_datstrm.obj \
         $(OBJS)\monodll_dircmn.obj \
         $(OBJS)\monodll_dynarray.obj \
@@ -358,6 +363,7 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_regex.obj \
         $(OBJS)\monodll_stdpbase.obj \
         $(OBJS)\monodll_sstream.obj \
         $(OBJS)\monodll_regex.obj \
         $(OBJS)\monodll_stdpbase.obj \
         $(OBJS)\monodll_sstream.obj \
+       $(OBJS)\monodll_stdstream.obj \
         $(OBJS)\monodll_stopwatch.obj \
         $(OBJS)\monodll_strconv.obj \
         $(OBJS)\monodll_stream.obj \
         $(OBJS)\monodll_stopwatch.obj \
         $(OBJS)\monodll_strconv.obj \
         $(OBJS)\monodll_stream.obj \
@@ -375,6 +381,7 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_txtstrm.obj \
         $(OBJS)\monodll_unichar.obj \
         $(OBJS)\monodll_uri.obj \
         $(OBJS)\monodll_txtstrm.obj \
         $(OBJS)\monodll_unichar.obj \
         $(OBJS)\monodll_uri.obj \
+       $(OBJS)\monodll_ustring.obj \
         $(OBJS)\monodll_variant.obj \
         $(OBJS)\monodll_wfstream.obj \
         $(OBJS)\monodll_wxcrt.obj \
         $(OBJS)\monodll_variant.obj \
         $(OBJS)\monodll_wfstream.obj \
         $(OBJS)\monodll_wxcrt.obj \
@@ -384,6 +391,8 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_xtistrm.obj \
         $(OBJS)\monodll_zipstrm.obj \
         $(OBJS)\monodll_zstream.obj \
         $(OBJS)\monodll_xtistrm.obj \
         $(OBJS)\monodll_zipstrm.obj \
         $(OBJS)\monodll_zstream.obj \
+       $(OBJS)\monodll_fswatchercmn.obj \
+       $(OBJS)\monodll_fswatcherg.obj \
         $(OBJS)\monodll_basemsw.obj \
         $(OBJS)\monodll_crashrpt.obj \
         $(OBJS)\monodll_debughlp.obj \
         $(OBJS)\monodll_basemsw.obj \
         $(OBJS)\monodll_crashrpt.obj \
         $(OBJS)\monodll_debughlp.obj \
@@ -401,6 +410,7 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_timer.obj \
         $(OBJS)\monodll_utils.obj \
         $(OBJS)\monodll_utilsexc.obj \
         $(OBJS)\monodll_timer.obj \
         $(OBJS)\monodll_utils.obj \
         $(OBJS)\monodll_utilsexc.obj \
+       $(OBJS)\monodll_fswatcher.obj \
         $(OBJS)\monodll_event.obj \
         $(OBJS)\monodll_fs_mem.obj \
         $(OBJS)\monodll_msgout.obj \
         $(OBJS)\monodll_event.obj \
         $(OBJS)\monodll_fs_mem.obj \
         $(OBJS)\monodll_msgout.obj \
@@ -419,14 +429,14 @@ MONODLL_OBJECTS =  \
         $(OBJS)\monodll_sckstrm.obj \
         $(OBJS)\monodll_socket.obj \
         $(OBJS)\monodll_url.obj \
         $(OBJS)\monodll_sckstrm.obj \
         $(OBJS)\monodll_socket.obj \
         $(OBJS)\monodll_url.obj \
-       $(OBJS)\monodll_gsocket.obj \
-       $(OBJS)\monodll_gsockmsw.obj \
+       $(OBJS)\monodll_sockmsw.obj \
         $(OBJS)\monodll_urlmsw.obj \
         $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
         $(OBJS)\monodll_xml.obj \
         $(OBJS)\monodll_urlmsw.obj \
         $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \
         $(OBJS)\monodll_xml.obj \
-       $(OBJS)\monodll_xtixml.obj \
+       $(OBJS)\monodll_xtixml.obj
+MONODLL_RESOURCES =  \
         $(OBJS)\monodll_version.res
         $(OBJS)\monodll_version.res
-MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_113)$(__DEBUGRUNTIME) /DWIN32 \
+MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -437,7 +447,7 @@ MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_113)$(__DEBUGRUNTIME) /DWIN32 \
         /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \
         /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
         /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) $(CFLAGS)
         /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \
         /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \
         /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) $(CFLAGS)
-MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_113)$(__DEBUGRUNTIME) /DWIN32 \
+MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -451,6 +461,7 @@ MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_113)$(__DEBUGRUNTIME) /DWIN32 \
         /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS)
  MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_dummy.obj \
         /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS)
  MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_dummy.obj \
+       $(OBJS)\monolib_any.obj \
         $(OBJS)\monolib_appbase.obj \
         $(OBJS)\monolib_arcall.obj \
         $(OBJS)\monolib_arcfind.obj \
         $(OBJS)\monolib_appbase.obj \
         $(OBJS)\monolib_arcall.obj \
         $(OBJS)\monolib_arcfind.obj \
@@ -462,6 +473,7 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_config.obj \
         $(OBJS)\monolib_convauto.obj \
         $(OBJS)\monolib_datetime.obj \
         $(OBJS)\monolib_config.obj \
         $(OBJS)\monolib_convauto.obj \
         $(OBJS)\monolib_datetime.obj \
+       $(OBJS)\monolib_datetimefmt.obj \
         $(OBJS)\monolib_datstrm.obj \
         $(OBJS)\monolib_dircmn.obj \
         $(OBJS)\monolib_dynarray.obj \
         $(OBJS)\monolib_datstrm.obj \
         $(OBJS)\monolib_dircmn.obj \
         $(OBJS)\monolib_dynarray.obj \
@@ -501,6 +513,7 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_regex.obj \
         $(OBJS)\monolib_stdpbase.obj \
         $(OBJS)\monolib_sstream.obj \
         $(OBJS)\monolib_regex.obj \
         $(OBJS)\monolib_stdpbase.obj \
         $(OBJS)\monolib_sstream.obj \
+       $(OBJS)\monolib_stdstream.obj \
         $(OBJS)\monolib_stopwatch.obj \
         $(OBJS)\monolib_strconv.obj \
         $(OBJS)\monolib_stream.obj \
         $(OBJS)\monolib_stopwatch.obj \
         $(OBJS)\monolib_strconv.obj \
         $(OBJS)\monolib_stream.obj \
@@ -518,6 +531,7 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_txtstrm.obj \
         $(OBJS)\monolib_unichar.obj \
         $(OBJS)\monolib_uri.obj \
         $(OBJS)\monolib_txtstrm.obj \
         $(OBJS)\monolib_unichar.obj \
         $(OBJS)\monolib_uri.obj \
+       $(OBJS)\monolib_ustring.obj \
         $(OBJS)\monolib_variant.obj \
         $(OBJS)\monolib_wfstream.obj \
         $(OBJS)\monolib_wxcrt.obj \
         $(OBJS)\monolib_variant.obj \
         $(OBJS)\monolib_wfstream.obj \
         $(OBJS)\monolib_wxcrt.obj \
@@ -527,6 +541,8 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_xtistrm.obj \
         $(OBJS)\monolib_zipstrm.obj \
         $(OBJS)\monolib_zstream.obj \
         $(OBJS)\monolib_xtistrm.obj \
         $(OBJS)\monolib_zipstrm.obj \
         $(OBJS)\monolib_zstream.obj \
+       $(OBJS)\monolib_fswatchercmn.obj \
+       $(OBJS)\monolib_fswatcherg.obj \
         $(OBJS)\monolib_basemsw.obj \
         $(OBJS)\monolib_crashrpt.obj \
         $(OBJS)\monolib_debughlp.obj \
         $(OBJS)\monolib_basemsw.obj \
         $(OBJS)\monolib_crashrpt.obj \
         $(OBJS)\monolib_debughlp.obj \
@@ -544,6 +560,7 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_timer.obj \
         $(OBJS)\monolib_utils.obj \
         $(OBJS)\monolib_utilsexc.obj \
         $(OBJS)\monolib_timer.obj \
         $(OBJS)\monolib_utils.obj \
         $(OBJS)\monolib_utilsexc.obj \
+       $(OBJS)\monolib_fswatcher.obj \
         $(OBJS)\monolib_event.obj \
         $(OBJS)\monolib_fs_mem.obj \
         $(OBJS)\monolib_msgout.obj \
         $(OBJS)\monolib_event.obj \
         $(OBJS)\monolib_fs_mem.obj \
         $(OBJS)\monolib_msgout.obj \
@@ -562,13 +579,12 @@ MONOLIB_OBJECTS =  \
         $(OBJS)\monolib_sckstrm.obj \
         $(OBJS)\monolib_socket.obj \
         $(OBJS)\monolib_url.obj \
         $(OBJS)\monolib_sckstrm.obj \
         $(OBJS)\monolib_socket.obj \
         $(OBJS)\monolib_url.obj \
-       $(OBJS)\monolib_gsocket.obj \
-       $(OBJS)\monolib_gsockmsw.obj \
+       $(OBJS)\monolib_sockmsw.obj \
         $(OBJS)\monolib_urlmsw.obj \
         $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
         $(OBJS)\monolib_xml.obj \
         $(OBJS)\monolib_xtixml.obj
         $(OBJS)\monolib_urlmsw.obj \
         $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \
         $(OBJS)\monolib_xml.obj \
         $(OBJS)\monolib_xtixml.obj
-BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
+BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -578,7 +594,7 @@ BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
         /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
         /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
         /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
         /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
         /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
         /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
+BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -591,7 +607,7 @@ BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS)
  BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_dummy.obj \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS)
  BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_dummy.obj \
-       $(OBJS)\basedll_version.res \
+       $(OBJS)\basedll_any.obj \
         $(OBJS)\basedll_appbase.obj \
         $(OBJS)\basedll_arcall.obj \
         $(OBJS)\basedll_arcfind.obj \
         $(OBJS)\basedll_appbase.obj \
         $(OBJS)\basedll_arcall.obj \
         $(OBJS)\basedll_arcfind.obj \
@@ -603,6 +619,7 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_config.obj \
         $(OBJS)\basedll_convauto.obj \
         $(OBJS)\basedll_datetime.obj \
         $(OBJS)\basedll_config.obj \
         $(OBJS)\basedll_convauto.obj \
         $(OBJS)\basedll_datetime.obj \
+       $(OBJS)\basedll_datetimefmt.obj \
         $(OBJS)\basedll_datstrm.obj \
         $(OBJS)\basedll_dircmn.obj \
         $(OBJS)\basedll_dynarray.obj \
         $(OBJS)\basedll_datstrm.obj \
         $(OBJS)\basedll_dircmn.obj \
         $(OBJS)\basedll_dynarray.obj \
@@ -642,6 +659,7 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_regex.obj \
         $(OBJS)\basedll_stdpbase.obj \
         $(OBJS)\basedll_sstream.obj \
         $(OBJS)\basedll_regex.obj \
         $(OBJS)\basedll_stdpbase.obj \
         $(OBJS)\basedll_sstream.obj \
+       $(OBJS)\basedll_stdstream.obj \
         $(OBJS)\basedll_stopwatch.obj \
         $(OBJS)\basedll_strconv.obj \
         $(OBJS)\basedll_stream.obj \
         $(OBJS)\basedll_stopwatch.obj \
         $(OBJS)\basedll_strconv.obj \
         $(OBJS)\basedll_stream.obj \
@@ -659,6 +677,7 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_txtstrm.obj \
         $(OBJS)\basedll_unichar.obj \
         $(OBJS)\basedll_uri.obj \
         $(OBJS)\basedll_txtstrm.obj \
         $(OBJS)\basedll_unichar.obj \
         $(OBJS)\basedll_uri.obj \
+       $(OBJS)\basedll_ustring.obj \
         $(OBJS)\basedll_variant.obj \
         $(OBJS)\basedll_wfstream.obj \
         $(OBJS)\basedll_wxcrt.obj \
         $(OBJS)\basedll_variant.obj \
         $(OBJS)\basedll_wfstream.obj \
         $(OBJS)\basedll_wxcrt.obj \
@@ -668,6 +687,8 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_xtistrm.obj \
         $(OBJS)\basedll_zipstrm.obj \
         $(OBJS)\basedll_zstream.obj \
         $(OBJS)\basedll_xtistrm.obj \
         $(OBJS)\basedll_zipstrm.obj \
         $(OBJS)\basedll_zstream.obj \
+       $(OBJS)\basedll_fswatchercmn.obj \
+       $(OBJS)\basedll_fswatcherg.obj \
         $(OBJS)\basedll_basemsw.obj \
         $(OBJS)\basedll_crashrpt.obj \
         $(OBJS)\basedll_debughlp.obj \
         $(OBJS)\basedll_basemsw.obj \
         $(OBJS)\basedll_crashrpt.obj \
         $(OBJS)\basedll_debughlp.obj \
@@ -685,6 +706,7 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_timer.obj \
         $(OBJS)\basedll_utils.obj \
         $(OBJS)\basedll_utilsexc.obj \
         $(OBJS)\basedll_timer.obj \
         $(OBJS)\basedll_utils.obj \
         $(OBJS)\basedll_utilsexc.obj \
+       $(OBJS)\basedll_fswatcher.obj \
         $(OBJS)\basedll_event.obj \
         $(OBJS)\basedll_fs_mem.obj \
         $(OBJS)\basedll_msgout.obj \
         $(OBJS)\basedll_event.obj \
         $(OBJS)\basedll_fs_mem.obj \
         $(OBJS)\basedll_msgout.obj \
@@ -693,7 +715,9 @@ BASEDLL_OBJECTS =  \
         $(OBJS)\basedll_main.obj \
         $(OBJS)\basedll_mslu.obj \
         $(OBJS)\basedll_volume.obj
         $(OBJS)\basedll_main.obj \
         $(OBJS)\basedll_mslu.obj \
         $(OBJS)\basedll_volume.obj
-BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_140)$(__DEBUGRUNTIME) /DWIN32 \
+BASEDLL_RESOURCES =  \
+       $(OBJS)\basedll_version.res
+BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -703,7 +727,7 @@ BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_140)$(__DEBUGRUNTIME) /DWIN32 \
         /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
         /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
         /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
         /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
         /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \
         /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_140)$(__DEBUGRUNTIME) /DWIN32 \
+BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -716,6 +740,7 @@ BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_140)$(__DEBUGRUNTIME) /DWIN32 \
         /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS)
  BASELIB_OBJECTS =  \
         $(OBJS)\baselib_dummy.obj \
         /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS)
  BASELIB_OBJECTS =  \
         $(OBJS)\baselib_dummy.obj \
+       $(OBJS)\baselib_any.obj \
         $(OBJS)\baselib_appbase.obj \
         $(OBJS)\baselib_arcall.obj \
         $(OBJS)\baselib_arcfind.obj \
         $(OBJS)\baselib_appbase.obj \
         $(OBJS)\baselib_arcall.obj \
         $(OBJS)\baselib_arcfind.obj \
@@ -727,6 +752,7 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_config.obj \
         $(OBJS)\baselib_convauto.obj \
         $(OBJS)\baselib_datetime.obj \
         $(OBJS)\baselib_config.obj \
         $(OBJS)\baselib_convauto.obj \
         $(OBJS)\baselib_datetime.obj \
+       $(OBJS)\baselib_datetimefmt.obj \
         $(OBJS)\baselib_datstrm.obj \
         $(OBJS)\baselib_dircmn.obj \
         $(OBJS)\baselib_dynarray.obj \
         $(OBJS)\baselib_datstrm.obj \
         $(OBJS)\baselib_dircmn.obj \
         $(OBJS)\baselib_dynarray.obj \
@@ -766,6 +792,7 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_regex.obj \
         $(OBJS)\baselib_stdpbase.obj \
         $(OBJS)\baselib_sstream.obj \
         $(OBJS)\baselib_regex.obj \
         $(OBJS)\baselib_stdpbase.obj \
         $(OBJS)\baselib_sstream.obj \
+       $(OBJS)\baselib_stdstream.obj \
         $(OBJS)\baselib_stopwatch.obj \
         $(OBJS)\baselib_strconv.obj \
         $(OBJS)\baselib_stream.obj \
         $(OBJS)\baselib_stopwatch.obj \
         $(OBJS)\baselib_strconv.obj \
         $(OBJS)\baselib_stream.obj \
@@ -783,6 +810,7 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_txtstrm.obj \
         $(OBJS)\baselib_unichar.obj \
         $(OBJS)\baselib_uri.obj \
         $(OBJS)\baselib_txtstrm.obj \
         $(OBJS)\baselib_unichar.obj \
         $(OBJS)\baselib_uri.obj \
+       $(OBJS)\baselib_ustring.obj \
         $(OBJS)\baselib_variant.obj \
         $(OBJS)\baselib_wfstream.obj \
         $(OBJS)\baselib_wxcrt.obj \
         $(OBJS)\baselib_variant.obj \
         $(OBJS)\baselib_wfstream.obj \
         $(OBJS)\baselib_wxcrt.obj \
@@ -792,6 +820,8 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_xtistrm.obj \
         $(OBJS)\baselib_zipstrm.obj \
         $(OBJS)\baselib_zstream.obj \
         $(OBJS)\baselib_xtistrm.obj \
         $(OBJS)\baselib_zipstrm.obj \
         $(OBJS)\baselib_zstream.obj \
+       $(OBJS)\baselib_fswatchercmn.obj \
+       $(OBJS)\baselib_fswatcherg.obj \
         $(OBJS)\baselib_basemsw.obj \
         $(OBJS)\baselib_crashrpt.obj \
         $(OBJS)\baselib_debughlp.obj \
         $(OBJS)\baselib_basemsw.obj \
         $(OBJS)\baselib_crashrpt.obj \
         $(OBJS)\baselib_debughlp.obj \
@@ -809,6 +839,7 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_timer.obj \
         $(OBJS)\baselib_utils.obj \
         $(OBJS)\baselib_utilsexc.obj \
         $(OBJS)\baselib_timer.obj \
         $(OBJS)\baselib_utils.obj \
         $(OBJS)\baselib_utilsexc.obj \
+       $(OBJS)\baselib_fswatcher.obj \
         $(OBJS)\baselib_event.obj \
         $(OBJS)\baselib_fs_mem.obj \
         $(OBJS)\baselib_msgout.obj \
         $(OBJS)\baselib_event.obj \
         $(OBJS)\baselib_fs_mem.obj \
         $(OBJS)\baselib_msgout.obj \
@@ -817,7 +848,7 @@ BASELIB_OBJECTS =  \
         $(OBJS)\baselib_main.obj \
         $(OBJS)\baselib_mslu.obj \
         $(OBJS)\baselib_volume.obj
         $(OBJS)\baselib_main.obj \
         $(OBJS)\baselib_mslu.obj \
         $(OBJS)\baselib_volume.obj
-NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_154)$(__DEBUGRUNTIME) /DWIN32 \
+NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_178)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -830,7 +861,6 @@ NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_154)$(__DEBUGRUNTIME) /DWIN32 \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS)
  NETDLL_OBJECTS =  \
         $(OBJS)\netdll_dummy.obj \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS)
  NETDLL_OBJECTS =  \
         $(OBJS)\netdll_dummy.obj \
-       $(OBJS)\netdll_version.res \
         $(OBJS)\netdll_fs_inet.obj \
         $(OBJS)\netdll_ftp.obj \
         $(OBJS)\netdll_http.obj \
         $(OBJS)\netdll_fs_inet.obj \
         $(OBJS)\netdll_ftp.obj \
         $(OBJS)\netdll_http.obj \
@@ -841,10 +871,11 @@ NETDLL_OBJECTS =  \
         $(OBJS)\netdll_sckstrm.obj \
         $(OBJS)\netdll_socket.obj \
         $(OBJS)\netdll_url.obj \
         $(OBJS)\netdll_sckstrm.obj \
         $(OBJS)\netdll_socket.obj \
         $(OBJS)\netdll_url.obj \
-       $(OBJS)\netdll_gsocket.obj \
-       $(OBJS)\netdll_gsockmsw.obj \
+       $(OBJS)\netdll_sockmsw.obj \
         $(OBJS)\netdll_urlmsw.obj
         $(OBJS)\netdll_urlmsw.obj
-NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_167)$(__DEBUGRUNTIME) /DWIN32 \
+NETDLL_RESOURCES =  \
+       $(OBJS)\netdll_version.res
+NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_193)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -867,10 +898,9 @@ NETLIB_OBJECTS =  \
         $(OBJS)\netlib_sckstrm.obj \
         $(OBJS)\netlib_socket.obj \
         $(OBJS)\netlib_url.obj \
         $(OBJS)\netlib_sckstrm.obj \
         $(OBJS)\netlib_socket.obj \
         $(OBJS)\netlib_url.obj \
-       $(OBJS)\netlib_gsocket.obj \
-       $(OBJS)\netlib_gsockmsw.obj \
+       $(OBJS)\netlib_sockmsw.obj \
         $(OBJS)\netlib_urlmsw.obj
         $(OBJS)\netlib_urlmsw.obj
-COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_181)$(__DEBUGRUNTIME) /DWIN32 \
+COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_209)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -883,7 +913,6 @@ COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_181)$(__DEBUGRUNTIME) /DWIN32 \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS)
  COREDLL_OBJECTS =  \
         $(OBJS)\coredll_dummy.obj \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS)
  COREDLL_OBJECTS =  \
         $(OBJS)\coredll_dummy.obj \
-       $(OBJS)\coredll_version.res \
         $(OBJS)\coredll_event.obj \
         $(OBJS)\coredll_fs_mem.obj \
         $(OBJS)\coredll_msgout.obj \
         $(OBJS)\coredll_event.obj \
         $(OBJS)\coredll_fs_mem.obj \
         $(OBJS)\coredll_msgout.obj \
@@ -893,7 +922,9 @@ COREDLL_OBJECTS =  \
         $(OBJS)\coredll_mslu.obj \
         $(OBJS)\coredll_volume.obj \
         $(____CORE_SRC_FILENAMES_2_OBJECTS)
         $(OBJS)\coredll_mslu.obj \
         $(OBJS)\coredll_volume.obj \
         $(____CORE_SRC_FILENAMES_2_OBJECTS)
-CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_194)$(__DEBUGRUNTIME) /DWIN32 \
+COREDLL_RESOURCES =  \
+       $(OBJS)\coredll_version.res
+CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_224)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -915,7 +946,7 @@ CORELIB_OBJECTS =  \
         $(OBJS)\corelib_mslu.obj \
         $(OBJS)\corelib_volume.obj \
         $(____CORE_SRC_FILENAMES_3_OBJECTS)
         $(OBJS)\corelib_mslu.obj \
         $(OBJS)\corelib_volume.obj \
         $(____CORE_SRC_FILENAMES_3_OBJECTS)
-ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_208)$(__DEBUGRUNTIME) /DWIN32 \
+ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_240)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -928,9 +959,10 @@ ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_208)$(__DEBUGRUNTIME) /DWIN32 \
         /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS)
  ADVDLL_OBJECTS =  \
         $(OBJS)\advdll_dummy.obj \
         /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS)
  ADVDLL_OBJECTS =  \
         $(OBJS)\advdll_dummy.obj \
-       $(OBJS)\advdll_version.res \
         $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
         $(____ADVANCED_SRC_FILENAMES_2_OBJECTS)
-ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_221)$(__DEBUGRUNTIME) /DWIN32 \
+ADVDLL_RESOURCES =  \
+       $(OBJS)\advdll_version.res
+ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_255)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -944,7 +976,7 @@ ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_221)$(__DEBUGRUNTIME) /DWIN32 \
  ADVLIB_OBJECTS =  \
         $(OBJS)\advlib_dummy.obj \
         $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
  ADVLIB_OBJECTS =  \
         $(OBJS)\advlib_dummy.obj \
         $(____ADVANCED_SRC_FILENAMES_3_OBJECTS)
-MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_235)$(__DEBUGRUNTIME) /DWIN32 \
+MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_271)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -957,13 +989,13 @@ MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_235)$(__DEBUGRUNTIME) /DWIN32 \
         /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS)
  MEDIADLL_OBJECTS =  \
         $(OBJS)\mediadll_dummy.obj \
         /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS)
  MEDIADLL_OBJECTS =  \
         $(OBJS)\mediadll_dummy.obj \
-       $(OBJS)\mediadll_version.res \
         $(OBJS)\mediadll_mediactrlcmn.obj \
         $(OBJS)\mediadll_mediactrl_am.obj \
         $(OBJS)\mediadll_mediactrl_wmp10.obj \
         $(OBJS)\mediadll_mediactrlcmn.obj \
         $(OBJS)\mediadll_mediactrl_am.obj \
         $(OBJS)\mediadll_mediactrl_wmp10.obj \
-       $(OBJS)\mediadll_mediactrl_qt.obj \
-       $(OBJS)\mediadll_activex.obj
-MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_248)$(__DEBUGRUNTIME) /DWIN32 \
+       $(OBJS)\mediadll_mediactrl_qt.obj
+MEDIADLL_RESOURCES =  \
+       $(OBJS)\mediadll_version.res
+MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_286)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -979,9 +1011,8 @@ MEDIALIB_OBJECTS =  \
         $(OBJS)\medialib_mediactrlcmn.obj \
         $(OBJS)\medialib_mediactrl_am.obj \
         $(OBJS)\medialib_mediactrl_wmp10.obj \
         $(OBJS)\medialib_mediactrlcmn.obj \
         $(OBJS)\medialib_mediactrl_am.obj \
         $(OBJS)\medialib_mediactrl_wmp10.obj \
-       $(OBJS)\medialib_mediactrl_qt.obj \
-       $(OBJS)\medialib_activex.obj
-HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME) /DWIN32 \
+       $(OBJS)\medialib_mediactrl_qt.obj
+HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -994,7 +1025,6 @@ HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME) /DWIN32 \
         /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
  HTMLDLL_OBJECTS =  \
         $(OBJS)\htmldll_dummy.obj \
         /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
  HTMLDLL_OBJECTS =  \
         $(OBJS)\htmldll_dummy.obj \
-       $(OBJS)\htmldll_version.res \
         $(OBJS)\htmldll_helpbest.obj \
         $(OBJS)\htmldll_helpctrl.obj \
         $(OBJS)\htmldll_helpdata.obj \
         $(OBJS)\htmldll_helpbest.obj \
         $(OBJS)\htmldll_helpctrl.obj \
         $(OBJS)\htmldll_helpdata.obj \
@@ -1019,7 +1049,9 @@ HTMLDLL_OBJECTS =  \
         $(OBJS)\htmldll_m_tables.obj \
         $(OBJS)\htmldll_winpars.obj \
         $(OBJS)\htmldll_htmllbox.obj
         $(OBJS)\htmldll_m_tables.obj \
         $(OBJS)\htmldll_winpars.obj \
         $(OBJS)\htmldll_htmllbox.obj
-HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_275)$(__DEBUGRUNTIME) /DWIN32 \
+HTMLDLL_RESOURCES =  \
+       $(OBJS)\htmldll_version.res
+HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_317)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1056,7 +1088,7 @@ HTMLLIB_OBJECTS =  \
         $(OBJS)\htmllib_m_tables.obj \
         $(OBJS)\htmllib_winpars.obj \
         $(OBJS)\htmllib_htmllbox.obj
         $(OBJS)\htmllib_m_tables.obj \
         $(OBJS)\htmllib_winpars.obj \
         $(OBJS)\htmllib_htmllbox.obj
-QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_289)$(__DEBUGRUNTIME) /DWIN32 \
+QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_333)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1069,10 +1101,11 @@ QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_289)$(__DEBUGRUNTIME) /DWIN32 \
         /Fp"$(OBJS)\wxprec_qadll.pch" $(CPPFLAGS) $(CXXFLAGS)
  QADLL_OBJECTS =  \
         $(OBJS)\qadll_dummy.obj \
         /Fp"$(OBJS)\wxprec_qadll.pch" $(CPPFLAGS) $(CXXFLAGS)
  QADLL_OBJECTS =  \
         $(OBJS)\qadll_dummy.obj \
-       $(OBJS)\qadll_version.res \
         $(OBJS)\qadll_debugrpt.obj \
         $(OBJS)\qadll_dbgrptg.obj
         $(OBJS)\qadll_debugrpt.obj \
         $(OBJS)\qadll_dbgrptg.obj
-QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \
+QADLL_RESOURCES =  \
+       $(OBJS)\qadll_version.res
+QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_348)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1087,7 +1120,7 @@ QALIB_OBJECTS =  \
         $(OBJS)\qalib_dummy.obj \
         $(OBJS)\qalib_debugrpt.obj \
         $(OBJS)\qalib_dbgrptg.obj
         $(OBJS)\qalib_dummy.obj \
         $(OBJS)\qalib_debugrpt.obj \
         $(OBJS)\qalib_dbgrptg.obj
-XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_316)$(__DEBUGRUNTIME) /DWIN32 \
+XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_364)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1100,10 +1133,11 @@ XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_316)$(__DEBUGRUNTIME) /DWIN32 \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
  XMLDLL_OBJECTS =  \
         $(OBJS)\xmldll_dummy.obj \
         /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS)
  XMLDLL_OBJECTS =  \
         $(OBJS)\xmldll_dummy.obj \
-       $(OBJS)\xmldll_version.res \
         $(OBJS)\xmldll_xml.obj \
         $(OBJS)\xmldll_xtixml.obj
         $(OBJS)\xmldll_xml.obj \
         $(OBJS)\xmldll_xtixml.obj
-XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_329)$(__DEBUGRUNTIME) /DWIN32 \
+XMLDLL_RESOURCES =  \
+       $(OBJS)\xmldll_version.res
+XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_379)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1118,7 +1152,7 @@ XMLLIB_OBJECTS =  \
         $(OBJS)\xmllib_dummy.obj \
         $(OBJS)\xmllib_xml.obj \
         $(OBJS)\xmllib_xtixml.obj
         $(OBJS)\xmllib_dummy.obj \
         $(OBJS)\xmllib_xml.obj \
         $(OBJS)\xmllib_xtixml.obj
-XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_343)$(__DEBUGRUNTIME) /DWIN32 \
+XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_395)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1131,7 +1165,6 @@ XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_343)$(__DEBUGRUNTIME) /DWIN32 \
         /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
  XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_dummy.obj \
         /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS)
  XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_dummy.obj \
-       $(OBJS)\xrcdll_version.res \
         $(OBJS)\xrcdll_xh_animatctrl.obj \
         $(OBJS)\xrcdll_xh_bmp.obj \
         $(OBJS)\xrcdll_xh_bmpcbox.obj \
         $(OBJS)\xrcdll_xh_animatctrl.obj \
         $(OBJS)\xrcdll_xh_bmp.obj \
         $(OBJS)\xrcdll_xh_bmpcbox.obj \
@@ -1145,13 +1178,15 @@ XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_xh_clrpicker.obj \
         $(OBJS)\xrcdll_xh_collpane.obj \
         $(OBJS)\xrcdll_xh_combo.obj \
         $(OBJS)\xrcdll_xh_clrpicker.obj \
         $(OBJS)\xrcdll_xh_collpane.obj \
         $(OBJS)\xrcdll_xh_combo.obj \
+       $(OBJS)\xrcdll_xh_comboctrl.obj \
         $(OBJS)\xrcdll_xh_datectrl.obj \
         $(OBJS)\xrcdll_xh_dirpicker.obj \
         $(OBJS)\xrcdll_xh_dlg.obj \
         $(OBJS)\xrcdll_xh_datectrl.obj \
         $(OBJS)\xrcdll_xh_dirpicker.obj \
         $(OBJS)\xrcdll_xh_dlg.obj \
-       $(OBJS)\xrcdll_xh_frame.obj \
-       $(OBJS)\xrcdll_xh_mdi.obj \
+       $(OBJS)\xrcdll_xh_editlbox.obj \
+       $(OBJS)\xrcdll_xh_filectrl.obj \
         $(OBJS)\xrcdll_xh_filepicker.obj \
         $(OBJS)\xrcdll_xh_fontpicker.obj \
         $(OBJS)\xrcdll_xh_filepicker.obj \
         $(OBJS)\xrcdll_xh_fontpicker.obj \
+       $(OBJS)\xrcdll_xh_frame.obj \
         $(OBJS)\xrcdll_xh_gauge.obj \
         $(OBJS)\xrcdll_xh_gdctl.obj \
         $(OBJS)\xrcdll_xh_grid.obj \
         $(OBJS)\xrcdll_xh_gauge.obj \
         $(OBJS)\xrcdll_xh_gdctl.obj \
         $(OBJS)\xrcdll_xh_grid.obj \
@@ -1160,6 +1195,7 @@ XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_xh_listb.obj \
         $(OBJS)\xrcdll_xh_listbk.obj \
         $(OBJS)\xrcdll_xh_listc.obj \
         $(OBJS)\xrcdll_xh_listb.obj \
         $(OBJS)\xrcdll_xh_listbk.obj \
         $(OBJS)\xrcdll_xh_listc.obj \
+       $(OBJS)\xrcdll_xh_mdi.obj \
         $(OBJS)\xrcdll_xh_menu.obj \
         $(OBJS)\xrcdll_xh_notbk.obj \
         $(OBJS)\xrcdll_xh_odcombo.obj \
         $(OBJS)\xrcdll_xh_menu.obj \
         $(OBJS)\xrcdll_xh_notbk.obj \
         $(OBJS)\xrcdll_xh_odcombo.obj \
@@ -1188,8 +1224,11 @@ XRCDLL_OBJECTS =  \
         $(OBJS)\xrcdll_xh_unkwn.obj \
         $(OBJS)\xrcdll_xh_wizrd.obj \
         $(OBJS)\xrcdll_xmlres.obj \
         $(OBJS)\xrcdll_xh_unkwn.obj \
         $(OBJS)\xrcdll_xh_wizrd.obj \
         $(OBJS)\xrcdll_xmlres.obj \
+       $(OBJS)\xrcdll_xmladv.obj \
         $(OBJS)\xrcdll_xmlrsall.obj
         $(OBJS)\xrcdll_xmlrsall.obj
-XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_356)$(__DEBUGRUNTIME) /DWIN32 \
+XRCDLL_RESOURCES =  \
+       $(OBJS)\xrcdll_version.res
+XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1215,13 +1254,15 @@ XRCLIB_OBJECTS =  \
         $(OBJS)\xrclib_xh_clrpicker.obj \
         $(OBJS)\xrclib_xh_collpane.obj \
         $(OBJS)\xrclib_xh_combo.obj \
         $(OBJS)\xrclib_xh_clrpicker.obj \
         $(OBJS)\xrclib_xh_collpane.obj \
         $(OBJS)\xrclib_xh_combo.obj \
+       $(OBJS)\xrclib_xh_comboctrl.obj \
         $(OBJS)\xrclib_xh_datectrl.obj \
         $(OBJS)\xrclib_xh_dirpicker.obj \
         $(OBJS)\xrclib_xh_dlg.obj \
         $(OBJS)\xrclib_xh_datectrl.obj \
         $(OBJS)\xrclib_xh_dirpicker.obj \
         $(OBJS)\xrclib_xh_dlg.obj \
-       $(OBJS)\xrclib_xh_frame.obj \
-       $(OBJS)\xrclib_xh_mdi.obj \
+       $(OBJS)\xrclib_xh_editlbox.obj \
+       $(OBJS)\xrclib_xh_filectrl.obj \
         $(OBJS)\xrclib_xh_filepicker.obj \
         $(OBJS)\xrclib_xh_fontpicker.obj \
         $(OBJS)\xrclib_xh_filepicker.obj \
         $(OBJS)\xrclib_xh_fontpicker.obj \
+       $(OBJS)\xrclib_xh_frame.obj \
         $(OBJS)\xrclib_xh_gauge.obj \
         $(OBJS)\xrclib_xh_gdctl.obj \
         $(OBJS)\xrclib_xh_grid.obj \
         $(OBJS)\xrclib_xh_gauge.obj \
         $(OBJS)\xrclib_xh_gdctl.obj \
         $(OBJS)\xrclib_xh_grid.obj \
@@ -1230,6 +1271,7 @@ XRCLIB_OBJECTS =  \
         $(OBJS)\xrclib_xh_listb.obj \
         $(OBJS)\xrclib_xh_listbk.obj \
         $(OBJS)\xrclib_xh_listc.obj \
         $(OBJS)\xrclib_xh_listb.obj \
         $(OBJS)\xrclib_xh_listbk.obj \
         $(OBJS)\xrclib_xh_listc.obj \
+       $(OBJS)\xrclib_xh_mdi.obj \
         $(OBJS)\xrclib_xh_menu.obj \
         $(OBJS)\xrclib_xh_notbk.obj \
         $(OBJS)\xrclib_xh_odcombo.obj \
         $(OBJS)\xrclib_xh_menu.obj \
         $(OBJS)\xrclib_xh_notbk.obj \
         $(OBJS)\xrclib_xh_odcombo.obj \
@@ -1258,8 +1300,9 @@ XRCLIB_OBJECTS =  \
         $(OBJS)\xrclib_xh_unkwn.obj \
         $(OBJS)\xrclib_xh_wizrd.obj \
         $(OBJS)\xrclib_xmlres.obj \
         $(OBJS)\xrclib_xh_unkwn.obj \
         $(OBJS)\xrclib_xh_wizrd.obj \
         $(OBJS)\xrclib_xmlres.obj \
+       $(OBJS)\xrclib_xmladv.obj \
         $(OBJS)\xrclib_xmlrsall.obj
         $(OBJS)\xrclib_xmlrsall.obj
-AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_370)$(__DEBUGRUNTIME) /DWIN32 \
+AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_426)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1272,13 +1315,15 @@ AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_370)$(__DEBUGRUNTIME) /DWIN32 \
         /Fp"$(OBJS)\wxprec_auidll.pch" $(CPPFLAGS) $(CXXFLAGS)
  AUIDLL_OBJECTS =  \
         $(OBJS)\auidll_dummy.obj \
         /Fp"$(OBJS)\wxprec_auidll.pch" $(CPPFLAGS) $(CXXFLAGS)
  AUIDLL_OBJECTS =  \
         $(OBJS)\auidll_dummy.obj \
-       $(OBJS)\auidll_version.res \
         $(OBJS)\auidll_framemanager.obj \
         $(OBJS)\auidll_dockart.obj \
         $(OBJS)\auidll_floatpane.obj \
         $(OBJS)\auidll_auibook.obj \
         $(OBJS)\auidll_framemanager.obj \
         $(OBJS)\auidll_dockart.obj \
         $(OBJS)\auidll_floatpane.obj \
         $(OBJS)\auidll_auibook.obj \
+       $(OBJS)\auidll_auibar.obj \
         $(OBJS)\auidll_tabmdi.obj
         $(OBJS)\auidll_tabmdi.obj
-AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_383)$(__DEBUGRUNTIME) /DWIN32 \
+AUIDLL_RESOURCES =  \
+       $(OBJS)\auidll_version.res
+AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_441)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1295,8 +1340,101 @@ AUILIB_OBJECTS =  \
         $(OBJS)\auilib_dockart.obj \
         $(OBJS)\auilib_floatpane.obj \
         $(OBJS)\auilib_auibook.obj \
         $(OBJS)\auilib_dockart.obj \
         $(OBJS)\auilib_floatpane.obj \
         $(OBJS)\auilib_auibook.obj \
+       $(OBJS)\auilib_auibar.obj \
         $(OBJS)\auilib_tabmdi.obj
         $(OBJS)\auilib_tabmdi.obj
-RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME) /DWIN32 \
+RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_457)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
+       /DWXMAKINGDLL_RIBBON $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_ribbondll.pch" $(CPPFLAGS) $(CXXFLAGS)
+RIBBONDLL_OBJECTS =  \
+       $(OBJS)\ribbondll_dummy.obj \
+       $(OBJS)\ribbondll_art_internal.obj \
+       $(OBJS)\ribbondll_art_msw.obj \
+       $(OBJS)\ribbondll_art_aui.obj \
+       $(OBJS)\ribbondll_bar.obj \
+       $(OBJS)\ribbondll_buttonbar.obj \
+       $(OBJS)\ribbondll_control.obj \
+       $(OBJS)\ribbondll_gallery.obj \
+       $(OBJS)\ribbondll_page.obj \
+       $(OBJS)\ribbondll_panel.obj \
+       $(OBJS)\ribbondll_toolbar.obj
+RIBBONDLL_RESOURCES =  \
+       $(OBJS)\ribbondll_version.res
+RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_472)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ribbonlib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
+RIBBONLIB_OBJECTS =  \
+       $(OBJS)\ribbonlib_dummy.obj \
+       $(OBJS)\ribbonlib_art_internal.obj \
+       $(OBJS)\ribbonlib_art_msw.obj \
+       $(OBJS)\ribbonlib_art_aui.obj \
+       $(OBJS)\ribbonlib_bar.obj \
+       $(OBJS)\ribbonlib_buttonbar.obj \
+       $(OBJS)\ribbonlib_control.obj \
+       $(OBJS)\ribbonlib_gallery.obj \
+       $(OBJS)\ribbonlib_page.obj \
+       $(OBJS)\ribbonlib_panel.obj \
+       $(OBJS)\ribbonlib_toolbar.obj
+PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_488)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \
+       /DWXMAKINGDLL_PROPGRID $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \
+       /Fp"$(OBJS)\wxprec_propgriddll.pch" $(CPPFLAGS) $(CXXFLAGS)
+PROPGRIDDLL_OBJECTS =  \
+       $(OBJS)\propgriddll_dummy.obj \
+       $(OBJS)\propgriddll_advprops.obj \
+       $(OBJS)\propgriddll_editors.obj \
+       $(OBJS)\propgriddll_manager.obj \
+       $(OBJS)\propgriddll_property.obj \
+       $(OBJS)\propgriddll_propgrid.obj \
+       $(OBJS)\propgriddll_propgridiface.obj \
+       $(OBJS)\propgriddll_propgridpagestate.obj \
+       $(OBJS)\propgriddll_props.obj
+PROPGRIDDLL_RESOURCES =  \
+       $(OBJS)\propgriddll_version.res
+PROPGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_503)$(__DEBUGRUNTIME) /DWIN32 \
+       $(__DEBUGINFO) \
+       /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.pdb \
+       $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \
+       /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \
+       /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_propgridlib.pch" \
+       $(CPPFLAGS) $(CXXFLAGS)
+PROPGRIDLIB_OBJECTS =  \
+       $(OBJS)\propgridlib_dummy.obj \
+       $(OBJS)\propgridlib_advprops.obj \
+       $(OBJS)\propgridlib_editors.obj \
+       $(OBJS)\propgridlib_manager.obj \
+       $(OBJS)\propgridlib_property.obj \
+       $(OBJS)\propgridlib_propgrid.obj \
+       $(OBJS)\propgridlib_propgridiface.obj \
+       $(OBJS)\propgridlib_propgridpagestate.obj \
+       $(OBJS)\propgridlib_props.obj
+RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_519)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1309,7 +1447,6 @@ RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME) /DWIN32 \
         /Fp"$(OBJS)\wxprec_richtextdll.pch" $(CPPFLAGS) $(CXXFLAGS)
  RICHTEXTDLL_OBJECTS =  \
         $(OBJS)\richtextdll_dummy.obj \
         /Fp"$(OBJS)\wxprec_richtextdll.pch" $(CPPFLAGS) $(CXXFLAGS)
  RICHTEXTDLL_OBJECTS =  \
         $(OBJS)\richtextdll_dummy.obj \
-       $(OBJS)\richtextdll_version.res \
         $(OBJS)\richtextdll_richtextctrl.obj \
         $(OBJS)\richtextdll_richtextbuffer.obj \
         $(OBJS)\richtextdll_richtextstyles.obj \
         $(OBJS)\richtextdll_richtextctrl.obj \
         $(OBJS)\richtextdll_richtextbuffer.obj \
         $(OBJS)\richtextdll_richtextstyles.obj \
@@ -1319,7 +1456,9 @@ RICHTEXTDLL_OBJECTS =  \
         $(OBJS)\richtextdll_richtextsymboldlg.obj \
         $(OBJS)\richtextdll_richtextstyledlg.obj \
         $(OBJS)\richtextdll_richtextprint.obj
         $(OBJS)\richtextdll_richtextsymboldlg.obj \
         $(OBJS)\richtextdll_richtextstyledlg.obj \
         $(OBJS)\richtextdll_richtextprint.obj
-RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \
+RICHTEXTDLL_RESOURCES =  \
+       $(OBJS)\richtextdll_version.res
+RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_534)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1341,7 +1480,7 @@ RICHTEXTLIB_OBJECTS =  \
         $(OBJS)\richtextlib_richtextsymboldlg.obj \
         $(OBJS)\richtextlib_richtextstyledlg.obj \
         $(OBJS)\richtextlib_richtextprint.obj
         $(OBJS)\richtextlib_richtextsymboldlg.obj \
         $(OBJS)\richtextlib_richtextstyledlg.obj \
         $(OBJS)\richtextlib_richtextprint.obj
-STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME) /DWIN32 \
+STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_550)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1356,11 +1495,12 @@ STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME) /DWIN32 \
         $(CPPFLAGS) $(CXXFLAGS)
  STCDLL_OBJECTS =  \
         $(OBJS)\stcdll_dummy.obj \
         $(CPPFLAGS) $(CXXFLAGS)
  STCDLL_OBJECTS =  \
         $(OBJS)\stcdll_dummy.obj \
-       $(OBJS)\stcdll_version.res \
         $(OBJS)\stcdll_stc.obj \
         $(OBJS)\stcdll_PlatWX.obj \
         $(OBJS)\stcdll_ScintillaWX.obj
         $(OBJS)\stcdll_stc.obj \
         $(OBJS)\stcdll_PlatWX.obj \
         $(OBJS)\stcdll_ScintillaWX.obj
-STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_437)$(__DEBUGRUNTIME) /DWIN32 \
+STCDLL_RESOURCES =  \
+       $(OBJS)\stcdll_version.res
+STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_565)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1377,7 +1517,7 @@ STCLIB_OBJECTS =  \
         $(OBJS)\stclib_stc.obj \
         $(OBJS)\stclib_PlatWX.obj \
         $(OBJS)\stclib_ScintillaWX.obj
         $(OBJS)\stclib_stc.obj \
         $(OBJS)\stclib_PlatWX.obj \
         $(OBJS)\stclib_ScintillaWX.obj
-GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_451)$(__DEBUGRUNTIME) /DWIN32 \
+GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_581)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1390,10 +1530,11 @@ GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_451)$(__DEBUGRUNTIME) /DWIN32 \
         /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS)
  GLDLL_OBJECTS =  \
         $(OBJS)\gldll_dummy.obj \
         /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS)
  GLDLL_OBJECTS =  \
         $(OBJS)\gldll_dummy.obj \
-       $(OBJS)\gldll_version.res \
         $(OBJS)\gldll_glcmn.obj \
         $(OBJS)\gldll_glcanvas.obj
         $(OBJS)\gldll_glcmn.obj \
         $(OBJS)\gldll_glcanvas.obj
-GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_464)$(__DEBUGRUNTIME) /DWIN32 \
+GLDLL_RESOURCES =  \
+       $(OBJS)\gldll_version.res
+GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_596)$(__DEBUGRUNTIME) /DWIN32 \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
         $(__DEBUGINFO) \
         /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \
         $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \
@@ -1424,10 +1565,10 @@ VENDORTAG = _$(VENDOR)
  !if "$(OFFICIAL_BUILD)" == "1"
  VENDORTAG = 
  !endif
  !if "$(OFFICIAL_BUILD)" == "1"
  VENDORTAG = 
  !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
  WXDEBUGFLAG = d
  !endif
  WXDEBUGFLAG = d
  !endif
-!if "$(DEBUG_FLAG)" == "1"
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
  WXDEBUGFLAG = d
  !endif
  !if "$(UNICODE)" == "1"
  WXDEBUGFLAG = d
  !endif
  !if "$(UNICODE)" == "1"
@@ -1436,18 +1577,18 @@ WXUNICODEFLAG = u
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
  !if "$(WXUNIV)" == "1"
  WXUNIVNAME = univ
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  DIR_SUFFIX_CPU = _amd64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  DIR_SUFFIX_CPU = _amd64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  DIR_SUFFIX_CPU = _ia64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-DIR_SUFFIX_CPU = _ia64
-!endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
  !if "$(SHARED)" == "1"
  WXDLLFLAG = dll
  !endif
@@ -1457,68 +1598,68 @@ LIBTYPE_SUFFIX = lib
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
  !if "$(SHARED)" == "1"
  LIBTYPE_SUFFIX = dll
  !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
  !if "$(TARGET_CPU)" == "amd64"
  LINK_TARGET_CPU = /MACHINE:AMD64
  !endif
  !if "$(TARGET_CPU)" == "ia64"
  LINK_TARGET_CPU = /MACHINE:IA64
  !endif
-!if "$(TARGET_CPU)" == "ia64"
-LINK_TARGET_CPU = /MACHINE:IA64
-!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_8 = D
+__RUNTIME_LIBS_10 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_8 = $(__THREADSFLAG)
+__RUNTIME_LIBS_10 = $(__THREADSFLAG)
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_21 = D
+__RUNTIME_LIBS_25 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_21 = $(__THREADSFLAG)
+__RUNTIME_LIBS_25 = $(__THREADSFLAG)
  !endif
  !if "$(USE_GUI)" == "1"
  __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(USE_GUI)" == "1"
  __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_34 = D
+__RUNTIME_LIBS_40 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_34 = $(__THREADSFLAG)
+__RUNTIME_LIBS_40 = $(__THREADSFLAG)
  !endif
  !if "$(USE_GUI)" == "1"
  __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(USE_GUI)" == "1"
  __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_47 = D
+__RUNTIME_LIBS_55 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_47 = $(__THREADSFLAG)
+__RUNTIME_LIBS_55 = $(__THREADSFLAG)
  !endif
  !if "$(USE_GUI)" == "1"
  __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(USE_GUI)" == "1"
  __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_60 = D
+__RUNTIME_LIBS_70 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_60 = $(__THREADSFLAG)
+__RUNTIME_LIBS_70 = $(__THREADSFLAG)
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_73 = D
+__RUNTIME_LIBS_85 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_73 = $(__THREADSFLAG)
+__RUNTIME_LIBS_85 = $(__THREADSFLAG)
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_86 = D
+__RUNTIME_LIBS_100 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_86 = $(__THREADSFLAG)
+__RUNTIME_LIBS_100 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
  !endif
  !if "$(MONOLITHIC)" == "0"
  EXTRALIBS_FOR_BASE = 
@@ -1530,11 +1671,23 @@ EXTRALIBS_FOR_BASE =
  __monodll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
  !endif
  __monodll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
  !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_108 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_108 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_108 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_108 = $(__DEBUGRUNTIME_10)
+!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_100 = D
+__RUNTIME_LIBS_116 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_100 = $(__THREADSFLAG)
+__RUNTIME_LIBS_116 = $(__THREADSFLAG)
  !endif
  !if "$(USE_GUI)" == "1"
  ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1"
  ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
@@ -1544,7 +1697,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_mediactrl_am.obj \
         $(OBJS)\monodll_mediactrl_wmp10.obj \
         $(OBJS)\monodll_mediactrl_qt.obj \
         $(OBJS)\monodll_mediactrl_am.obj \
         $(OBJS)\monodll_mediactrl_wmp10.obj \
         $(OBJS)\monodll_mediactrl_qt.obj \
-       $(OBJS)\monodll_activex.obj \
         $(OBJS)\monodll_helpbest.obj \
         $(OBJS)\monodll_helpctrl.obj \
         $(OBJS)\monodll_helpdata.obj \
         $(OBJS)\monodll_helpbest.obj \
         $(OBJS)\monodll_helpctrl.obj \
         $(OBJS)\monodll_helpdata.obj \
@@ -1584,13 +1736,15 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_xh_clrpicker.obj \
         $(OBJS)\monodll_xh_collpane.obj \
         $(OBJS)\monodll_xh_combo.obj \
         $(OBJS)\monodll_xh_clrpicker.obj \
         $(OBJS)\monodll_xh_collpane.obj \
         $(OBJS)\monodll_xh_combo.obj \
+       $(OBJS)\monodll_xh_comboctrl.obj \
         $(OBJS)\monodll_xh_datectrl.obj \
         $(OBJS)\monodll_xh_dirpicker.obj \
         $(OBJS)\monodll_xh_dlg.obj \
         $(OBJS)\monodll_xh_datectrl.obj \
         $(OBJS)\monodll_xh_dirpicker.obj \
         $(OBJS)\monodll_xh_dlg.obj \
-       $(OBJS)\monodll_xh_frame.obj \
-       $(OBJS)\monodll_xh_mdi.obj \
+       $(OBJS)\monodll_xh_editlbox.obj \
+       $(OBJS)\monodll_xh_filectrl.obj \
         $(OBJS)\monodll_xh_filepicker.obj \
         $(OBJS)\monodll_xh_fontpicker.obj \
         $(OBJS)\monodll_xh_filepicker.obj \
         $(OBJS)\monodll_xh_fontpicker.obj \
+       $(OBJS)\monodll_xh_frame.obj \
         $(OBJS)\monodll_xh_gauge.obj \
         $(OBJS)\monodll_xh_gdctl.obj \
         $(OBJS)\monodll_xh_grid.obj \
         $(OBJS)\monodll_xh_gauge.obj \
         $(OBJS)\monodll_xh_gdctl.obj \
         $(OBJS)\monodll_xh_grid.obj \
@@ -1599,6 +1753,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_xh_listb.obj \
         $(OBJS)\monodll_xh_listbk.obj \
         $(OBJS)\monodll_xh_listc.obj \
         $(OBJS)\monodll_xh_listb.obj \
         $(OBJS)\monodll_xh_listbk.obj \
         $(OBJS)\monodll_xh_listc.obj \
+       $(OBJS)\monodll_xh_mdi.obj \
         $(OBJS)\monodll_xh_menu.obj \
         $(OBJS)\monodll_xh_notbk.obj \
         $(OBJS)\monodll_xh_odcombo.obj \
         $(OBJS)\monodll_xh_menu.obj \
         $(OBJS)\monodll_xh_notbk.obj \
         $(OBJS)\monodll_xh_odcombo.obj \
@@ -1627,12 +1782,32 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_xh_unkwn.obj \
         $(OBJS)\monodll_xh_wizrd.obj \
         $(OBJS)\monodll_xmlres.obj \
         $(OBJS)\monodll_xh_unkwn.obj \
         $(OBJS)\monodll_xh_wizrd.obj \
         $(OBJS)\monodll_xmlres.obj \
+       $(OBJS)\monodll_xmladv.obj \
         $(OBJS)\monodll_xmlrsall.obj \
         $(OBJS)\monodll_framemanager.obj \
         $(OBJS)\monodll_dockart.obj \
         $(OBJS)\monodll_floatpane.obj \
         $(OBJS)\monodll_auibook.obj \
         $(OBJS)\monodll_xmlrsall.obj \
         $(OBJS)\monodll_framemanager.obj \
         $(OBJS)\monodll_dockart.obj \
         $(OBJS)\monodll_floatpane.obj \
         $(OBJS)\monodll_auibook.obj \
+       $(OBJS)\monodll_auibar.obj \
         $(OBJS)\monodll_tabmdi.obj \
         $(OBJS)\monodll_tabmdi.obj \
+       $(OBJS)\monodll_advprops.obj \
+       $(OBJS)\monodll_editors.obj \
+       $(OBJS)\monodll_manager.obj \
+       $(OBJS)\monodll_property.obj \
+       $(OBJS)\monodll_propgrid.obj \
+       $(OBJS)\monodll_propgridiface.obj \
+       $(OBJS)\monodll_propgridpagestate.obj \
+       $(OBJS)\monodll_props.obj \
+       $(OBJS)\monodll_art_internal.obj \
+       $(OBJS)\monodll_art_msw.obj \
+       $(OBJS)\monodll_art_aui.obj \
+       $(OBJS)\monodll_bar.obj \
+       $(OBJS)\monodll_ribbon_buttonbar.obj \
+       $(OBJS)\monodll_ribbon_control.obj \
+       $(OBJS)\monodll_gallery.obj \
+       $(OBJS)\monodll_page.obj \
+       $(OBJS)\monodll_panel.obj \
+       $(OBJS)\monodll_ribbon_toolbar.obj \
         $(OBJS)\monodll_richtextctrl.obj \
         $(OBJS)\monodll_richtextbuffer.obj \
         $(OBJS)\monodll_richtextstyles.obj \
         $(OBJS)\monodll_richtextctrl.obj \
         $(OBJS)\monodll_richtextbuffer.obj \
         $(OBJS)\monodll_richtextstyles.obj \
@@ -1648,6 +1823,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_activex.obj \
         $(OBJS)\monodll_app.obj \
         $(OBJS)\monodll_bitmap.obj \
         $(OBJS)\monodll_brush.obj \
         $(OBJS)\monodll_app.obj \
         $(OBJS)\monodll_bitmap.obj \
         $(OBJS)\monodll_brush.obj \
@@ -1700,55 +1876,56 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_collpaneg.obj \
         $(OBJS)\monodll_filepickerg.obj \
         $(OBJS)\monodll_fontpickerg.obj \
         $(OBJS)\monodll_collpaneg.obj \
         $(OBJS)\monodll_filepickerg.obj \
         $(OBJS)\monodll_fontpickerg.obj \
-       $(OBJS)\monodll_statusbr.obj \
+       $(OBJS)\monodll_generic_statusbr.obj \
         $(OBJS)\monodll_prntdlgg.obj \
         $(OBJS)\monodll_prntdlgg.obj \
-       $(OBJS)\monodll_accel.obj \
-       $(OBJS)\monodll_bmpbuttn.obj \
-       $(OBJS)\monodll_button.obj \
-       $(OBJS)\monodll_checkbox.obj \
-       $(OBJS)\monodll_choice.obj \
+       $(OBJS)\monodll_msw_accel.obj \
+       $(OBJS)\monodll_artmsw.obj \
+       $(OBJS)\monodll_msw_bmpbuttn.obj \
+       $(OBJS)\monodll_msw_button.obj \
+       $(OBJS)\monodll_msw_checkbox.obj \
+       $(OBJS)\monodll_msw_choice.obj \
         $(OBJS)\monodll_colordlg.obj \
         $(OBJS)\monodll_combo.obj \
         $(OBJS)\monodll_colordlg.obj \
         $(OBJS)\monodll_combo.obj \
-       $(OBJS)\monodll_combobox.obj \
-       $(OBJS)\monodll_control.obj \
-       $(OBJS)\monodll_dialog.obj \
+       $(OBJS)\monodll_msw_combobox.obj \
+       $(OBJS)\monodll_msw_control.obj \
+       $(OBJS)\monodll_msw_dialog.obj \
         $(OBJS)\monodll_dirdlg.obj \
         $(OBJS)\monodll_dragimag.obj \
         $(OBJS)\monodll_filedlg.obj \
         $(OBJS)\monodll_frame.obj \
         $(OBJS)\monodll_dirdlg.obj \
         $(OBJS)\monodll_dragimag.obj \
         $(OBJS)\monodll_filedlg.obj \
         $(OBJS)\monodll_frame.obj \
-       $(OBJS)\monodll_gauge95.obj \
+       $(OBJS)\monodll_msw_gauge.obj \
+       $(OBJS)\monodll_headerctrl.obj \
         $(OBJS)\monodll_iniconf.obj \
         $(OBJS)\monodll_iniconf.obj \
-       $(OBJS)\monodll_listbox.obj \
-       $(OBJS)\monodll_listctrl.obj \
+       $(OBJS)\monodll_msw_listbox.obj \
+       $(OBJS)\monodll_msw_listctrl.obj \
         $(OBJS)\monodll_mdi.obj \
         $(OBJS)\monodll_mdi.obj \
-       $(OBJS)\monodll_menu.obj \
+       $(OBJS)\monodll_msw_menu.obj \
         $(OBJS)\monodll_menuitem.obj \
         $(OBJS)\monodll_metafile.obj \
         $(OBJS)\monodll_msgdlg.obj \
         $(OBJS)\monodll_nativdlg.obj \
         $(OBJS)\monodll_nativewin.obj \
         $(OBJS)\monodll_menuitem.obj \
         $(OBJS)\monodll_metafile.obj \
         $(OBJS)\monodll_msgdlg.obj \
         $(OBJS)\monodll_nativdlg.obj \
         $(OBJS)\monodll_nativewin.obj \
-       $(OBJS)\monodll_notebook.obj \
+       $(OBJS)\monodll_msw_notebook.obj \
         $(OBJS)\monodll_access.obj \
         $(OBJS)\monodll_ownerdrw.obj \
         $(OBJS)\monodll_access.obj \
         $(OBJS)\monodll_ownerdrw.obj \
-       $(OBJS)\monodll_radiobox.obj \
-       $(OBJS)\monodll_radiobut.obj \
-       $(OBJS)\monodll_scrolbar.obj \
-       $(OBJS)\monodll_slider95.obj \
-       $(OBJS)\monodll_spinbutt.obj \
+       $(OBJS)\monodll_msw_radiobox.obj \
+       $(OBJS)\monodll_msw_radiobut.obj \
+       $(OBJS)\monodll_msw_scrolbar.obj \
+       $(OBJS)\monodll_msw_slider.obj \
+       $(OBJS)\monodll_msw_spinbutt.obj \
         $(OBJS)\monodll_spinctrl.obj \
         $(OBJS)\monodll_spinctrl.obj \
-       $(OBJS)\monodll_statbmp.obj \
-       $(OBJS)\monodll_statbox.obj \
-       $(OBJS)\monodll_statbr95.obj \
-       $(OBJS)\monodll_statline.obj \
-       $(OBJS)\monodll_stattext.obj \
-       $(OBJS)\monodll_tabctrl.obj \
-       $(OBJS)\monodll_tbar95.obj \
-       $(OBJS)\monodll_textctrl.obj \
+       $(OBJS)\monodll_msw_statbmp.obj \
+       $(OBJS)\monodll_msw_statbox.obj \
+       $(OBJS)\monodll_statusbar.obj \
+       $(OBJS)\monodll_msw_statline.obj \
+       $(OBJS)\monodll_msw_stattext.obj \
+       $(OBJS)\monodll_msw_toolbar.obj \
+       $(OBJS)\monodll_msw_textctrl.obj \
         $(OBJS)\monodll_textentry.obj \
         $(OBJS)\monodll_textentry.obj \
-       $(OBJS)\monodll_tglbtn.obj \
+       $(OBJS)\monodll_msw_tglbtn.obj \
         $(OBJS)\monodll_treectrl.obj \
         $(OBJS)\monodll_treectrl.obj \
-       $(OBJS)\monodll_checklst.obj \
-       $(OBJS)\monodll_fdrepdlg.obj \
+       $(OBJS)\monodll_msw_checklst.obj \
+       $(OBJS)\monodll_msw_fdrepdlg.obj \
         $(OBJS)\monodll_fontdlg.obj \
         $(OBJS)\monodll_accelcmn.obj \
         $(OBJS)\monodll_accesscmn.obj \
         $(OBJS)\monodll_fontdlg.obj \
         $(OBJS)\monodll_accelcmn.obj \
         $(OBJS)\monodll_accesscmn.obj \
@@ -1800,6 +1977,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_geometry.obj \
         $(OBJS)\monodll_gifdecod.obj \
         $(OBJS)\monodll_graphcmn.obj \
         $(OBJS)\monodll_geometry.obj \
         $(OBJS)\monodll_gifdecod.obj \
         $(OBJS)\monodll_graphcmn.obj \
+       $(OBJS)\monodll_headercolcmn.obj \
+       $(OBJS)\monodll_headerctrlcmn.obj \
         $(OBJS)\monodll_helpbase.obj \
         $(OBJS)\monodll_iconbndl.obj \
         $(OBJS)\monodll_imagall.obj \
         $(OBJS)\monodll_helpbase.obj \
         $(OBJS)\monodll_iconbndl.obj \
         $(OBJS)\monodll_imagall.obj \
@@ -1820,18 +1999,22 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_listctrlcmn.obj \
         $(OBJS)\monodll_matrix.obj \
         $(OBJS)\monodll_menucmn.obj \
         $(OBJS)\monodll_listctrlcmn.obj \
         $(OBJS)\monodll_matrix.obj \
         $(OBJS)\monodll_menucmn.obj \
+       $(OBJS)\monodll_mousemanager.obj \
         $(OBJS)\monodll_nbkbase.obj \
         $(OBJS)\monodll_overlaycmn.obj \
         $(OBJS)\monodll_paper.obj \
         $(OBJS)\monodll_nbkbase.obj \
         $(OBJS)\monodll_overlaycmn.obj \
         $(OBJS)\monodll_paper.obj \
+       $(OBJS)\monodll_persist.obj \
         $(OBJS)\monodll_pickerbase.obj \
         $(OBJS)\monodll_popupcmn.obj \
         $(OBJS)\monodll_prntbase.obj \
         $(OBJS)\monodll_quantize.obj \
         $(OBJS)\monodll_radiocmn.obj \
         $(OBJS)\monodll_pickerbase.obj \
         $(OBJS)\monodll_popupcmn.obj \
         $(OBJS)\monodll_prntbase.obj \
         $(OBJS)\monodll_quantize.obj \
         $(OBJS)\monodll_radiocmn.obj \
+       $(OBJS)\monodll_rearrangectrl.obj \
         $(OBJS)\monodll_rendcmn.obj \
         $(OBJS)\monodll_rgncmn.obj \
         $(OBJS)\monodll_settcmn.obj \
         $(OBJS)\monodll_sizer.obj \
         $(OBJS)\monodll_rendcmn.obj \
         $(OBJS)\monodll_rgncmn.obj \
         $(OBJS)\monodll_settcmn.obj \
         $(OBJS)\monodll_sizer.obj \
+       $(OBJS)\monodll_spinctrlcmn.obj \
         $(OBJS)\monodll_srchcmn.obj \
         $(OBJS)\monodll_statbar.obj \
         $(OBJS)\monodll_stattextcmn.obj \
         $(OBJS)\monodll_srchcmn.obj \
         $(OBJS)\monodll_statbar.obj \
         $(OBJS)\monodll_stattextcmn.obj \
@@ -1846,9 +2029,10 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_valtext.obj \
         $(OBJS)\monodll_wincmn.obj \
         $(OBJS)\monodll_windowid.obj \
         $(OBJS)\monodll_valtext.obj \
         $(OBJS)\monodll_wincmn.obj \
         $(OBJS)\monodll_windowid.obj \
+       $(OBJS)\monodll_wrapsizer.obj \
         $(OBJS)\monodll_xpmdecod.obj \
         $(OBJS)\monodll_busyinfo.obj \
         $(OBJS)\monodll_xpmdecod.obj \
         $(OBJS)\monodll_busyinfo.obj \
-       $(OBJS)\monodll_buttonbar.obj \
+       $(OBJS)\monodll_generic_buttonbar.obj \
         $(OBJS)\monodll_choicdgg.obj \
         $(OBJS)\monodll_choicbkg.obj \
         $(OBJS)\monodll_combog.obj \
         $(OBJS)\monodll_choicdgg.obj \
         $(OBJS)\monodll_choicbkg.obj \
         $(OBJS)\monodll_combog.obj \
@@ -1856,6 +2040,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_dirctrlg.obj \
         $(OBJS)\monodll_dragimgg.obj \
         $(OBJS)\monodll_filectrlg.obj \
         $(OBJS)\monodll_dirctrlg.obj \
         $(OBJS)\monodll_dragimgg.obj \
         $(OBJS)\monodll_filectrlg.obj \
+       $(OBJS)\monodll_headerctrlg.obj \
         $(OBJS)\monodll_listbkg.obj \
         $(OBJS)\monodll_logg.obj \
         $(OBJS)\monodll_numdlgg.obj \
         $(OBJS)\monodll_listbkg.obj \
         $(OBJS)\monodll_logg.obj \
         $(OBJS)\monodll_numdlgg.obj \
@@ -1868,6 +2053,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_spinctlg.obj \
         $(OBJS)\monodll_splitter.obj \
         $(OBJS)\monodll_srchctlg.obj \
         $(OBJS)\monodll_spinctlg.obj \
         $(OBJS)\monodll_splitter.obj \
         $(OBJS)\monodll_srchctlg.obj \
+       $(OBJS)\monodll_statbmpg.obj \
+       $(OBJS)\monodll_stattextg.obj \
         $(OBJS)\monodll_textdlgg.obj \
         $(OBJS)\monodll_tipwin.obj \
         $(OBJS)\monodll_toolbkg.obj \
         $(OBJS)\monodll_textdlgg.obj \
         $(OBJS)\monodll_tipwin.obj \
         $(OBJS)\monodll_toolbkg.obj \
@@ -1878,6 +2065,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
  ____CORE_SRC_FILENAMES_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
  ____CORE_SRC_FILENAMES_OBJECTS =  \
+       $(OBJS)\monodll_activex.obj \
         $(OBJS)\monodll_app.obj \
         $(OBJS)\monodll_bitmap.obj \
         $(OBJS)\monodll_brush.obj \
         $(OBJS)\monodll_app.obj \
         $(OBJS)\monodll_bitmap.obj \
         $(OBJS)\monodll_brush.obj \
@@ -1926,55 +2114,54 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_helpwin.obj \
         $(OBJS)\monodll_automtn.obj \
         $(OBJS)\monodll_uuid.obj \
         $(OBJS)\monodll_helpwin.obj \
         $(OBJS)\monodll_automtn.obj \
         $(OBJS)\monodll_uuid.obj \
-       $(OBJS)\monodll_accel.obj \
+       $(OBJS)\monodll_generic_accel.obj \
         $(OBJS)\monodll_clrpickerg.obj \
         $(OBJS)\monodll_collpaneg.obj \
         $(OBJS)\monodll_colrdlgg.obj \
         $(OBJS)\monodll_dirdlgg.obj \
         $(OBJS)\monodll_clrpickerg.obj \
         $(OBJS)\monodll_collpaneg.obj \
         $(OBJS)\monodll_colrdlgg.obj \
         $(OBJS)\monodll_dirdlgg.obj \
-       $(OBJS)\monodll_fdrepdlg.obj \
+       $(OBJS)\monodll_generic_fdrepdlg.obj \
         $(OBJS)\monodll_filedlgg.obj \
         $(OBJS)\monodll_filepickerg.obj \
         $(OBJS)\monodll_fontdlgg.obj \
         $(OBJS)\monodll_fontpickerg.obj \
         $(OBJS)\monodll_filedlgg.obj \
         $(OBJS)\monodll_filepickerg.obj \
         $(OBJS)\monodll_fontdlgg.obj \
         $(OBJS)\monodll_fontpickerg.obj \
-       $(OBJS)\monodll_listctrl.obj \
+       $(OBJS)\monodll_generic_listctrl.obj \
         $(OBJS)\monodll_mdig.obj \
         $(OBJS)\monodll_msgdlgg.obj \
         $(OBJS)\monodll_prntdlgg.obj \
         $(OBJS)\monodll_mdig.obj \
         $(OBJS)\monodll_msgdlgg.obj \
         $(OBJS)\monodll_prntdlgg.obj \
-       $(OBJS)\monodll_tabg.obj \
-       $(OBJS)\monodll_bmpbuttn.obj \
-       $(OBJS)\monodll_button.obj \
-       $(OBJS)\monodll_checkbox.obj \
-       $(OBJS)\monodll_checklst.obj \
-       $(OBJS)\monodll_choice.obj \
-       $(OBJS)\monodll_colschem.obj \
-       $(OBJS)\monodll_combobox.obj \
-       $(OBJS)\monodll_control.obj \
+       $(OBJS)\monodll_univ_bmpbuttn.obj \
+       $(OBJS)\monodll_univ_button.obj \
+       $(OBJS)\monodll_univ_checkbox.obj \
+       $(OBJS)\monodll_univ_checklst.obj \
+       $(OBJS)\monodll_univ_choice.obj \
+       $(OBJS)\monodll_univ_combobox.obj \
+       $(OBJS)\monodll_univ_control.obj \
         $(OBJS)\monodll_ctrlrend.obj \
         $(OBJS)\monodll_ctrlrend.obj \
-       $(OBJS)\monodll_dialog.obj \
+       $(OBJS)\monodll_univ_dialog.obj \
         $(OBJS)\monodll_framuniv.obj \
         $(OBJS)\monodll_framuniv.obj \
-       $(OBJS)\monodll_gauge.obj \
+       $(OBJS)\monodll_univ_gauge.obj \
         $(OBJS)\monodll_inpcons.obj \
         $(OBJS)\monodll_inphand.obj \
         $(OBJS)\monodll_inpcons.obj \
         $(OBJS)\monodll_inphand.obj \
-       $(OBJS)\monodll_listbox.obj \
-       $(OBJS)\monodll_menu.obj \
-       $(OBJS)\monodll_notebook.obj \
-       $(OBJS)\monodll_radiobox.obj \
-       $(OBJS)\monodll_radiobut.obj \
+       $(OBJS)\monodll_univ_listbox.obj \
+       $(OBJS)\monodll_univ_menu.obj \
+       $(OBJS)\monodll_univ_notebook.obj \
+       $(OBJS)\monodll_univ_radiobox.obj \
+       $(OBJS)\monodll_univ_radiobut.obj \
         $(OBJS)\monodll_scrarrow.obj \
         $(OBJS)\monodll_scrarrow.obj \
-       $(OBJS)\monodll_scrolbar.obj \
+       $(OBJS)\monodll_univ_scrolbar.obj \
         $(OBJS)\monodll_scrthumb.obj \
         $(OBJS)\monodll_scrthumb.obj \
-       $(OBJS)\monodll_slider.obj \
-       $(OBJS)\monodll_spinbutt.obj \
-       $(OBJS)\monodll_statbmp.obj \
-       $(OBJS)\monodll_statbox.obj \
-       $(OBJS)\monodll_statline.obj \
-       $(OBJS)\monodll_stattext.obj \
-       $(OBJS)\monodll_statusbr.obj \
+       $(OBJS)\monodll_settingsuniv.obj \
+       $(OBJS)\monodll_univ_slider.obj \
+       $(OBJS)\monodll_univ_spinbutt.obj \
+       $(OBJS)\monodll_univ_statbmp.obj \
+       $(OBJS)\monodll_univ_statbox.obj \
+       $(OBJS)\monodll_univ_statline.obj \
+       $(OBJS)\monodll_univ_stattext.obj \
+       $(OBJS)\monodll_univ_statusbr.obj \
         $(OBJS)\monodll_stdrend.obj \
         $(OBJS)\monodll_stdrend.obj \
-       $(OBJS)\monodll_textctrl.obj \
-       $(OBJS)\monodll_tglbtn.obj \
+       $(OBJS)\monodll_univ_textctrl.obj \
+       $(OBJS)\monodll_univ_tglbtn.obj \
         $(OBJS)\monodll_theme.obj \
         $(OBJS)\monodll_theme.obj \
-       $(OBJS)\monodll_toolbar.obj \
+       $(OBJS)\monodll_univ_toolbar.obj \
         $(OBJS)\monodll_topluniv.obj \
         $(OBJS)\monodll_winuniv.obj \
         $(OBJS)\monodll_gtk.obj \
         $(OBJS)\monodll_topluniv.obj \
         $(OBJS)\monodll_winuniv.obj \
         $(OBJS)\monodll_gtk.obj \
@@ -2031,6 +2218,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_geometry.obj \
         $(OBJS)\monodll_gifdecod.obj \
         $(OBJS)\monodll_graphcmn.obj \
         $(OBJS)\monodll_geometry.obj \
         $(OBJS)\monodll_gifdecod.obj \
         $(OBJS)\monodll_graphcmn.obj \
+       $(OBJS)\monodll_headercolcmn.obj \
+       $(OBJS)\monodll_headerctrlcmn.obj \
         $(OBJS)\monodll_helpbase.obj \
         $(OBJS)\monodll_iconbndl.obj \
         $(OBJS)\monodll_imagall.obj \
         $(OBJS)\monodll_helpbase.obj \
         $(OBJS)\monodll_iconbndl.obj \
         $(OBJS)\monodll_imagall.obj \
@@ -2051,18 +2240,22 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_listctrlcmn.obj \
         $(OBJS)\monodll_matrix.obj \
         $(OBJS)\monodll_menucmn.obj \
         $(OBJS)\monodll_listctrlcmn.obj \
         $(OBJS)\monodll_matrix.obj \
         $(OBJS)\monodll_menucmn.obj \
+       $(OBJS)\monodll_mousemanager.obj \
         $(OBJS)\monodll_nbkbase.obj \
         $(OBJS)\monodll_overlaycmn.obj \
         $(OBJS)\monodll_paper.obj \
         $(OBJS)\monodll_nbkbase.obj \
         $(OBJS)\monodll_overlaycmn.obj \
         $(OBJS)\monodll_paper.obj \
+       $(OBJS)\monodll_persist.obj \
         $(OBJS)\monodll_pickerbase.obj \
         $(OBJS)\monodll_popupcmn.obj \
         $(OBJS)\monodll_prntbase.obj \
         $(OBJS)\monodll_quantize.obj \
         $(OBJS)\monodll_radiocmn.obj \
         $(OBJS)\monodll_pickerbase.obj \
         $(OBJS)\monodll_popupcmn.obj \
         $(OBJS)\monodll_prntbase.obj \
         $(OBJS)\monodll_quantize.obj \
         $(OBJS)\monodll_radiocmn.obj \
+       $(OBJS)\monodll_rearrangectrl.obj \
         $(OBJS)\monodll_rendcmn.obj \
         $(OBJS)\monodll_rgncmn.obj \
         $(OBJS)\monodll_settcmn.obj \
         $(OBJS)\monodll_sizer.obj \
         $(OBJS)\monodll_rendcmn.obj \
         $(OBJS)\monodll_rgncmn.obj \
         $(OBJS)\monodll_settcmn.obj \
         $(OBJS)\monodll_sizer.obj \
+       $(OBJS)\monodll_spinctrlcmn.obj \
         $(OBJS)\monodll_srchcmn.obj \
         $(OBJS)\monodll_statbar.obj \
         $(OBJS)\monodll_stattextcmn.obj \
         $(OBJS)\monodll_srchcmn.obj \
         $(OBJS)\monodll_statbar.obj \
         $(OBJS)\monodll_stattextcmn.obj \
@@ -2077,9 +2270,10 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_valtext.obj \
         $(OBJS)\monodll_wincmn.obj \
         $(OBJS)\monodll_windowid.obj \
         $(OBJS)\monodll_valtext.obj \
         $(OBJS)\monodll_wincmn.obj \
         $(OBJS)\monodll_windowid.obj \
+       $(OBJS)\monodll_wrapsizer.obj \
         $(OBJS)\monodll_xpmdecod.obj \
         $(OBJS)\monodll_busyinfo.obj \
         $(OBJS)\monodll_xpmdecod.obj \
         $(OBJS)\monodll_busyinfo.obj \
-       $(OBJS)\monodll_buttonbar.obj \
+       $(OBJS)\monodll_generic_buttonbar.obj \
         $(OBJS)\monodll_choicdgg.obj \
         $(OBJS)\monodll_choicbkg.obj \
         $(OBJS)\monodll_combog.obj \
         $(OBJS)\monodll_choicdgg.obj \
         $(OBJS)\monodll_choicbkg.obj \
         $(OBJS)\monodll_combog.obj \
@@ -2087,6 +2281,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_dirctrlg.obj \
         $(OBJS)\monodll_dragimgg.obj \
         $(OBJS)\monodll_filectrlg.obj \
         $(OBJS)\monodll_dirctrlg.obj \
         $(OBJS)\monodll_dragimgg.obj \
         $(OBJS)\monodll_filectrlg.obj \
+       $(OBJS)\monodll_headerctrlg.obj \
         $(OBJS)\monodll_listbkg.obj \
         $(OBJS)\monodll_logg.obj \
         $(OBJS)\monodll_numdlgg.obj \
         $(OBJS)\monodll_listbkg.obj \
         $(OBJS)\monodll_logg.obj \
         $(OBJS)\monodll_numdlgg.obj \
@@ -2099,6 +2294,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_spinctlg.obj \
         $(OBJS)\monodll_splitter.obj \
         $(OBJS)\monodll_srchctlg.obj \
         $(OBJS)\monodll_spinctlg.obj \
         $(OBJS)\monodll_splitter.obj \
         $(OBJS)\monodll_srchctlg.obj \
+       $(OBJS)\monodll_statbmpg.obj \
+       $(OBJS)\monodll_stattextg.obj \
         $(OBJS)\monodll_textdlgg.obj \
         $(OBJS)\monodll_tipwin.obj \
         $(OBJS)\monodll_toolbkg.obj \
         $(OBJS)\monodll_textdlgg.obj \
         $(OBJS)\monodll_tipwin.obj \
         $(OBJS)\monodll_toolbkg.obj \
@@ -2110,19 +2307,23 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_animatecmn.obj \
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_animatecmn.obj \
+       $(OBJS)\monodll_bmpcboxcmn.obj \
+       $(OBJS)\monodll_calctrlcmn.obj \
         $(OBJS)\monodll_datavcmn.obj \
         $(OBJS)\monodll_hyperlnkcmn.obj \
         $(OBJS)\monodll_aboutdlgg.obj \
         $(OBJS)\monodll_bmpcboxg.obj \
         $(OBJS)\monodll_datavcmn.obj \
         $(OBJS)\monodll_hyperlnkcmn.obj \
         $(OBJS)\monodll_aboutdlgg.obj \
         $(OBJS)\monodll_bmpcboxg.obj \
-       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_calctrlg.obj \
         $(OBJS)\monodll_datavgen.obj \
         $(OBJS)\monodll_datectlg.obj \
         $(OBJS)\monodll_editlbox.obj \
         $(OBJS)\monodll_grid.obj \
         $(OBJS)\monodll_gridctrl.obj \
         $(OBJS)\monodll_datavgen.obj \
         $(OBJS)\monodll_datectlg.obj \
         $(OBJS)\monodll_editlbox.obj \
         $(OBJS)\monodll_grid.obj \
         $(OBJS)\monodll_gridctrl.obj \
+       $(OBJS)\monodll_grideditors.obj \
         $(OBJS)\monodll_gridsel.obj \
         $(OBJS)\monodll_helpext.obj \
         $(OBJS)\monodll_hyperlinkg.obj \
         $(OBJS)\monodll_gridsel.obj \
         $(OBJS)\monodll_helpext.obj \
         $(OBJS)\monodll_hyperlinkg.obj \
+       $(OBJS)\monodll_infobar.obj \
         $(OBJS)\monodll_laywin.obj \
         $(OBJS)\monodll_notifmsgg.obj \
         $(OBJS)\monodll_odcombo.obj \
         $(OBJS)\monodll_laywin.obj \
         $(OBJS)\monodll_notifmsgg.obj \
         $(OBJS)\monodll_odcombo.obj \
@@ -2132,30 +2333,37 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_tipdlg.obj \
         $(OBJS)\monodll_wizard.obj \
         $(OBJS)\monodll_taskbarcmn.obj \
         $(OBJS)\monodll_tipdlg.obj \
         $(OBJS)\monodll_wizard.obj \
         $(OBJS)\monodll_taskbarcmn.obj \
-       $(OBJS)\monodll_animateg.obj \
         $(OBJS)\monodll_aboutdlg.obj \
         $(OBJS)\monodll_notifmsg.obj \
         $(OBJS)\monodll_sound.obj \
         $(OBJS)\monodll_taskbar.obj \
         $(OBJS)\monodll_joystick.obj \
         $(OBJS)\monodll_aboutdlg.obj \
         $(OBJS)\monodll_notifmsg.obj \
         $(OBJS)\monodll_sound.obj \
         $(OBJS)\monodll_taskbar.obj \
         $(OBJS)\monodll_joystick.obj \
+       $(OBJS)\monodll_animateg.obj \
+       $(OBJS)\monodll_bmpcbox.obj \
+       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_datecontrols.obj \
         $(OBJS)\monodll_datectrl.obj
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_animatecmn.obj \
         $(OBJS)\monodll_datectrl.obj
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_animatecmn.obj \
+       $(OBJS)\monodll_bmpcboxcmn.obj \
+       $(OBJS)\monodll_calctrlcmn.obj \
         $(OBJS)\monodll_datavcmn.obj \
         $(OBJS)\monodll_hyperlnkcmn.obj \
         $(OBJS)\monodll_aboutdlgg.obj \
         $(OBJS)\monodll_bmpcboxg.obj \
         $(OBJS)\monodll_datavcmn.obj \
         $(OBJS)\monodll_hyperlnkcmn.obj \
         $(OBJS)\monodll_aboutdlgg.obj \
         $(OBJS)\monodll_bmpcboxg.obj \
-       $(OBJS)\monodll_calctrl.obj \
+       $(OBJS)\monodll_calctrlg.obj \
         $(OBJS)\monodll_datavgen.obj \
         $(OBJS)\monodll_datectlg.obj \
         $(OBJS)\monodll_editlbox.obj \
         $(OBJS)\monodll_grid.obj \
         $(OBJS)\monodll_gridctrl.obj \
         $(OBJS)\monodll_datavgen.obj \
         $(OBJS)\monodll_datectlg.obj \
         $(OBJS)\monodll_editlbox.obj \
         $(OBJS)\monodll_grid.obj \
         $(OBJS)\monodll_gridctrl.obj \
+       $(OBJS)\monodll_grideditors.obj \
         $(OBJS)\monodll_gridsel.obj \
         $(OBJS)\monodll_helpext.obj \
         $(OBJS)\monodll_hyperlinkg.obj \
         $(OBJS)\monodll_gridsel.obj \
         $(OBJS)\monodll_helpext.obj \
         $(OBJS)\monodll_hyperlinkg.obj \
+       $(OBJS)\monodll_infobar.obj \
         $(OBJS)\monodll_laywin.obj \
         $(OBJS)\monodll_notifmsgg.obj \
         $(OBJS)\monodll_odcombo.obj \
         $(OBJS)\monodll_laywin.obj \
         $(OBJS)\monodll_notifmsgg.obj \
         $(OBJS)\monodll_odcombo.obj \
@@ -2165,7 +2373,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
         $(OBJS)\monodll_tipdlg.obj \
         $(OBJS)\monodll_wizard.obj \
         $(OBJS)\monodll_taskbarcmn.obj \
         $(OBJS)\monodll_tipdlg.obj \
         $(OBJS)\monodll_wizard.obj \
         $(OBJS)\monodll_taskbarcmn.obj \
-       $(OBJS)\monodll_animateg.obj \
         $(OBJS)\monodll_aboutdlg.obj \
         $(OBJS)\monodll_notifmsg.obj \
         $(OBJS)\monodll_sound.obj \
         $(OBJS)\monodll_aboutdlg.obj \
         $(OBJS)\monodll_notifmsg.obj \
         $(OBJS)\monodll_sound.obj \
@@ -2181,10 +2388,10 @@ __monolib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_113 = D
+__RUNTIME_LIBS_131 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_113 = $(__THREADSFLAG)
+__RUNTIME_LIBS_131 = $(__THREADSFLAG)
  !endif
  !if "$(USE_GUI)" == "1"
  ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1"
  ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
@@ -2194,7 +2401,6 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_mediactrl_am.obj \
         $(OBJS)\monolib_mediactrl_wmp10.obj \
         $(OBJS)\monolib_mediactrl_qt.obj \
         $(OBJS)\monolib_mediactrl_am.obj \
         $(OBJS)\monolib_mediactrl_wmp10.obj \
         $(OBJS)\monolib_mediactrl_qt.obj \
-       $(OBJS)\monolib_activex.obj \
         $(OBJS)\monolib_helpbest.obj \
         $(OBJS)\monolib_helpctrl.obj \
         $(OBJS)\monolib_helpdata.obj \
         $(OBJS)\monolib_helpbest.obj \
         $(OBJS)\monolib_helpctrl.obj \
         $(OBJS)\monolib_helpdata.obj \
@@ -2234,13 +2440,15 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_xh_clrpicker.obj \
         $(OBJS)\monolib_xh_collpane.obj \
         $(OBJS)\monolib_xh_combo.obj \
         $(OBJS)\monolib_xh_clrpicker.obj \
         $(OBJS)\monolib_xh_collpane.obj \
         $(OBJS)\monolib_xh_combo.obj \
+       $(OBJS)\monolib_xh_comboctrl.obj \
         $(OBJS)\monolib_xh_datectrl.obj \
         $(OBJS)\monolib_xh_dirpicker.obj \
         $(OBJS)\monolib_xh_dlg.obj \
         $(OBJS)\monolib_xh_datectrl.obj \
         $(OBJS)\monolib_xh_dirpicker.obj \
         $(OBJS)\monolib_xh_dlg.obj \
-       $(OBJS)\monolib_xh_frame.obj \
-       $(OBJS)\monolib_xh_mdi.obj \
+       $(OBJS)\monolib_xh_editlbox.obj \
+       $(OBJS)\monolib_xh_filectrl.obj \
         $(OBJS)\monolib_xh_filepicker.obj \
         $(OBJS)\monolib_xh_fontpicker.obj \
         $(OBJS)\monolib_xh_filepicker.obj \
         $(OBJS)\monolib_xh_fontpicker.obj \
+       $(OBJS)\monolib_xh_frame.obj \
         $(OBJS)\monolib_xh_gauge.obj \
         $(OBJS)\monolib_xh_gdctl.obj \
         $(OBJS)\monolib_xh_grid.obj \
         $(OBJS)\monolib_xh_gauge.obj \
         $(OBJS)\monolib_xh_gdctl.obj \
         $(OBJS)\monolib_xh_grid.obj \
@@ -2249,6 +2457,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_xh_listb.obj \
         $(OBJS)\monolib_xh_listbk.obj \
         $(OBJS)\monolib_xh_listc.obj \
         $(OBJS)\monolib_xh_listb.obj \
         $(OBJS)\monolib_xh_listbk.obj \
         $(OBJS)\monolib_xh_listc.obj \
+       $(OBJS)\monolib_xh_mdi.obj \
         $(OBJS)\monolib_xh_menu.obj \
         $(OBJS)\monolib_xh_notbk.obj \
         $(OBJS)\monolib_xh_odcombo.obj \
         $(OBJS)\monolib_xh_menu.obj \
         $(OBJS)\monolib_xh_notbk.obj \
         $(OBJS)\monolib_xh_odcombo.obj \
@@ -2277,12 +2486,32 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_xh_unkwn.obj \
         $(OBJS)\monolib_xh_wizrd.obj \
         $(OBJS)\monolib_xmlres.obj \
         $(OBJS)\monolib_xh_unkwn.obj \
         $(OBJS)\monolib_xh_wizrd.obj \
         $(OBJS)\monolib_xmlres.obj \
+       $(OBJS)\monolib_xmladv.obj \
         $(OBJS)\monolib_xmlrsall.obj \
         $(OBJS)\monolib_framemanager.obj \
         $(OBJS)\monolib_dockart.obj \
         $(OBJS)\monolib_floatpane.obj \
         $(OBJS)\monolib_auibook.obj \
         $(OBJS)\monolib_xmlrsall.obj \
         $(OBJS)\monolib_framemanager.obj \
         $(OBJS)\monolib_dockart.obj \
         $(OBJS)\monolib_floatpane.obj \
         $(OBJS)\monolib_auibook.obj \
+       $(OBJS)\monolib_auibar.obj \
         $(OBJS)\monolib_tabmdi.obj \
         $(OBJS)\monolib_tabmdi.obj \
+       $(OBJS)\monolib_advprops.obj \
+       $(OBJS)\monolib_editors.obj \
+       $(OBJS)\monolib_manager.obj \
+       $(OBJS)\monolib_property.obj \
+       $(OBJS)\monolib_propgrid.obj \
+       $(OBJS)\monolib_propgridiface.obj \
+       $(OBJS)\monolib_propgridpagestate.obj \
+       $(OBJS)\monolib_props.obj \
+       $(OBJS)\monolib_art_internal.obj \
+       $(OBJS)\monolib_art_msw.obj \
+       $(OBJS)\monolib_art_aui.obj \
+       $(OBJS)\monolib_bar.obj \
+       $(OBJS)\monolib_ribbon_buttonbar.obj \
+       $(OBJS)\monolib_ribbon_control.obj \
+       $(OBJS)\monolib_gallery.obj \
+       $(OBJS)\monolib_page.obj \
+       $(OBJS)\monolib_panel.obj \
+       $(OBJS)\monolib_ribbon_toolbar.obj \
         $(OBJS)\monolib_richtextctrl.obj \
         $(OBJS)\monolib_richtextbuffer.obj \
         $(OBJS)\monolib_richtextstyles.obj \
         $(OBJS)\monolib_richtextctrl.obj \
         $(OBJS)\monolib_richtextbuffer.obj \
         $(OBJS)\monolib_richtextstyles.obj \
@@ -2298,6 +2527,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_1_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_activex.obj \
         $(OBJS)\monolib_app.obj \
         $(OBJS)\monolib_bitmap.obj \
         $(OBJS)\monolib_brush.obj \
         $(OBJS)\monolib_app.obj \
         $(OBJS)\monolib_bitmap.obj \
         $(OBJS)\monolib_brush.obj \
@@ -2350,55 +2580,56 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_collpaneg.obj \
         $(OBJS)\monolib_filepickerg.obj \
         $(OBJS)\monolib_fontpickerg.obj \
         $(OBJS)\monolib_collpaneg.obj \
         $(OBJS)\monolib_filepickerg.obj \
         $(OBJS)\monolib_fontpickerg.obj \
-       $(OBJS)\monolib_statusbr.obj \
+       $(OBJS)\monolib_generic_statusbr.obj \
         $(OBJS)\monolib_prntdlgg.obj \
         $(OBJS)\monolib_prntdlgg.obj \
-       $(OBJS)\monolib_accel.obj \
-       $(OBJS)\monolib_bmpbuttn.obj \
-       $(OBJS)\monolib_button.obj \
-       $(OBJS)\monolib_checkbox.obj \
-       $(OBJS)\monolib_choice.obj \
+       $(OBJS)\monolib_msw_accel.obj \
+       $(OBJS)\monolib_artmsw.obj \
+       $(OBJS)\monolib_msw_bmpbuttn.obj \
+       $(OBJS)\monolib_msw_button.obj \
+       $(OBJS)\monolib_msw_checkbox.obj \
+       $(OBJS)\monolib_msw_choice.obj \
         $(OBJS)\monolib_colordlg.obj \
         $(OBJS)\monolib_combo.obj \
         $(OBJS)\monolib_colordlg.obj \
         $(OBJS)\monolib_combo.obj \
-       $(OBJS)\monolib_combobox.obj \
-       $(OBJS)\monolib_control.obj \
-       $(OBJS)\monolib_dialog.obj \
+       $(OBJS)\monolib_msw_combobox.obj \
+       $(OBJS)\monolib_msw_control.obj \
+       $(OBJS)\monolib_msw_dialog.obj \
         $(OBJS)\monolib_dirdlg.obj \
         $(OBJS)\monolib_dragimag.obj \
         $(OBJS)\monolib_filedlg.obj \
         $(OBJS)\monolib_frame.obj \
         $(OBJS)\monolib_dirdlg.obj \
         $(OBJS)\monolib_dragimag.obj \
         $(OBJS)\monolib_filedlg.obj \
         $(OBJS)\monolib_frame.obj \
-       $(OBJS)\monolib_gauge95.obj \
+       $(OBJS)\monolib_msw_gauge.obj \
+       $(OBJS)\monolib_headerctrl.obj \
         $(OBJS)\monolib_iniconf.obj \
         $(OBJS)\monolib_iniconf.obj \
-       $(OBJS)\monolib_listbox.obj \
-       $(OBJS)\monolib_listctrl.obj \
+       $(OBJS)\monolib_msw_listbox.obj \
+       $(OBJS)\monolib_msw_listctrl.obj \
         $(OBJS)\monolib_mdi.obj \
         $(OBJS)\monolib_mdi.obj \
-       $(OBJS)\monolib_menu.obj \
+       $(OBJS)\monolib_msw_menu.obj \
         $(OBJS)\monolib_menuitem.obj \
         $(OBJS)\monolib_metafile.obj \
         $(OBJS)\monolib_msgdlg.obj \
         $(OBJS)\monolib_nativdlg.obj \
         $(OBJS)\monolib_nativewin.obj \
         $(OBJS)\monolib_menuitem.obj \
         $(OBJS)\monolib_metafile.obj \
         $(OBJS)\monolib_msgdlg.obj \
         $(OBJS)\monolib_nativdlg.obj \
         $(OBJS)\monolib_nativewin.obj \
-       $(OBJS)\monolib_notebook.obj \
+       $(OBJS)\monolib_msw_notebook.obj \
         $(OBJS)\monolib_access.obj \
         $(OBJS)\monolib_ownerdrw.obj \
         $(OBJS)\monolib_access.obj \
         $(OBJS)\monolib_ownerdrw.obj \
-       $(OBJS)\monolib_radiobox.obj \
-       $(OBJS)\monolib_radiobut.obj \
-       $(OBJS)\monolib_scrolbar.obj \
-       $(OBJS)\monolib_slider95.obj \
-       $(OBJS)\monolib_spinbutt.obj \
+       $(OBJS)\monolib_msw_radiobox.obj \
+       $(OBJS)\monolib_msw_radiobut.obj \
+       $(OBJS)\monolib_msw_scrolbar.obj \
+       $(OBJS)\monolib_msw_slider.obj \
+       $(OBJS)\monolib_msw_spinbutt.obj \
         $(OBJS)\monolib_spinctrl.obj \
         $(OBJS)\monolib_spinctrl.obj \
-       $(OBJS)\monolib_statbmp.obj \
-       $(OBJS)\monolib_statbox.obj \
-       $(OBJS)\monolib_statbr95.obj \
-       $(OBJS)\monolib_statline.obj \
-       $(OBJS)\monolib_stattext.obj \
-       $(OBJS)\monolib_tabctrl.obj \
-       $(OBJS)\monolib_tbar95.obj \
-       $(OBJS)\monolib_textctrl.obj \
+       $(OBJS)\monolib_msw_statbmp.obj \
+       $(OBJS)\monolib_msw_statbox.obj \
+       $(OBJS)\monolib_statusbar.obj \
+       $(OBJS)\monolib_msw_statline.obj \
+       $(OBJS)\monolib_msw_stattext.obj \
+       $(OBJS)\monolib_msw_toolbar.obj \
+       $(OBJS)\monolib_msw_textctrl.obj \
         $(OBJS)\monolib_textentry.obj \
         $(OBJS)\monolib_textentry.obj \
-       $(OBJS)\monolib_tglbtn.obj \
+       $(OBJS)\monolib_msw_tglbtn.obj \
         $(OBJS)\monolib_treectrl.obj \
         $(OBJS)\monolib_treectrl.obj \
-       $(OBJS)\monolib_checklst.obj \
-       $(OBJS)\monolib_fdrepdlg.obj \
+       $(OBJS)\monolib_msw_checklst.obj \
+       $(OBJS)\monolib_msw_fdrepdlg.obj \
         $(OBJS)\monolib_fontdlg.obj \
         $(OBJS)\monolib_accelcmn.obj \
         $(OBJS)\monolib_accesscmn.obj \
         $(OBJS)\monolib_fontdlg.obj \
         $(OBJS)\monolib_accelcmn.obj \
         $(OBJS)\monolib_accesscmn.obj \
@@ -2450,6 +2681,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_geometry.obj \
         $(OBJS)\monolib_gifdecod.obj \
         $(OBJS)\monolib_graphcmn.obj \
         $(OBJS)\monolib_geometry.obj \
         $(OBJS)\monolib_gifdecod.obj \
         $(OBJS)\monolib_graphcmn.obj \
+       $(OBJS)\monolib_headercolcmn.obj \
+       $(OBJS)\monolib_headerctrlcmn.obj \
         $(OBJS)\monolib_helpbase.obj \
         $(OBJS)\monolib_iconbndl.obj \
         $(OBJS)\monolib_imagall.obj \
         $(OBJS)\monolib_helpbase.obj \
         $(OBJS)\monolib_iconbndl.obj \
         $(OBJS)\monolib_imagall.obj \
@@ -2470,18 +2703,22 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_listctrlcmn.obj \
         $(OBJS)\monolib_matrix.obj \
         $(OBJS)\monolib_menucmn.obj \
         $(OBJS)\monolib_listctrlcmn.obj \
         $(OBJS)\monolib_matrix.obj \
         $(OBJS)\monolib_menucmn.obj \
+       $(OBJS)\monolib_mousemanager.obj \
         $(OBJS)\monolib_nbkbase.obj \
         $(OBJS)\monolib_overlaycmn.obj \
         $(OBJS)\monolib_paper.obj \
         $(OBJS)\monolib_nbkbase.obj \
         $(OBJS)\monolib_overlaycmn.obj \
         $(OBJS)\monolib_paper.obj \
+       $(OBJS)\monolib_persist.obj \
         $(OBJS)\monolib_pickerbase.obj \
         $(OBJS)\monolib_popupcmn.obj \
         $(OBJS)\monolib_prntbase.obj \
         $(OBJS)\monolib_quantize.obj \
         $(OBJS)\monolib_radiocmn.obj \
         $(OBJS)\monolib_pickerbase.obj \
         $(OBJS)\monolib_popupcmn.obj \
         $(OBJS)\monolib_prntbase.obj \
         $(OBJS)\monolib_quantize.obj \
         $(OBJS)\monolib_radiocmn.obj \
+       $(OBJS)\monolib_rearrangectrl.obj \
         $(OBJS)\monolib_rendcmn.obj \
         $(OBJS)\monolib_rgncmn.obj \
         $(OBJS)\monolib_settcmn.obj \
         $(OBJS)\monolib_sizer.obj \
         $(OBJS)\monolib_rendcmn.obj \
         $(OBJS)\monolib_rgncmn.obj \
         $(OBJS)\monolib_settcmn.obj \
         $(OBJS)\monolib_sizer.obj \
+       $(OBJS)\monolib_spinctrlcmn.obj \
         $(OBJS)\monolib_srchcmn.obj \
         $(OBJS)\monolib_statbar.obj \
         $(OBJS)\monolib_stattextcmn.obj \
         $(OBJS)\monolib_srchcmn.obj \
         $(OBJS)\monolib_statbar.obj \
         $(OBJS)\monolib_stattextcmn.obj \
@@ -2496,9 +2733,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_valtext.obj \
         $(OBJS)\monolib_wincmn.obj \
         $(OBJS)\monolib_windowid.obj \
         $(OBJS)\monolib_valtext.obj \
         $(OBJS)\monolib_wincmn.obj \
         $(OBJS)\monolib_windowid.obj \
+       $(OBJS)\monolib_wrapsizer.obj \
         $(OBJS)\monolib_xpmdecod.obj \
         $(OBJS)\monolib_busyinfo.obj \
         $(OBJS)\monolib_xpmdecod.obj \
         $(OBJS)\monolib_busyinfo.obj \
-       $(OBJS)\monolib_buttonbar.obj \
+       $(OBJS)\monolib_generic_buttonbar.obj \
         $(OBJS)\monolib_choicdgg.obj \
         $(OBJS)\monolib_choicbkg.obj \
         $(OBJS)\monolib_combog.obj \
         $(OBJS)\monolib_choicdgg.obj \
         $(OBJS)\monolib_choicbkg.obj \
         $(OBJS)\monolib_combog.obj \
@@ -2506,6 +2744,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_dirctrlg.obj \
         $(OBJS)\monolib_dragimgg.obj \
         $(OBJS)\monolib_filectrlg.obj \
         $(OBJS)\monolib_dirctrlg.obj \
         $(OBJS)\monolib_dragimgg.obj \
         $(OBJS)\monolib_filectrlg.obj \
+       $(OBJS)\monolib_headerctrlg.obj \
         $(OBJS)\monolib_listbkg.obj \
         $(OBJS)\monolib_logg.obj \
         $(OBJS)\monolib_numdlgg.obj \
         $(OBJS)\monolib_listbkg.obj \
         $(OBJS)\monolib_logg.obj \
         $(OBJS)\monolib_numdlgg.obj \
@@ -2518,6 +2757,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_spinctlg.obj \
         $(OBJS)\monolib_splitter.obj \
         $(OBJS)\monolib_srchctlg.obj \
         $(OBJS)\monolib_spinctlg.obj \
         $(OBJS)\monolib_splitter.obj \
         $(OBJS)\monolib_srchctlg.obj \
+       $(OBJS)\monolib_statbmpg.obj \
+       $(OBJS)\monolib_stattextg.obj \
         $(OBJS)\monolib_textdlgg.obj \
         $(OBJS)\monolib_tipwin.obj \
         $(OBJS)\monolib_toolbkg.obj \
         $(OBJS)\monolib_textdlgg.obj \
         $(OBJS)\monolib_tipwin.obj \
         $(OBJS)\monolib_toolbkg.obj \
@@ -2528,6 +2769,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
  ____CORE_SRC_FILENAMES_1_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
  ____CORE_SRC_FILENAMES_1_OBJECTS =  \
+       $(OBJS)\monolib_activex.obj \
         $(OBJS)\monolib_app.obj \
         $(OBJS)\monolib_bitmap.obj \
         $(OBJS)\monolib_brush.obj \
         $(OBJS)\monolib_app.obj \
         $(OBJS)\monolib_bitmap.obj \
         $(OBJS)\monolib_brush.obj \
@@ -2576,55 +2818,54 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_helpwin.obj \
         $(OBJS)\monolib_automtn.obj \
         $(OBJS)\monolib_uuid.obj \
         $(OBJS)\monolib_helpwin.obj \
         $(OBJS)\monolib_automtn.obj \
         $(OBJS)\monolib_uuid.obj \
-       $(OBJS)\monolib_accel.obj \
+       $(OBJS)\monolib_generic_accel.obj \
         $(OBJS)\monolib_clrpickerg.obj \
         $(OBJS)\monolib_collpaneg.obj \
         $(OBJS)\monolib_colrdlgg.obj \
         $(OBJS)\monolib_dirdlgg.obj \
         $(OBJS)\monolib_clrpickerg.obj \
         $(OBJS)\monolib_collpaneg.obj \
         $(OBJS)\monolib_colrdlgg.obj \
         $(OBJS)\monolib_dirdlgg.obj \
-       $(OBJS)\monolib_fdrepdlg.obj \
+       $(OBJS)\monolib_generic_fdrepdlg.obj \
         $(OBJS)\monolib_filedlgg.obj \
         $(OBJS)\monolib_filepickerg.obj \
         $(OBJS)\monolib_fontdlgg.obj \
         $(OBJS)\monolib_fontpickerg.obj \
         $(OBJS)\monolib_filedlgg.obj \
         $(OBJS)\monolib_filepickerg.obj \
         $(OBJS)\monolib_fontdlgg.obj \
         $(OBJS)\monolib_fontpickerg.obj \
-       $(OBJS)\monolib_listctrl.obj \
+       $(OBJS)\monolib_generic_listctrl.obj \
         $(OBJS)\monolib_mdig.obj \
         $(OBJS)\monolib_msgdlgg.obj \
         $(OBJS)\monolib_prntdlgg.obj \
         $(OBJS)\monolib_mdig.obj \
         $(OBJS)\monolib_msgdlgg.obj \
         $(OBJS)\monolib_prntdlgg.obj \
-       $(OBJS)\monolib_tabg.obj \
-       $(OBJS)\monolib_bmpbuttn.obj \
-       $(OBJS)\monolib_button.obj \
-       $(OBJS)\monolib_checkbox.obj \
-       $(OBJS)\monolib_checklst.obj \
-       $(OBJS)\monolib_choice.obj \
-       $(OBJS)\monolib_colschem.obj \
-       $(OBJS)\monolib_combobox.obj \
-       $(OBJS)\monolib_control.obj \
+       $(OBJS)\monolib_univ_bmpbuttn.obj \
+       $(OBJS)\monolib_univ_button.obj \
+       $(OBJS)\monolib_univ_checkbox.obj \
+       $(OBJS)\monolib_univ_checklst.obj \
+       $(OBJS)\monolib_univ_choice.obj \
+       $(OBJS)\monolib_univ_combobox.obj \
+       $(OBJS)\monolib_univ_control.obj \
         $(OBJS)\monolib_ctrlrend.obj \
         $(OBJS)\monolib_ctrlrend.obj \
-       $(OBJS)\monolib_dialog.obj \
+       $(OBJS)\monolib_univ_dialog.obj \
         $(OBJS)\monolib_framuniv.obj \
         $(OBJS)\monolib_framuniv.obj \
-       $(OBJS)\monolib_gauge.obj \
+       $(OBJS)\monolib_univ_gauge.obj \
         $(OBJS)\monolib_inpcons.obj \
         $(OBJS)\monolib_inphand.obj \
         $(OBJS)\monolib_inpcons.obj \
         $(OBJS)\monolib_inphand.obj \
-       $(OBJS)\monolib_listbox.obj \
-       $(OBJS)\monolib_menu.obj \
-       $(OBJS)\monolib_notebook.obj \
-       $(OBJS)\monolib_radiobox.obj \
-       $(OBJS)\monolib_radiobut.obj \
+       $(OBJS)\monolib_univ_listbox.obj \
+       $(OBJS)\monolib_univ_menu.obj \
+       $(OBJS)\monolib_univ_notebook.obj \
+       $(OBJS)\monolib_univ_radiobox.obj \
+       $(OBJS)\monolib_univ_radiobut.obj \
         $(OBJS)\monolib_scrarrow.obj \
         $(OBJS)\monolib_scrarrow.obj \
-       $(OBJS)\monolib_scrolbar.obj \
+       $(OBJS)\monolib_univ_scrolbar.obj \
         $(OBJS)\monolib_scrthumb.obj \
         $(OBJS)\monolib_scrthumb.obj \
-       $(OBJS)\monolib_slider.obj \
-       $(OBJS)\monolib_spinbutt.obj \
-       $(OBJS)\monolib_statbmp.obj \
-       $(OBJS)\monolib_statbox.obj \
-       $(OBJS)\monolib_statline.obj \
-       $(OBJS)\monolib_stattext.obj \
-       $(OBJS)\monolib_statusbr.obj \
+       $(OBJS)\monolib_settingsuniv.obj \
+       $(OBJS)\monolib_univ_slider.obj \
+       $(OBJS)\monolib_univ_spinbutt.obj \
+       $(OBJS)\monolib_univ_statbmp.obj \
+       $(OBJS)\monolib_univ_statbox.obj \
+       $(OBJS)\monolib_univ_statline.obj \
+       $(OBJS)\monolib_univ_stattext.obj \
+       $(OBJS)\monolib_univ_statusbr.obj \
         $(OBJS)\monolib_stdrend.obj \
         $(OBJS)\monolib_stdrend.obj \
-       $(OBJS)\monolib_textctrl.obj \
-       $(OBJS)\monolib_tglbtn.obj \
+       $(OBJS)\monolib_univ_textctrl.obj \
+       $(OBJS)\monolib_univ_tglbtn.obj \
         $(OBJS)\monolib_theme.obj \
         $(OBJS)\monolib_theme.obj \
-       $(OBJS)\monolib_toolbar.obj \
+       $(OBJS)\monolib_univ_toolbar.obj \
         $(OBJS)\monolib_topluniv.obj \
         $(OBJS)\monolib_winuniv.obj \
         $(OBJS)\monolib_gtk.obj \
         $(OBJS)\monolib_topluniv.obj \
         $(OBJS)\monolib_winuniv.obj \
         $(OBJS)\monolib_gtk.obj \
@@ -2681,6 +2922,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_geometry.obj \
         $(OBJS)\monolib_gifdecod.obj \
         $(OBJS)\monolib_graphcmn.obj \
         $(OBJS)\monolib_geometry.obj \
         $(OBJS)\monolib_gifdecod.obj \
         $(OBJS)\monolib_graphcmn.obj \
+       $(OBJS)\monolib_headercolcmn.obj \
+       $(OBJS)\monolib_headerctrlcmn.obj \
         $(OBJS)\monolib_helpbase.obj \
         $(OBJS)\monolib_iconbndl.obj \
         $(OBJS)\monolib_imagall.obj \
         $(OBJS)\monolib_helpbase.obj \
         $(OBJS)\monolib_iconbndl.obj \
         $(OBJS)\monolib_imagall.obj \
@@ -2701,18 +2944,22 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_listctrlcmn.obj \
         $(OBJS)\monolib_matrix.obj \
         $(OBJS)\monolib_menucmn.obj \
         $(OBJS)\monolib_listctrlcmn.obj \
         $(OBJS)\monolib_matrix.obj \
         $(OBJS)\monolib_menucmn.obj \
+       $(OBJS)\monolib_mousemanager.obj \
         $(OBJS)\monolib_nbkbase.obj \
         $(OBJS)\monolib_overlaycmn.obj \
         $(OBJS)\monolib_paper.obj \
         $(OBJS)\monolib_nbkbase.obj \
         $(OBJS)\monolib_overlaycmn.obj \
         $(OBJS)\monolib_paper.obj \
+       $(OBJS)\monolib_persist.obj \
         $(OBJS)\monolib_pickerbase.obj \
         $(OBJS)\monolib_popupcmn.obj \
         $(OBJS)\monolib_prntbase.obj \
         $(OBJS)\monolib_quantize.obj \
         $(OBJS)\monolib_radiocmn.obj \
         $(OBJS)\monolib_pickerbase.obj \
         $(OBJS)\monolib_popupcmn.obj \
         $(OBJS)\monolib_prntbase.obj \
         $(OBJS)\monolib_quantize.obj \
         $(OBJS)\monolib_radiocmn.obj \
+       $(OBJS)\monolib_rearrangectrl.obj \
         $(OBJS)\monolib_rendcmn.obj \
         $(OBJS)\monolib_rgncmn.obj \
         $(OBJS)\monolib_settcmn.obj \
         $(OBJS)\monolib_sizer.obj \
         $(OBJS)\monolib_rendcmn.obj \
         $(OBJS)\monolib_rgncmn.obj \
         $(OBJS)\monolib_settcmn.obj \
         $(OBJS)\monolib_sizer.obj \
+       $(OBJS)\monolib_spinctrlcmn.obj \
         $(OBJS)\monolib_srchcmn.obj \
         $(OBJS)\monolib_statbar.obj \
         $(OBJS)\monolib_stattextcmn.obj \
         $(OBJS)\monolib_srchcmn.obj \
         $(OBJS)\monolib_statbar.obj \
         $(OBJS)\monolib_stattextcmn.obj \
@@ -2727,9 +2974,10 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_valtext.obj \
         $(OBJS)\monolib_wincmn.obj \
         $(OBJS)\monolib_windowid.obj \
         $(OBJS)\monolib_valtext.obj \
         $(OBJS)\monolib_wincmn.obj \
         $(OBJS)\monolib_windowid.obj \
+       $(OBJS)\monolib_wrapsizer.obj \
         $(OBJS)\monolib_xpmdecod.obj \
         $(OBJS)\monolib_busyinfo.obj \
         $(OBJS)\monolib_xpmdecod.obj \
         $(OBJS)\monolib_busyinfo.obj \
-       $(OBJS)\monolib_buttonbar.obj \
+       $(OBJS)\monolib_generic_buttonbar.obj \
         $(OBJS)\monolib_choicdgg.obj \
         $(OBJS)\monolib_choicbkg.obj \
         $(OBJS)\monolib_combog.obj \
         $(OBJS)\monolib_choicdgg.obj \
         $(OBJS)\monolib_choicbkg.obj \
         $(OBJS)\monolib_combog.obj \
@@ -2737,6 +2985,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_dirctrlg.obj \
         $(OBJS)\monolib_dragimgg.obj \
         $(OBJS)\monolib_filectrlg.obj \
         $(OBJS)\monolib_dirctrlg.obj \
         $(OBJS)\monolib_dragimgg.obj \
         $(OBJS)\monolib_filectrlg.obj \
+       $(OBJS)\monolib_headerctrlg.obj \
         $(OBJS)\monolib_listbkg.obj \
         $(OBJS)\monolib_logg.obj \
         $(OBJS)\monolib_numdlgg.obj \
         $(OBJS)\monolib_listbkg.obj \
         $(OBJS)\monolib_logg.obj \
         $(OBJS)\monolib_numdlgg.obj \
@@ -2749,6 +2998,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_spinctlg.obj \
         $(OBJS)\monolib_splitter.obj \
         $(OBJS)\monolib_srchctlg.obj \
         $(OBJS)\monolib_spinctlg.obj \
         $(OBJS)\monolib_splitter.obj \
         $(OBJS)\monolib_srchctlg.obj \
+       $(OBJS)\monolib_statbmpg.obj \
+       $(OBJS)\monolib_stattextg.obj \
         $(OBJS)\monolib_textdlgg.obj \
         $(OBJS)\monolib_tipwin.obj \
         $(OBJS)\monolib_toolbkg.obj \
         $(OBJS)\monolib_textdlgg.obj \
         $(OBJS)\monolib_tipwin.obj \
         $(OBJS)\monolib_toolbkg.obj \
@@ -2760,19 +3011,23 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_animatecmn.obj \
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_animatecmn.obj \
+       $(OBJS)\monolib_bmpcboxcmn.obj \
+       $(OBJS)\monolib_calctrlcmn.obj \
         $(OBJS)\monolib_datavcmn.obj \
         $(OBJS)\monolib_hyperlnkcmn.obj \
         $(OBJS)\monolib_aboutdlgg.obj \
         $(OBJS)\monolib_bmpcboxg.obj \
         $(OBJS)\monolib_datavcmn.obj \
         $(OBJS)\monolib_hyperlnkcmn.obj \
         $(OBJS)\monolib_aboutdlgg.obj \
         $(OBJS)\monolib_bmpcboxg.obj \
-       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_calctrlg.obj \
         $(OBJS)\monolib_datavgen.obj \
         $(OBJS)\monolib_datectlg.obj \
         $(OBJS)\monolib_editlbox.obj \
         $(OBJS)\monolib_grid.obj \
         $(OBJS)\monolib_gridctrl.obj \
         $(OBJS)\monolib_datavgen.obj \
         $(OBJS)\monolib_datectlg.obj \
         $(OBJS)\monolib_editlbox.obj \
         $(OBJS)\monolib_grid.obj \
         $(OBJS)\monolib_gridctrl.obj \
+       $(OBJS)\monolib_grideditors.obj \
         $(OBJS)\monolib_gridsel.obj \
         $(OBJS)\monolib_helpext.obj \
         $(OBJS)\monolib_hyperlinkg.obj \
         $(OBJS)\monolib_gridsel.obj \
         $(OBJS)\monolib_helpext.obj \
         $(OBJS)\monolib_hyperlinkg.obj \
+       $(OBJS)\monolib_infobar.obj \
         $(OBJS)\monolib_laywin.obj \
         $(OBJS)\monolib_notifmsgg.obj \
         $(OBJS)\monolib_odcombo.obj \
         $(OBJS)\monolib_laywin.obj \
         $(OBJS)\monolib_notifmsgg.obj \
         $(OBJS)\monolib_odcombo.obj \
@@ -2782,30 +3037,37 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_tipdlg.obj \
         $(OBJS)\monolib_wizard.obj \
         $(OBJS)\monolib_taskbarcmn.obj \
         $(OBJS)\monolib_tipdlg.obj \
         $(OBJS)\monolib_wizard.obj \
         $(OBJS)\monolib_taskbarcmn.obj \
-       $(OBJS)\monolib_animateg.obj \
         $(OBJS)\monolib_aboutdlg.obj \
         $(OBJS)\monolib_notifmsg.obj \
         $(OBJS)\monolib_sound.obj \
         $(OBJS)\monolib_taskbar.obj \
         $(OBJS)\monolib_joystick.obj \
         $(OBJS)\monolib_aboutdlg.obj \
         $(OBJS)\monolib_notifmsg.obj \
         $(OBJS)\monolib_sound.obj \
         $(OBJS)\monolib_taskbar.obj \
         $(OBJS)\monolib_joystick.obj \
+       $(OBJS)\monolib_animateg.obj \
+       $(OBJS)\monolib_bmpcbox.obj \
+       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_datecontrols.obj \
         $(OBJS)\monolib_datectrl.obj
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_animatecmn.obj \
         $(OBJS)\monolib_datectrl.obj
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_animatecmn.obj \
+       $(OBJS)\monolib_bmpcboxcmn.obj \
+       $(OBJS)\monolib_calctrlcmn.obj \
         $(OBJS)\monolib_datavcmn.obj \
         $(OBJS)\monolib_hyperlnkcmn.obj \
         $(OBJS)\monolib_aboutdlgg.obj \
         $(OBJS)\monolib_bmpcboxg.obj \
         $(OBJS)\monolib_datavcmn.obj \
         $(OBJS)\monolib_hyperlnkcmn.obj \
         $(OBJS)\monolib_aboutdlgg.obj \
         $(OBJS)\monolib_bmpcboxg.obj \
-       $(OBJS)\monolib_calctrl.obj \
+       $(OBJS)\monolib_calctrlg.obj \
         $(OBJS)\monolib_datavgen.obj \
         $(OBJS)\monolib_datectlg.obj \
         $(OBJS)\monolib_editlbox.obj \
         $(OBJS)\monolib_grid.obj \
         $(OBJS)\monolib_gridctrl.obj \
         $(OBJS)\monolib_datavgen.obj \
         $(OBJS)\monolib_datectlg.obj \
         $(OBJS)\monolib_editlbox.obj \
         $(OBJS)\monolib_grid.obj \
         $(OBJS)\monolib_gridctrl.obj \
+       $(OBJS)\monolib_grideditors.obj \
         $(OBJS)\monolib_gridsel.obj \
         $(OBJS)\monolib_helpext.obj \
         $(OBJS)\monolib_hyperlinkg.obj \
         $(OBJS)\monolib_gridsel.obj \
         $(OBJS)\monolib_helpext.obj \
         $(OBJS)\monolib_hyperlinkg.obj \
+       $(OBJS)\monolib_infobar.obj \
         $(OBJS)\monolib_laywin.obj \
         $(OBJS)\monolib_notifmsgg.obj \
         $(OBJS)\monolib_odcombo.obj \
         $(OBJS)\monolib_laywin.obj \
         $(OBJS)\monolib_notifmsgg.obj \
         $(OBJS)\monolib_odcombo.obj \
@@ -2815,7 +3077,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
         $(OBJS)\monolib_tipdlg.obj \
         $(OBJS)\monolib_wizard.obj \
         $(OBJS)\monolib_taskbarcmn.obj \
         $(OBJS)\monolib_tipdlg.obj \
         $(OBJS)\monolib_wizard.obj \
         $(OBJS)\monolib_taskbarcmn.obj \
-       $(OBJS)\monolib_animateg.obj \
         $(OBJS)\monolib_aboutdlg.obj \
         $(OBJS)\monolib_notifmsg.obj \
         $(OBJS)\monolib_sound.obj \
         $(OBJS)\monolib_aboutdlg.obj \
         $(OBJS)\monolib_notifmsg.obj \
         $(OBJS)\monolib_sound.obj \
@@ -2827,21 +3088,33 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
  __basedll___depname = \
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
  !endif
  __basedll___depname = \
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll
  !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_139 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_139 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_139 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_139 = $(__DEBUGRUNTIME_10)
+!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_127 = D
+__RUNTIME_LIBS_147 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_127 = $(__THREADSFLAG)
+__RUNTIME_LIBS_147 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  __baselib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  __baselib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_140 = D
+__RUNTIME_LIBS_162 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_140 = $(__THREADSFLAG)
+__RUNTIME_LIBS_162 = $(__THREADSFLAG)
  !endif
  !if "$(SHARED)" == "1"
  ____wxbase_namedll_DEP = $(__basedll___depname)
  !endif
  !if "$(SHARED)" == "1"
  ____wxbase_namedll_DEP = $(__basedll___depname)
@@ -2853,21 +3126,33 @@ ____wxbase_namelib_DEP = $(__baselib___depname)
  __netdll___depname = \
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
  !endif
  __netdll___depname = \
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll
  !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_170 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_170 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_170 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_170 = $(__DEBUGRUNTIME_10)
+!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_154 = D
+__RUNTIME_LIBS_178 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_154 = $(__THREADSFLAG)
+__RUNTIME_LIBS_178 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  __netlib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  __netlib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_167 = D
+__RUNTIME_LIBS_193 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_167 = $(__THREADSFLAG)
+__RUNTIME_LIBS_193 = $(__THREADSFLAG)
  !endif
  !if "$(SHARED)" == "1"
  ____wxnet_namedll_DEP = $(__netdll___depname)
  !endif
  !if "$(SHARED)" == "1"
  ____wxnet_namedll_DEP = $(__netdll___depname)
@@ -2879,14 +3164,27 @@ ____wxnet_namelib_DEP = $(__netlib___depname)
  __coredll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
  !endif
  __coredll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll
  !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_201 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_201 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_201 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_201 = $(__DEBUGRUNTIME_10)
+!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_181 = D
+__RUNTIME_LIBS_209 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_181 = $(__THREADSFLAG)
+__RUNTIME_LIBS_209 = $(__THREADSFLAG)
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_2_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_activex.obj \
         $(OBJS)\coredll_app.obj \
         $(OBJS)\coredll_bitmap.obj \
         $(OBJS)\coredll_brush.obj \
         $(OBJS)\coredll_app.obj \
         $(OBJS)\coredll_bitmap.obj \
         $(OBJS)\coredll_brush.obj \
@@ -2939,55 +3237,56 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_collpaneg.obj \
         $(OBJS)\coredll_filepickerg.obj \
         $(OBJS)\coredll_fontpickerg.obj \
         $(OBJS)\coredll_collpaneg.obj \
         $(OBJS)\coredll_filepickerg.obj \
         $(OBJS)\coredll_fontpickerg.obj \
-       $(OBJS)\coredll_statusbr.obj \
+       $(OBJS)\coredll_generic_statusbr.obj \
         $(OBJS)\coredll_prntdlgg.obj \
         $(OBJS)\coredll_prntdlgg.obj \
-       $(OBJS)\coredll_accel.obj \
-       $(OBJS)\coredll_bmpbuttn.obj \
-       $(OBJS)\coredll_button.obj \
-       $(OBJS)\coredll_checkbox.obj \
-       $(OBJS)\coredll_choice.obj \
+       $(OBJS)\coredll_msw_accel.obj \
+       $(OBJS)\coredll_artmsw.obj \
+       $(OBJS)\coredll_msw_bmpbuttn.obj \
+       $(OBJS)\coredll_msw_button.obj \
+       $(OBJS)\coredll_msw_checkbox.obj \
+       $(OBJS)\coredll_msw_choice.obj \
         $(OBJS)\coredll_colordlg.obj \
         $(OBJS)\coredll_combo.obj \
         $(OBJS)\coredll_colordlg.obj \
         $(OBJS)\coredll_combo.obj \
-       $(OBJS)\coredll_combobox.obj \
-       $(OBJS)\coredll_control.obj \
-       $(OBJS)\coredll_dialog.obj \
+       $(OBJS)\coredll_msw_combobox.obj \
+       $(OBJS)\coredll_msw_control.obj \
+       $(OBJS)\coredll_msw_dialog.obj \
         $(OBJS)\coredll_dirdlg.obj \
         $(OBJS)\coredll_dragimag.obj \
         $(OBJS)\coredll_filedlg.obj \
         $(OBJS)\coredll_frame.obj \
         $(OBJS)\coredll_dirdlg.obj \
         $(OBJS)\coredll_dragimag.obj \
         $(OBJS)\coredll_filedlg.obj \
         $(OBJS)\coredll_frame.obj \
-       $(OBJS)\coredll_gauge95.obj \
+       $(OBJS)\coredll_msw_gauge.obj \
+       $(OBJS)\coredll_headerctrl.obj \
         $(OBJS)\coredll_iniconf.obj \
         $(OBJS)\coredll_iniconf.obj \
-       $(OBJS)\coredll_listbox.obj \
-       $(OBJS)\coredll_listctrl.obj \
+       $(OBJS)\coredll_msw_listbox.obj \
+       $(OBJS)\coredll_msw_listctrl.obj \
         $(OBJS)\coredll_mdi.obj \
         $(OBJS)\coredll_mdi.obj \
-       $(OBJS)\coredll_menu.obj \
+       $(OBJS)\coredll_msw_menu.obj \
         $(OBJS)\coredll_menuitem.obj \
         $(OBJS)\coredll_metafile.obj \
         $(OBJS)\coredll_msgdlg.obj \
         $(OBJS)\coredll_nativdlg.obj \
         $(OBJS)\coredll_nativewin.obj \
         $(OBJS)\coredll_menuitem.obj \
         $(OBJS)\coredll_metafile.obj \
         $(OBJS)\coredll_msgdlg.obj \
         $(OBJS)\coredll_nativdlg.obj \
         $(OBJS)\coredll_nativewin.obj \
-       $(OBJS)\coredll_notebook.obj \
+       $(OBJS)\coredll_msw_notebook.obj \
         $(OBJS)\coredll_access.obj \
         $(OBJS)\coredll_ownerdrw.obj \
         $(OBJS)\coredll_access.obj \
         $(OBJS)\coredll_ownerdrw.obj \
-       $(OBJS)\coredll_radiobox.obj \
-       $(OBJS)\coredll_radiobut.obj \
-       $(OBJS)\coredll_scrolbar.obj \
-       $(OBJS)\coredll_slider95.obj \
-       $(OBJS)\coredll_spinbutt.obj \
+       $(OBJS)\coredll_msw_radiobox.obj \
+       $(OBJS)\coredll_msw_radiobut.obj \
+       $(OBJS)\coredll_msw_scrolbar.obj \
+       $(OBJS)\coredll_msw_slider.obj \
+       $(OBJS)\coredll_msw_spinbutt.obj \
         $(OBJS)\coredll_spinctrl.obj \
         $(OBJS)\coredll_spinctrl.obj \
-       $(OBJS)\coredll_statbmp.obj \
-       $(OBJS)\coredll_statbox.obj \
-       $(OBJS)\coredll_statbr95.obj \
-       $(OBJS)\coredll_statline.obj \
-       $(OBJS)\coredll_stattext.obj \
-       $(OBJS)\coredll_tabctrl.obj \
-       $(OBJS)\coredll_tbar95.obj \
-       $(OBJS)\coredll_textctrl.obj \
+       $(OBJS)\coredll_msw_statbmp.obj \
+       $(OBJS)\coredll_msw_statbox.obj \
+       $(OBJS)\coredll_statusbar.obj \
+       $(OBJS)\coredll_msw_statline.obj \
+       $(OBJS)\coredll_msw_stattext.obj \
+       $(OBJS)\coredll_msw_toolbar.obj \
+       $(OBJS)\coredll_msw_textctrl.obj \
         $(OBJS)\coredll_textentry.obj \
         $(OBJS)\coredll_textentry.obj \
-       $(OBJS)\coredll_tglbtn.obj \
+       $(OBJS)\coredll_msw_tglbtn.obj \
         $(OBJS)\coredll_treectrl.obj \
         $(OBJS)\coredll_treectrl.obj \
-       $(OBJS)\coredll_checklst.obj \
-       $(OBJS)\coredll_fdrepdlg.obj \
+       $(OBJS)\coredll_msw_checklst.obj \
+       $(OBJS)\coredll_msw_fdrepdlg.obj \
         $(OBJS)\coredll_fontdlg.obj \
         $(OBJS)\coredll_accelcmn.obj \
         $(OBJS)\coredll_accesscmn.obj \
         $(OBJS)\coredll_fontdlg.obj \
         $(OBJS)\coredll_accelcmn.obj \
         $(OBJS)\coredll_accesscmn.obj \
@@ -3039,6 +3338,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_geometry.obj \
         $(OBJS)\coredll_gifdecod.obj \
         $(OBJS)\coredll_graphcmn.obj \
         $(OBJS)\coredll_geometry.obj \
         $(OBJS)\coredll_gifdecod.obj \
         $(OBJS)\coredll_graphcmn.obj \
+       $(OBJS)\coredll_headercolcmn.obj \
+       $(OBJS)\coredll_headerctrlcmn.obj \
         $(OBJS)\coredll_helpbase.obj \
         $(OBJS)\coredll_iconbndl.obj \
         $(OBJS)\coredll_imagall.obj \
         $(OBJS)\coredll_helpbase.obj \
         $(OBJS)\coredll_iconbndl.obj \
         $(OBJS)\coredll_imagall.obj \
@@ -3059,18 +3360,22 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_listctrlcmn.obj \
         $(OBJS)\coredll_matrix.obj \
         $(OBJS)\coredll_menucmn.obj \
         $(OBJS)\coredll_listctrlcmn.obj \
         $(OBJS)\coredll_matrix.obj \
         $(OBJS)\coredll_menucmn.obj \
+       $(OBJS)\coredll_mousemanager.obj \
         $(OBJS)\coredll_nbkbase.obj \
         $(OBJS)\coredll_overlaycmn.obj \
         $(OBJS)\coredll_paper.obj \
         $(OBJS)\coredll_nbkbase.obj \
         $(OBJS)\coredll_overlaycmn.obj \
         $(OBJS)\coredll_paper.obj \
+       $(OBJS)\coredll_persist.obj \
         $(OBJS)\coredll_pickerbase.obj \
         $(OBJS)\coredll_popupcmn.obj \
         $(OBJS)\coredll_prntbase.obj \
         $(OBJS)\coredll_quantize.obj \
         $(OBJS)\coredll_radiocmn.obj \
         $(OBJS)\coredll_pickerbase.obj \
         $(OBJS)\coredll_popupcmn.obj \
         $(OBJS)\coredll_prntbase.obj \
         $(OBJS)\coredll_quantize.obj \
         $(OBJS)\coredll_radiocmn.obj \
+       $(OBJS)\coredll_rearrangectrl.obj \
         $(OBJS)\coredll_rendcmn.obj \
         $(OBJS)\coredll_rgncmn.obj \
         $(OBJS)\coredll_settcmn.obj \
         $(OBJS)\coredll_sizer.obj \
         $(OBJS)\coredll_rendcmn.obj \
         $(OBJS)\coredll_rgncmn.obj \
         $(OBJS)\coredll_settcmn.obj \
         $(OBJS)\coredll_sizer.obj \
+       $(OBJS)\coredll_spinctrlcmn.obj \
         $(OBJS)\coredll_srchcmn.obj \
         $(OBJS)\coredll_statbar.obj \
         $(OBJS)\coredll_stattextcmn.obj \
         $(OBJS)\coredll_srchcmn.obj \
         $(OBJS)\coredll_statbar.obj \
         $(OBJS)\coredll_stattextcmn.obj \
@@ -3085,6 +3390,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_valtext.obj \
         $(OBJS)\coredll_wincmn.obj \
         $(OBJS)\coredll_windowid.obj \
         $(OBJS)\coredll_valtext.obj \
         $(OBJS)\coredll_wincmn.obj \
         $(OBJS)\coredll_windowid.obj \
+       $(OBJS)\coredll_wrapsizer.obj \
         $(OBJS)\coredll_xpmdecod.obj \
         $(OBJS)\coredll_busyinfo.obj \
         $(OBJS)\coredll_buttonbar.obj \
         $(OBJS)\coredll_xpmdecod.obj \
         $(OBJS)\coredll_busyinfo.obj \
         $(OBJS)\coredll_buttonbar.obj \
@@ -3095,6 +3401,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_dirctrlg.obj \
         $(OBJS)\coredll_dragimgg.obj \
         $(OBJS)\coredll_filectrlg.obj \
         $(OBJS)\coredll_dirctrlg.obj \
         $(OBJS)\coredll_dragimgg.obj \
         $(OBJS)\coredll_filectrlg.obj \
+       $(OBJS)\coredll_headerctrlg.obj \
         $(OBJS)\coredll_listbkg.obj \
         $(OBJS)\coredll_logg.obj \
         $(OBJS)\coredll_numdlgg.obj \
         $(OBJS)\coredll_listbkg.obj \
         $(OBJS)\coredll_logg.obj \
         $(OBJS)\coredll_numdlgg.obj \
@@ -3107,6 +3414,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_spinctlg.obj \
         $(OBJS)\coredll_splitter.obj \
         $(OBJS)\coredll_srchctlg.obj \
         $(OBJS)\coredll_spinctlg.obj \
         $(OBJS)\coredll_splitter.obj \
         $(OBJS)\coredll_srchctlg.obj \
+       $(OBJS)\coredll_statbmpg.obj \
+       $(OBJS)\coredll_stattextg.obj \
         $(OBJS)\coredll_textdlgg.obj \
         $(OBJS)\coredll_tipwin.obj \
         $(OBJS)\coredll_toolbkg.obj \
         $(OBJS)\coredll_textdlgg.obj \
         $(OBJS)\coredll_tipwin.obj \
         $(OBJS)\coredll_toolbkg.obj \
@@ -3117,6 +3426,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
  ____CORE_SRC_FILENAMES_2_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
  ____CORE_SRC_FILENAMES_2_OBJECTS =  \
+       $(OBJS)\coredll_activex.obj \
         $(OBJS)\coredll_app.obj \
         $(OBJS)\coredll_bitmap.obj \
         $(OBJS)\coredll_brush.obj \
         $(OBJS)\coredll_app.obj \
         $(OBJS)\coredll_bitmap.obj \
         $(OBJS)\coredll_brush.obj \
@@ -3165,55 +3475,54 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_helpwin.obj \
         $(OBJS)\coredll_automtn.obj \
         $(OBJS)\coredll_uuid.obj \
         $(OBJS)\coredll_helpwin.obj \
         $(OBJS)\coredll_automtn.obj \
         $(OBJS)\coredll_uuid.obj \
-       $(OBJS)\coredll_accel.obj \
+       $(OBJS)\coredll_generic_accel.obj \
         $(OBJS)\coredll_clrpickerg.obj \
         $(OBJS)\coredll_collpaneg.obj \
         $(OBJS)\coredll_colrdlgg.obj \
         $(OBJS)\coredll_dirdlgg.obj \
         $(OBJS)\coredll_clrpickerg.obj \
         $(OBJS)\coredll_collpaneg.obj \
         $(OBJS)\coredll_colrdlgg.obj \
         $(OBJS)\coredll_dirdlgg.obj \
-       $(OBJS)\coredll_fdrepdlg.obj \
+       $(OBJS)\coredll_generic_fdrepdlg.obj \
         $(OBJS)\coredll_filedlgg.obj \
         $(OBJS)\coredll_filepickerg.obj \
         $(OBJS)\coredll_fontdlgg.obj \
         $(OBJS)\coredll_fontpickerg.obj \
         $(OBJS)\coredll_filedlgg.obj \
         $(OBJS)\coredll_filepickerg.obj \
         $(OBJS)\coredll_fontdlgg.obj \
         $(OBJS)\coredll_fontpickerg.obj \
-       $(OBJS)\coredll_listctrl.obj \
+       $(OBJS)\coredll_generic_listctrl.obj \
         $(OBJS)\coredll_mdig.obj \
         $(OBJS)\coredll_msgdlgg.obj \
         $(OBJS)\coredll_prntdlgg.obj \
         $(OBJS)\coredll_mdig.obj \
         $(OBJS)\coredll_msgdlgg.obj \
         $(OBJS)\coredll_prntdlgg.obj \
-       $(OBJS)\coredll_tabg.obj \
-       $(OBJS)\coredll_bmpbuttn.obj \
-       $(OBJS)\coredll_button.obj \
-       $(OBJS)\coredll_checkbox.obj \
-       $(OBJS)\coredll_checklst.obj \
-       $(OBJS)\coredll_choice.obj \
-       $(OBJS)\coredll_colschem.obj \
-       $(OBJS)\coredll_combobox.obj \
-       $(OBJS)\coredll_control.obj \
+       $(OBJS)\coredll_univ_bmpbuttn.obj \
+       $(OBJS)\coredll_univ_button.obj \
+       $(OBJS)\coredll_univ_checkbox.obj \
+       $(OBJS)\coredll_univ_checklst.obj \
+       $(OBJS)\coredll_univ_choice.obj \
+       $(OBJS)\coredll_univ_combobox.obj \
+       $(OBJS)\coredll_univ_control.obj \
         $(OBJS)\coredll_ctrlrend.obj \
         $(OBJS)\coredll_ctrlrend.obj \
-       $(OBJS)\coredll_dialog.obj \
+       $(OBJS)\coredll_univ_dialog.obj \
         $(OBJS)\coredll_framuniv.obj \
         $(OBJS)\coredll_framuniv.obj \
-       $(OBJS)\coredll_gauge.obj \
+       $(OBJS)\coredll_univ_gauge.obj \
         $(OBJS)\coredll_inpcons.obj \
         $(OBJS)\coredll_inphand.obj \
         $(OBJS)\coredll_inpcons.obj \
         $(OBJS)\coredll_inphand.obj \
-       $(OBJS)\coredll_listbox.obj \
-       $(OBJS)\coredll_menu.obj \
-       $(OBJS)\coredll_notebook.obj \
-       $(OBJS)\coredll_radiobox.obj \
-       $(OBJS)\coredll_radiobut.obj \
+       $(OBJS)\coredll_univ_listbox.obj \
+       $(OBJS)\coredll_univ_menu.obj \
+       $(OBJS)\coredll_univ_notebook.obj \
+       $(OBJS)\coredll_univ_radiobox.obj \
+       $(OBJS)\coredll_univ_radiobut.obj \
         $(OBJS)\coredll_scrarrow.obj \
         $(OBJS)\coredll_scrarrow.obj \
-       $(OBJS)\coredll_scrolbar.obj \
+       $(OBJS)\coredll_univ_scrolbar.obj \
         $(OBJS)\coredll_scrthumb.obj \
         $(OBJS)\coredll_scrthumb.obj \
-       $(OBJS)\coredll_slider.obj \
-       $(OBJS)\coredll_spinbutt.obj \
-       $(OBJS)\coredll_statbmp.obj \
-       $(OBJS)\coredll_statbox.obj \
-       $(OBJS)\coredll_statline.obj \
-       $(OBJS)\coredll_stattext.obj \
-       $(OBJS)\coredll_statusbr.obj \
+       $(OBJS)\coredll_settingsuniv.obj \
+       $(OBJS)\coredll_univ_slider.obj \
+       $(OBJS)\coredll_univ_spinbutt.obj \
+       $(OBJS)\coredll_univ_statbmp.obj \
+       $(OBJS)\coredll_univ_statbox.obj \
+       $(OBJS)\coredll_univ_statline.obj \
+       $(OBJS)\coredll_univ_stattext.obj \
+       $(OBJS)\coredll_univ_statusbr.obj \
         $(OBJS)\coredll_stdrend.obj \
         $(OBJS)\coredll_stdrend.obj \
-       $(OBJS)\coredll_textctrl.obj \
-       $(OBJS)\coredll_tglbtn.obj \
+       $(OBJS)\coredll_univ_textctrl.obj \
+       $(OBJS)\coredll_univ_tglbtn.obj \
         $(OBJS)\coredll_theme.obj \
         $(OBJS)\coredll_theme.obj \
-       $(OBJS)\coredll_toolbar.obj \
+       $(OBJS)\coredll_univ_toolbar.obj \
         $(OBJS)\coredll_topluniv.obj \
         $(OBJS)\coredll_winuniv.obj \
         $(OBJS)\coredll_gtk.obj \
         $(OBJS)\coredll_topluniv.obj \
         $(OBJS)\coredll_winuniv.obj \
         $(OBJS)\coredll_gtk.obj \
@@ -3270,6 +3579,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_geometry.obj \
         $(OBJS)\coredll_gifdecod.obj \
         $(OBJS)\coredll_graphcmn.obj \
         $(OBJS)\coredll_geometry.obj \
         $(OBJS)\coredll_gifdecod.obj \
         $(OBJS)\coredll_graphcmn.obj \
+       $(OBJS)\coredll_headercolcmn.obj \
+       $(OBJS)\coredll_headerctrlcmn.obj \
         $(OBJS)\coredll_helpbase.obj \
         $(OBJS)\coredll_iconbndl.obj \
         $(OBJS)\coredll_imagall.obj \
         $(OBJS)\coredll_helpbase.obj \
         $(OBJS)\coredll_iconbndl.obj \
         $(OBJS)\coredll_imagall.obj \
@@ -3290,18 +3601,22 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_listctrlcmn.obj \
         $(OBJS)\coredll_matrix.obj \
         $(OBJS)\coredll_menucmn.obj \
         $(OBJS)\coredll_listctrlcmn.obj \
         $(OBJS)\coredll_matrix.obj \
         $(OBJS)\coredll_menucmn.obj \
+       $(OBJS)\coredll_mousemanager.obj \
         $(OBJS)\coredll_nbkbase.obj \
         $(OBJS)\coredll_overlaycmn.obj \
         $(OBJS)\coredll_paper.obj \
         $(OBJS)\coredll_nbkbase.obj \
         $(OBJS)\coredll_overlaycmn.obj \
         $(OBJS)\coredll_paper.obj \
+       $(OBJS)\coredll_persist.obj \
         $(OBJS)\coredll_pickerbase.obj \
         $(OBJS)\coredll_popupcmn.obj \
         $(OBJS)\coredll_prntbase.obj \
         $(OBJS)\coredll_quantize.obj \
         $(OBJS)\coredll_radiocmn.obj \
         $(OBJS)\coredll_pickerbase.obj \
         $(OBJS)\coredll_popupcmn.obj \
         $(OBJS)\coredll_prntbase.obj \
         $(OBJS)\coredll_quantize.obj \
         $(OBJS)\coredll_radiocmn.obj \
+       $(OBJS)\coredll_rearrangectrl.obj \
         $(OBJS)\coredll_rendcmn.obj \
         $(OBJS)\coredll_rgncmn.obj \
         $(OBJS)\coredll_settcmn.obj \
         $(OBJS)\coredll_sizer.obj \
         $(OBJS)\coredll_rendcmn.obj \
         $(OBJS)\coredll_rgncmn.obj \
         $(OBJS)\coredll_settcmn.obj \
         $(OBJS)\coredll_sizer.obj \
+       $(OBJS)\coredll_spinctrlcmn.obj \
         $(OBJS)\coredll_srchcmn.obj \
         $(OBJS)\coredll_statbar.obj \
         $(OBJS)\coredll_stattextcmn.obj \
         $(OBJS)\coredll_srchcmn.obj \
         $(OBJS)\coredll_statbar.obj \
         $(OBJS)\coredll_stattextcmn.obj \
@@ -3316,6 +3631,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_valtext.obj \
         $(OBJS)\coredll_wincmn.obj \
         $(OBJS)\coredll_windowid.obj \
         $(OBJS)\coredll_valtext.obj \
         $(OBJS)\coredll_wincmn.obj \
         $(OBJS)\coredll_windowid.obj \
+       $(OBJS)\coredll_wrapsizer.obj \
         $(OBJS)\coredll_xpmdecod.obj \
         $(OBJS)\coredll_busyinfo.obj \
         $(OBJS)\coredll_buttonbar.obj \
         $(OBJS)\coredll_xpmdecod.obj \
         $(OBJS)\coredll_busyinfo.obj \
         $(OBJS)\coredll_buttonbar.obj \
@@ -3326,6 +3642,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_dirctrlg.obj \
         $(OBJS)\coredll_dragimgg.obj \
         $(OBJS)\coredll_filectrlg.obj \
         $(OBJS)\coredll_dirctrlg.obj \
         $(OBJS)\coredll_dragimgg.obj \
         $(OBJS)\coredll_filectrlg.obj \
+       $(OBJS)\coredll_headerctrlg.obj \
         $(OBJS)\coredll_listbkg.obj \
         $(OBJS)\coredll_logg.obj \
         $(OBJS)\coredll_numdlgg.obj \
         $(OBJS)\coredll_listbkg.obj \
         $(OBJS)\coredll_logg.obj \
         $(OBJS)\coredll_numdlgg.obj \
@@ -3338,6 +3655,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\coredll_spinctlg.obj \
         $(OBJS)\coredll_splitter.obj \
         $(OBJS)\coredll_srchctlg.obj \
         $(OBJS)\coredll_spinctlg.obj \
         $(OBJS)\coredll_splitter.obj \
         $(OBJS)\coredll_srchctlg.obj \
+       $(OBJS)\coredll_statbmpg.obj \
+       $(OBJS)\coredll_stattextg.obj \
         $(OBJS)\coredll_textdlgg.obj \
         $(OBJS)\coredll_tipwin.obj \
         $(OBJS)\coredll_toolbkg.obj \
         $(OBJS)\coredll_textdlgg.obj \
         $(OBJS)\coredll_tipwin.obj \
         $(OBJS)\coredll_toolbkg.obj \
@@ -3351,13 +3670,14 @@ __corelib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_194 = D
+__RUNTIME_LIBS_224 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_194 = $(__THREADSFLAG)
+__RUNTIME_LIBS_224 = $(__THREADSFLAG)
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_3_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
  ____CORE_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_activex.obj \
         $(OBJS)\corelib_app.obj \
         $(OBJS)\corelib_bitmap.obj \
         $(OBJS)\corelib_brush.obj \
         $(OBJS)\corelib_app.obj \
         $(OBJS)\corelib_bitmap.obj \
         $(OBJS)\corelib_brush.obj \
@@ -3410,55 +3730,56 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_collpaneg.obj \
         $(OBJS)\corelib_filepickerg.obj \
         $(OBJS)\corelib_fontpickerg.obj \
         $(OBJS)\corelib_collpaneg.obj \
         $(OBJS)\corelib_filepickerg.obj \
         $(OBJS)\corelib_fontpickerg.obj \
-       $(OBJS)\corelib_statusbr.obj \
+       $(OBJS)\corelib_generic_statusbr.obj \
         $(OBJS)\corelib_prntdlgg.obj \
         $(OBJS)\corelib_prntdlgg.obj \
-       $(OBJS)\corelib_accel.obj \
-       $(OBJS)\corelib_bmpbuttn.obj \
-       $(OBJS)\corelib_button.obj \
-       $(OBJS)\corelib_checkbox.obj \
-       $(OBJS)\corelib_choice.obj \
+       $(OBJS)\corelib_msw_accel.obj \
+       $(OBJS)\corelib_artmsw.obj \
+       $(OBJS)\corelib_msw_bmpbuttn.obj \
+       $(OBJS)\corelib_msw_button.obj \
+       $(OBJS)\corelib_msw_checkbox.obj \
+       $(OBJS)\corelib_msw_choice.obj \
         $(OBJS)\corelib_colordlg.obj \
         $(OBJS)\corelib_combo.obj \
         $(OBJS)\corelib_colordlg.obj \
         $(OBJS)\corelib_combo.obj \
-       $(OBJS)\corelib_combobox.obj \
-       $(OBJS)\corelib_control.obj \
-       $(OBJS)\corelib_dialog.obj \
+       $(OBJS)\corelib_msw_combobox.obj \
+       $(OBJS)\corelib_msw_control.obj \
+       $(OBJS)\corelib_msw_dialog.obj \
         $(OBJS)\corelib_dirdlg.obj \
         $(OBJS)\corelib_dragimag.obj \
         $(OBJS)\corelib_filedlg.obj \
         $(OBJS)\corelib_frame.obj \
         $(OBJS)\corelib_dirdlg.obj \
         $(OBJS)\corelib_dragimag.obj \
         $(OBJS)\corelib_filedlg.obj \
         $(OBJS)\corelib_frame.obj \
-       $(OBJS)\corelib_gauge95.obj \
+       $(OBJS)\corelib_msw_gauge.obj \
+       $(OBJS)\corelib_headerctrl.obj \
         $(OBJS)\corelib_iniconf.obj \
         $(OBJS)\corelib_iniconf.obj \
-       $(OBJS)\corelib_listbox.obj \
-       $(OBJS)\corelib_listctrl.obj \
+       $(OBJS)\corelib_msw_listbox.obj \
+       $(OBJS)\corelib_msw_listctrl.obj \
         $(OBJS)\corelib_mdi.obj \
         $(OBJS)\corelib_mdi.obj \
-       $(OBJS)\corelib_menu.obj \
+       $(OBJS)\corelib_msw_menu.obj \
         $(OBJS)\corelib_menuitem.obj \
         $(OBJS)\corelib_metafile.obj \
         $(OBJS)\corelib_msgdlg.obj \
         $(OBJS)\corelib_nativdlg.obj \
         $(OBJS)\corelib_nativewin.obj \
         $(OBJS)\corelib_menuitem.obj \
         $(OBJS)\corelib_metafile.obj \
         $(OBJS)\corelib_msgdlg.obj \
         $(OBJS)\corelib_nativdlg.obj \
         $(OBJS)\corelib_nativewin.obj \
-       $(OBJS)\corelib_notebook.obj \
+       $(OBJS)\corelib_msw_notebook.obj \
         $(OBJS)\corelib_access.obj \
         $(OBJS)\corelib_ownerdrw.obj \
         $(OBJS)\corelib_access.obj \
         $(OBJS)\corelib_ownerdrw.obj \
-       $(OBJS)\corelib_radiobox.obj \
-       $(OBJS)\corelib_radiobut.obj \
-       $(OBJS)\corelib_scrolbar.obj \
-       $(OBJS)\corelib_slider95.obj \
-       $(OBJS)\corelib_spinbutt.obj \
+       $(OBJS)\corelib_msw_radiobox.obj \
+       $(OBJS)\corelib_msw_radiobut.obj \
+       $(OBJS)\corelib_msw_scrolbar.obj \
+       $(OBJS)\corelib_msw_slider.obj \
+       $(OBJS)\corelib_msw_spinbutt.obj \
         $(OBJS)\corelib_spinctrl.obj \
         $(OBJS)\corelib_spinctrl.obj \
-       $(OBJS)\corelib_statbmp.obj \
-       $(OBJS)\corelib_statbox.obj \
-       $(OBJS)\corelib_statbr95.obj \
-       $(OBJS)\corelib_statline.obj \
-       $(OBJS)\corelib_stattext.obj \
-       $(OBJS)\corelib_tabctrl.obj \
-       $(OBJS)\corelib_tbar95.obj \
-       $(OBJS)\corelib_textctrl.obj \
+       $(OBJS)\corelib_msw_statbmp.obj \
+       $(OBJS)\corelib_msw_statbox.obj \
+       $(OBJS)\corelib_statusbar.obj \
+       $(OBJS)\corelib_msw_statline.obj \
+       $(OBJS)\corelib_msw_stattext.obj \
+       $(OBJS)\corelib_msw_toolbar.obj \
+       $(OBJS)\corelib_msw_textctrl.obj \
         $(OBJS)\corelib_textentry.obj \
         $(OBJS)\corelib_textentry.obj \
-       $(OBJS)\corelib_tglbtn.obj \
+       $(OBJS)\corelib_msw_tglbtn.obj \
         $(OBJS)\corelib_treectrl.obj \
         $(OBJS)\corelib_treectrl.obj \
-       $(OBJS)\corelib_checklst.obj \
-       $(OBJS)\corelib_fdrepdlg.obj \
+       $(OBJS)\corelib_msw_checklst.obj \
+       $(OBJS)\corelib_msw_fdrepdlg.obj \
         $(OBJS)\corelib_fontdlg.obj \
         $(OBJS)\corelib_accelcmn.obj \
         $(OBJS)\corelib_accesscmn.obj \
         $(OBJS)\corelib_fontdlg.obj \
         $(OBJS)\corelib_accelcmn.obj \
         $(OBJS)\corelib_accesscmn.obj \
@@ -3510,6 +3831,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_geometry.obj \
         $(OBJS)\corelib_gifdecod.obj \
         $(OBJS)\corelib_graphcmn.obj \
         $(OBJS)\corelib_geometry.obj \
         $(OBJS)\corelib_gifdecod.obj \
         $(OBJS)\corelib_graphcmn.obj \
+       $(OBJS)\corelib_headercolcmn.obj \
+       $(OBJS)\corelib_headerctrlcmn.obj \
         $(OBJS)\corelib_helpbase.obj \
         $(OBJS)\corelib_iconbndl.obj \
         $(OBJS)\corelib_imagall.obj \
         $(OBJS)\corelib_helpbase.obj \
         $(OBJS)\corelib_iconbndl.obj \
         $(OBJS)\corelib_imagall.obj \
@@ -3530,18 +3853,22 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_listctrlcmn.obj \
         $(OBJS)\corelib_matrix.obj \
         $(OBJS)\corelib_menucmn.obj \
         $(OBJS)\corelib_listctrlcmn.obj \
         $(OBJS)\corelib_matrix.obj \
         $(OBJS)\corelib_menucmn.obj \
+       $(OBJS)\corelib_mousemanager.obj \
         $(OBJS)\corelib_nbkbase.obj \
         $(OBJS)\corelib_overlaycmn.obj \
         $(OBJS)\corelib_paper.obj \
         $(OBJS)\corelib_nbkbase.obj \
         $(OBJS)\corelib_overlaycmn.obj \
         $(OBJS)\corelib_paper.obj \
+       $(OBJS)\corelib_persist.obj \
         $(OBJS)\corelib_pickerbase.obj \
         $(OBJS)\corelib_popupcmn.obj \
         $(OBJS)\corelib_prntbase.obj \
         $(OBJS)\corelib_quantize.obj \
         $(OBJS)\corelib_radiocmn.obj \
         $(OBJS)\corelib_pickerbase.obj \
         $(OBJS)\corelib_popupcmn.obj \
         $(OBJS)\corelib_prntbase.obj \
         $(OBJS)\corelib_quantize.obj \
         $(OBJS)\corelib_radiocmn.obj \
+       $(OBJS)\corelib_rearrangectrl.obj \
         $(OBJS)\corelib_rendcmn.obj \
         $(OBJS)\corelib_rgncmn.obj \
         $(OBJS)\corelib_settcmn.obj \
         $(OBJS)\corelib_sizer.obj \
         $(OBJS)\corelib_rendcmn.obj \
         $(OBJS)\corelib_rgncmn.obj \
         $(OBJS)\corelib_settcmn.obj \
         $(OBJS)\corelib_sizer.obj \
+       $(OBJS)\corelib_spinctrlcmn.obj \
         $(OBJS)\corelib_srchcmn.obj \
         $(OBJS)\corelib_statbar.obj \
         $(OBJS)\corelib_stattextcmn.obj \
         $(OBJS)\corelib_srchcmn.obj \
         $(OBJS)\corelib_statbar.obj \
         $(OBJS)\corelib_stattextcmn.obj \
@@ -3556,6 +3883,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_valtext.obj \
         $(OBJS)\corelib_wincmn.obj \
         $(OBJS)\corelib_windowid.obj \
         $(OBJS)\corelib_valtext.obj \
         $(OBJS)\corelib_wincmn.obj \
         $(OBJS)\corelib_windowid.obj \
+       $(OBJS)\corelib_wrapsizer.obj \
         $(OBJS)\corelib_xpmdecod.obj \
         $(OBJS)\corelib_busyinfo.obj \
         $(OBJS)\corelib_buttonbar.obj \
         $(OBJS)\corelib_xpmdecod.obj \
         $(OBJS)\corelib_busyinfo.obj \
         $(OBJS)\corelib_buttonbar.obj \
@@ -3566,6 +3894,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_dirctrlg.obj \
         $(OBJS)\corelib_dragimgg.obj \
         $(OBJS)\corelib_filectrlg.obj \
         $(OBJS)\corelib_dirctrlg.obj \
         $(OBJS)\corelib_dragimgg.obj \
         $(OBJS)\corelib_filectrlg.obj \
+       $(OBJS)\corelib_headerctrlg.obj \
         $(OBJS)\corelib_listbkg.obj \
         $(OBJS)\corelib_logg.obj \
         $(OBJS)\corelib_numdlgg.obj \
         $(OBJS)\corelib_listbkg.obj \
         $(OBJS)\corelib_logg.obj \
         $(OBJS)\corelib_numdlgg.obj \
@@ -3578,6 +3907,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_spinctlg.obj \
         $(OBJS)\corelib_splitter.obj \
         $(OBJS)\corelib_srchctlg.obj \
         $(OBJS)\corelib_spinctlg.obj \
         $(OBJS)\corelib_splitter.obj \
         $(OBJS)\corelib_srchctlg.obj \
+       $(OBJS)\corelib_statbmpg.obj \
+       $(OBJS)\corelib_stattextg.obj \
         $(OBJS)\corelib_textdlgg.obj \
         $(OBJS)\corelib_tipwin.obj \
         $(OBJS)\corelib_toolbkg.obj \
         $(OBJS)\corelib_textdlgg.obj \
         $(OBJS)\corelib_tipwin.obj \
         $(OBJS)\corelib_toolbkg.obj \
@@ -3588,6 +3919,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
  ____CORE_SRC_FILENAMES_3_OBJECTS =  \
  !endif
  !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
  ____CORE_SRC_FILENAMES_3_OBJECTS =  \
+       $(OBJS)\corelib_activex.obj \
         $(OBJS)\corelib_app.obj \
         $(OBJS)\corelib_bitmap.obj \
         $(OBJS)\corelib_brush.obj \
         $(OBJS)\corelib_app.obj \
         $(OBJS)\corelib_bitmap.obj \
         $(OBJS)\corelib_brush.obj \
@@ -3636,55 +3968,54 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_helpwin.obj \
         $(OBJS)\corelib_automtn.obj \
         $(OBJS)\corelib_uuid.obj \
         $(OBJS)\corelib_helpwin.obj \
         $(OBJS)\corelib_automtn.obj \
         $(OBJS)\corelib_uuid.obj \
-       $(OBJS)\corelib_accel.obj \
+       $(OBJS)\corelib_generic_accel.obj \
         $(OBJS)\corelib_clrpickerg.obj \
         $(OBJS)\corelib_collpaneg.obj \
         $(OBJS)\corelib_colrdlgg.obj \
         $(OBJS)\corelib_dirdlgg.obj \
         $(OBJS)\corelib_clrpickerg.obj \
         $(OBJS)\corelib_collpaneg.obj \
         $(OBJS)\corelib_colrdlgg.obj \
         $(OBJS)\corelib_dirdlgg.obj \
-       $(OBJS)\corelib_fdrepdlg.obj \
+       $(OBJS)\corelib_generic_fdrepdlg.obj \
         $(OBJS)\corelib_filedlgg.obj \
         $(OBJS)\corelib_filepickerg.obj \
         $(OBJS)\corelib_fontdlgg.obj \
         $(OBJS)\corelib_fontpickerg.obj \
         $(OBJS)\corelib_filedlgg.obj \
         $(OBJS)\corelib_filepickerg.obj \
         $(OBJS)\corelib_fontdlgg.obj \
         $(OBJS)\corelib_fontpickerg.obj \
-       $(OBJS)\corelib_listctrl.obj \
+       $(OBJS)\corelib_generic_listctrl.obj \
         $(OBJS)\corelib_mdig.obj \
         $(OBJS)\corelib_msgdlgg.obj \
         $(OBJS)\corelib_prntdlgg.obj \
         $(OBJS)\corelib_mdig.obj \
         $(OBJS)\corelib_msgdlgg.obj \
         $(OBJS)\corelib_prntdlgg.obj \
-       $(OBJS)\corelib_tabg.obj \
-       $(OBJS)\corelib_bmpbuttn.obj \
-       $(OBJS)\corelib_button.obj \
-       $(OBJS)\corelib_checkbox.obj \
-       $(OBJS)\corelib_checklst.obj \
-       $(OBJS)\corelib_choice.obj \
-       $(OBJS)\corelib_colschem.obj \
-       $(OBJS)\corelib_combobox.obj \
-       $(OBJS)\corelib_control.obj \
+       $(OBJS)\corelib_univ_bmpbuttn.obj \
+       $(OBJS)\corelib_univ_button.obj \
+       $(OBJS)\corelib_univ_checkbox.obj \
+       $(OBJS)\corelib_univ_checklst.obj \
+       $(OBJS)\corelib_univ_choice.obj \
+       $(OBJS)\corelib_univ_combobox.obj \
+       $(OBJS)\corelib_univ_control.obj \
         $(OBJS)\corelib_ctrlrend.obj \
         $(OBJS)\corelib_ctrlrend.obj \
-       $(OBJS)\corelib_dialog.obj \
+       $(OBJS)\corelib_univ_dialog.obj \
         $(OBJS)\corelib_framuniv.obj \
         $(OBJS)\corelib_framuniv.obj \
-       $(OBJS)\corelib_gauge.obj \
+       $(OBJS)\corelib_univ_gauge.obj \
         $(OBJS)\corelib_inpcons.obj \
         $(OBJS)\corelib_inphand.obj \
         $(OBJS)\corelib_inpcons.obj \
         $(OBJS)\corelib_inphand.obj \
-       $(OBJS)\corelib_listbox.obj \
-       $(OBJS)\corelib_menu.obj \
-       $(OBJS)\corelib_notebook.obj \
-       $(OBJS)\corelib_radiobox.obj \
-       $(OBJS)\corelib_radiobut.obj \
+       $(OBJS)\corelib_univ_listbox.obj \
+       $(OBJS)\corelib_univ_menu.obj \
+       $(OBJS)\corelib_univ_notebook.obj \
+       $(OBJS)\corelib_univ_radiobox.obj \
+       $(OBJS)\corelib_univ_radiobut.obj \
         $(OBJS)\corelib_scrarrow.obj \
         $(OBJS)\corelib_scrarrow.obj \
-       $(OBJS)\corelib_scrolbar.obj \
+       $(OBJS)\corelib_univ_scrolbar.obj \
         $(OBJS)\corelib_scrthumb.obj \
         $(OBJS)\corelib_scrthumb.obj \
-       $(OBJS)\corelib_slider.obj \
-       $(OBJS)\corelib_spinbutt.obj \
-       $(OBJS)\corelib_statbmp.obj \
-       $(OBJS)\corelib_statbox.obj \
-       $(OBJS)\corelib_statline.obj \
-       $(OBJS)\corelib_stattext.obj \
-       $(OBJS)\corelib_statusbr.obj \
+       $(OBJS)\corelib_settingsuniv.obj \
+       $(OBJS)\corelib_univ_slider.obj \
+       $(OBJS)\corelib_univ_spinbutt.obj \
+       $(OBJS)\corelib_univ_statbmp.obj \
+       $(OBJS)\corelib_univ_statbox.obj \
+       $(OBJS)\corelib_univ_statline.obj \
+       $(OBJS)\corelib_univ_stattext.obj \
+       $(OBJS)\corelib_univ_statusbr.obj \
         $(OBJS)\corelib_stdrend.obj \
         $(OBJS)\corelib_stdrend.obj \
-       $(OBJS)\corelib_textctrl.obj \
-       $(OBJS)\corelib_tglbtn.obj \
+       $(OBJS)\corelib_univ_textctrl.obj \
+       $(OBJS)\corelib_univ_tglbtn.obj \
         $(OBJS)\corelib_theme.obj \
         $(OBJS)\corelib_theme.obj \
-       $(OBJS)\corelib_toolbar.obj \
+       $(OBJS)\corelib_univ_toolbar.obj \
         $(OBJS)\corelib_topluniv.obj \
         $(OBJS)\corelib_winuniv.obj \
         $(OBJS)\corelib_gtk.obj \
         $(OBJS)\corelib_topluniv.obj \
         $(OBJS)\corelib_winuniv.obj \
         $(OBJS)\corelib_gtk.obj \
@@ -3741,6 +4072,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_geometry.obj \
         $(OBJS)\corelib_gifdecod.obj \
         $(OBJS)\corelib_graphcmn.obj \
         $(OBJS)\corelib_geometry.obj \
         $(OBJS)\corelib_gifdecod.obj \
         $(OBJS)\corelib_graphcmn.obj \
+       $(OBJS)\corelib_headercolcmn.obj \
+       $(OBJS)\corelib_headerctrlcmn.obj \
         $(OBJS)\corelib_helpbase.obj \
         $(OBJS)\corelib_iconbndl.obj \
         $(OBJS)\corelib_imagall.obj \
         $(OBJS)\corelib_helpbase.obj \
         $(OBJS)\corelib_iconbndl.obj \
         $(OBJS)\corelib_imagall.obj \
@@ -3761,18 +4094,22 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_listctrlcmn.obj \
         $(OBJS)\corelib_matrix.obj \
         $(OBJS)\corelib_menucmn.obj \
         $(OBJS)\corelib_listctrlcmn.obj \
         $(OBJS)\corelib_matrix.obj \
         $(OBJS)\corelib_menucmn.obj \
+       $(OBJS)\corelib_mousemanager.obj \
         $(OBJS)\corelib_nbkbase.obj \
         $(OBJS)\corelib_overlaycmn.obj \
         $(OBJS)\corelib_paper.obj \
         $(OBJS)\corelib_nbkbase.obj \
         $(OBJS)\corelib_overlaycmn.obj \
         $(OBJS)\corelib_paper.obj \
+       $(OBJS)\corelib_persist.obj \
         $(OBJS)\corelib_pickerbase.obj \
         $(OBJS)\corelib_popupcmn.obj \
         $(OBJS)\corelib_prntbase.obj \
         $(OBJS)\corelib_quantize.obj \
         $(OBJS)\corelib_radiocmn.obj \
         $(OBJS)\corelib_pickerbase.obj \
         $(OBJS)\corelib_popupcmn.obj \
         $(OBJS)\corelib_prntbase.obj \
         $(OBJS)\corelib_quantize.obj \
         $(OBJS)\corelib_radiocmn.obj \
+       $(OBJS)\corelib_rearrangectrl.obj \
         $(OBJS)\corelib_rendcmn.obj \
         $(OBJS)\corelib_rgncmn.obj \
         $(OBJS)\corelib_settcmn.obj \
         $(OBJS)\corelib_sizer.obj \
         $(OBJS)\corelib_rendcmn.obj \
         $(OBJS)\corelib_rgncmn.obj \
         $(OBJS)\corelib_settcmn.obj \
         $(OBJS)\corelib_sizer.obj \
+       $(OBJS)\corelib_spinctrlcmn.obj \
         $(OBJS)\corelib_srchcmn.obj \
         $(OBJS)\corelib_statbar.obj \
         $(OBJS)\corelib_stattextcmn.obj \
         $(OBJS)\corelib_srchcmn.obj \
         $(OBJS)\corelib_statbar.obj \
         $(OBJS)\corelib_stattextcmn.obj \
@@ -3787,6 +4124,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_valtext.obj \
         $(OBJS)\corelib_wincmn.obj \
         $(OBJS)\corelib_windowid.obj \
         $(OBJS)\corelib_valtext.obj \
         $(OBJS)\corelib_wincmn.obj \
         $(OBJS)\corelib_windowid.obj \
+       $(OBJS)\corelib_wrapsizer.obj \
         $(OBJS)\corelib_xpmdecod.obj \
         $(OBJS)\corelib_busyinfo.obj \
         $(OBJS)\corelib_buttonbar.obj \
         $(OBJS)\corelib_xpmdecod.obj \
         $(OBJS)\corelib_busyinfo.obj \
         $(OBJS)\corelib_buttonbar.obj \
@@ -3797,6 +4135,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_dirctrlg.obj \
         $(OBJS)\corelib_dragimgg.obj \
         $(OBJS)\corelib_filectrlg.obj \
         $(OBJS)\corelib_dirctrlg.obj \
         $(OBJS)\corelib_dragimgg.obj \
         $(OBJS)\corelib_filectrlg.obj \
+       $(OBJS)\corelib_headerctrlg.obj \
         $(OBJS)\corelib_listbkg.obj \
         $(OBJS)\corelib_logg.obj \
         $(OBJS)\corelib_numdlgg.obj \
         $(OBJS)\corelib_listbkg.obj \
         $(OBJS)\corelib_logg.obj \
         $(OBJS)\corelib_numdlgg.obj \
@@ -3809,6 +4148,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\corelib_spinctlg.obj \
         $(OBJS)\corelib_splitter.obj \
         $(OBJS)\corelib_srchctlg.obj \
         $(OBJS)\corelib_spinctlg.obj \
         $(OBJS)\corelib_splitter.obj \
         $(OBJS)\corelib_srchctlg.obj \
+       $(OBJS)\corelib_statbmpg.obj \
+       $(OBJS)\corelib_stattextg.obj \
         $(OBJS)\corelib_textdlgg.obj \
         $(OBJS)\corelib_tipwin.obj \
         $(OBJS)\corelib_toolbkg.obj \
         $(OBJS)\corelib_textdlgg.obj \
         $(OBJS)\corelib_tipwin.obj \
         $(OBJS)\corelib_toolbkg.obj \
@@ -3827,28 +4168,44 @@ ____wxcore_namelib_DEP = $(__corelib___depname)
  __advdll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
  !endif
  __advdll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll
  !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_232 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_232 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_232 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_232 = $(__DEBUGRUNTIME_10)
+!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_208 = D
+__RUNTIME_LIBS_240 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_208 = $(__THREADSFLAG)
+__RUNTIME_LIBS_240 = $(__THREADSFLAG)
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\advdll_animatecmn.obj \
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\advdll_animatecmn.obj \
+       $(OBJS)\advdll_bmpcboxcmn.obj \
+       $(OBJS)\advdll_calctrlcmn.obj \
         $(OBJS)\advdll_datavcmn.obj \
         $(OBJS)\advdll_hyperlnkcmn.obj \
         $(OBJS)\advdll_aboutdlgg.obj \
         $(OBJS)\advdll_bmpcboxg.obj \
         $(OBJS)\advdll_datavcmn.obj \
         $(OBJS)\advdll_hyperlnkcmn.obj \
         $(OBJS)\advdll_aboutdlgg.obj \
         $(OBJS)\advdll_bmpcboxg.obj \
-       $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_calctrlg.obj \
         $(OBJS)\advdll_datavgen.obj \
         $(OBJS)\advdll_datectlg.obj \
         $(OBJS)\advdll_editlbox.obj \
         $(OBJS)\advdll_grid.obj \
         $(OBJS)\advdll_gridctrl.obj \
         $(OBJS)\advdll_datavgen.obj \
         $(OBJS)\advdll_datectlg.obj \
         $(OBJS)\advdll_editlbox.obj \
         $(OBJS)\advdll_grid.obj \
         $(OBJS)\advdll_gridctrl.obj \
+       $(OBJS)\advdll_grideditors.obj \
         $(OBJS)\advdll_gridsel.obj \
         $(OBJS)\advdll_helpext.obj \
         $(OBJS)\advdll_hyperlinkg.obj \
         $(OBJS)\advdll_gridsel.obj \
         $(OBJS)\advdll_helpext.obj \
         $(OBJS)\advdll_hyperlinkg.obj \
+       $(OBJS)\advdll_infobar.obj \
         $(OBJS)\advdll_laywin.obj \
         $(OBJS)\advdll_notifmsgg.obj \
         $(OBJS)\advdll_odcombo.obj \
         $(OBJS)\advdll_laywin.obj \
         $(OBJS)\advdll_notifmsgg.obj \
         $(OBJS)\advdll_odcombo.obj \
@@ -3858,30 +4215,37 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\advdll_tipdlg.obj \
         $(OBJS)\advdll_wizard.obj \
         $(OBJS)\advdll_taskbarcmn.obj \
         $(OBJS)\advdll_tipdlg.obj \
         $(OBJS)\advdll_wizard.obj \
         $(OBJS)\advdll_taskbarcmn.obj \
-       $(OBJS)\advdll_animateg.obj \
         $(OBJS)\advdll_aboutdlg.obj \
         $(OBJS)\advdll_notifmsg.obj \
         $(OBJS)\advdll_sound.obj \
         $(OBJS)\advdll_taskbar.obj \
         $(OBJS)\advdll_joystick.obj \
         $(OBJS)\advdll_aboutdlg.obj \
         $(OBJS)\advdll_notifmsg.obj \
         $(OBJS)\advdll_sound.obj \
         $(OBJS)\advdll_taskbar.obj \
         $(OBJS)\advdll_joystick.obj \
+       $(OBJS)\advdll_animateg.obj \
+       $(OBJS)\advdll_bmpcbox.obj \
+       $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_datecontrols.obj \
         $(OBJS)\advdll_datectrl.obj
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\advdll_animatecmn.obj \
         $(OBJS)\advdll_datectrl.obj
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\advdll_animatecmn.obj \
+       $(OBJS)\advdll_bmpcboxcmn.obj \
+       $(OBJS)\advdll_calctrlcmn.obj \
         $(OBJS)\advdll_datavcmn.obj \
         $(OBJS)\advdll_hyperlnkcmn.obj \
         $(OBJS)\advdll_aboutdlgg.obj \
         $(OBJS)\advdll_bmpcboxg.obj \
         $(OBJS)\advdll_datavcmn.obj \
         $(OBJS)\advdll_hyperlnkcmn.obj \
         $(OBJS)\advdll_aboutdlgg.obj \
         $(OBJS)\advdll_bmpcboxg.obj \
-       $(OBJS)\advdll_calctrl.obj \
+       $(OBJS)\advdll_calctrlg.obj \
         $(OBJS)\advdll_datavgen.obj \
         $(OBJS)\advdll_datectlg.obj \
         $(OBJS)\advdll_editlbox.obj \
         $(OBJS)\advdll_grid.obj \
         $(OBJS)\advdll_gridctrl.obj \
         $(OBJS)\advdll_datavgen.obj \
         $(OBJS)\advdll_datectlg.obj \
         $(OBJS)\advdll_editlbox.obj \
         $(OBJS)\advdll_grid.obj \
         $(OBJS)\advdll_gridctrl.obj \
+       $(OBJS)\advdll_grideditors.obj \
         $(OBJS)\advdll_gridsel.obj \
         $(OBJS)\advdll_helpext.obj \
         $(OBJS)\advdll_hyperlinkg.obj \
         $(OBJS)\advdll_gridsel.obj \
         $(OBJS)\advdll_helpext.obj \
         $(OBJS)\advdll_hyperlinkg.obj \
+       $(OBJS)\advdll_infobar.obj \
         $(OBJS)\advdll_laywin.obj \
         $(OBJS)\advdll_notifmsgg.obj \
         $(OBJS)\advdll_odcombo.obj \
         $(OBJS)\advdll_laywin.obj \
         $(OBJS)\advdll_notifmsgg.obj \
         $(OBJS)\advdll_odcombo.obj \
@@ -3891,7 +4255,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
         $(OBJS)\advdll_tipdlg.obj \
         $(OBJS)\advdll_wizard.obj \
         $(OBJS)\advdll_taskbarcmn.obj \
         $(OBJS)\advdll_tipdlg.obj \
         $(OBJS)\advdll_wizard.obj \
         $(OBJS)\advdll_taskbarcmn.obj \
-       $(OBJS)\advdll_animateg.obj \
         $(OBJS)\advdll_aboutdlg.obj \
         $(OBJS)\advdll_notifmsg.obj \
         $(OBJS)\advdll_sound.obj \
         $(OBJS)\advdll_aboutdlg.obj \
         $(OBJS)\advdll_notifmsg.obj \
         $(OBJS)\advdll_sound.obj \
@@ -3904,27 +4267,31 @@ __advlib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_221 = D
+__RUNTIME_LIBS_255 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_221 = $(__THREADSFLAG)
+__RUNTIME_LIBS_255 = $(__THREADSFLAG)
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\advlib_animatecmn.obj \
  !endif
  !if "$(WXUNIV)" == "0"
  ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\advlib_animatecmn.obj \
+       $(OBJS)\advlib_bmpcboxcmn.obj \
+       $(OBJS)\advlib_calctrlcmn.obj \
         $(OBJS)\advlib_datavcmn.obj \
         $(OBJS)\advlib_hyperlnkcmn.obj \
         $(OBJS)\advlib_aboutdlgg.obj \
         $(OBJS)\advlib_bmpcboxg.obj \
         $(OBJS)\advlib_datavcmn.obj \
         $(OBJS)\advlib_hyperlnkcmn.obj \
         $(OBJS)\advlib_aboutdlgg.obj \
         $(OBJS)\advlib_bmpcboxg.obj \
-       $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_calctrlg.obj \
         $(OBJS)\advlib_datavgen.obj \
         $(OBJS)\advlib_datectlg.obj \
         $(OBJS)\advlib_editlbox.obj \
         $(OBJS)\advlib_grid.obj \
         $(OBJS)\advlib_gridctrl.obj \
         $(OBJS)\advlib_datavgen.obj \
         $(OBJS)\advlib_datectlg.obj \
         $(OBJS)\advlib_editlbox.obj \
         $(OBJS)\advlib_grid.obj \
         $(OBJS)\advlib_gridctrl.obj \
+       $(OBJS)\advlib_grideditors.obj \
         $(OBJS)\advlib_gridsel.obj \
         $(OBJS)\advlib_helpext.obj \
         $(OBJS)\advlib_hyperlinkg.obj \
         $(OBJS)\advlib_gridsel.obj \
         $(OBJS)\advlib_helpext.obj \
         $(OBJS)\advlib_hyperlinkg.obj \
+       $(OBJS)\advlib_infobar.obj \
         $(OBJS)\advlib_laywin.obj \
         $(OBJS)\advlib_notifmsgg.obj \
         $(OBJS)\advlib_odcombo.obj \
         $(OBJS)\advlib_laywin.obj \
         $(OBJS)\advlib_notifmsgg.obj \
         $(OBJS)\advlib_odcombo.obj \
@@ -3934,30 +4301,37 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\advlib_tipdlg.obj \
         $(OBJS)\advlib_wizard.obj \
         $(OBJS)\advlib_taskbarcmn.obj \
         $(OBJS)\advlib_tipdlg.obj \
         $(OBJS)\advlib_wizard.obj \
         $(OBJS)\advlib_taskbarcmn.obj \
-       $(OBJS)\advlib_animateg.obj \
         $(OBJS)\advlib_aboutdlg.obj \
         $(OBJS)\advlib_notifmsg.obj \
         $(OBJS)\advlib_sound.obj \
         $(OBJS)\advlib_taskbar.obj \
         $(OBJS)\advlib_joystick.obj \
         $(OBJS)\advlib_aboutdlg.obj \
         $(OBJS)\advlib_notifmsg.obj \
         $(OBJS)\advlib_sound.obj \
         $(OBJS)\advlib_taskbar.obj \
         $(OBJS)\advlib_joystick.obj \
+       $(OBJS)\advlib_animateg.obj \
+       $(OBJS)\advlib_bmpcbox.obj \
+       $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_datecontrols.obj \
         $(OBJS)\advlib_datectrl.obj
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\advlib_animatecmn.obj \
         $(OBJS)\advlib_datectrl.obj
  !endif
  !if "$(WXUNIV)" == "1"
  ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\advlib_animatecmn.obj \
+       $(OBJS)\advlib_bmpcboxcmn.obj \
+       $(OBJS)\advlib_calctrlcmn.obj \
         $(OBJS)\advlib_datavcmn.obj \
         $(OBJS)\advlib_hyperlnkcmn.obj \
         $(OBJS)\advlib_aboutdlgg.obj \
         $(OBJS)\advlib_bmpcboxg.obj \
         $(OBJS)\advlib_datavcmn.obj \
         $(OBJS)\advlib_hyperlnkcmn.obj \
         $(OBJS)\advlib_aboutdlgg.obj \
         $(OBJS)\advlib_bmpcboxg.obj \
-       $(OBJS)\advlib_calctrl.obj \
+       $(OBJS)\advlib_calctrlg.obj \
         $(OBJS)\advlib_datavgen.obj \
         $(OBJS)\advlib_datectlg.obj \
         $(OBJS)\advlib_editlbox.obj \
         $(OBJS)\advlib_grid.obj \
         $(OBJS)\advlib_gridctrl.obj \
         $(OBJS)\advlib_datavgen.obj \
         $(OBJS)\advlib_datectlg.obj \
         $(OBJS)\advlib_editlbox.obj \
         $(OBJS)\advlib_grid.obj \
         $(OBJS)\advlib_gridctrl.obj \
+       $(OBJS)\advlib_grideditors.obj \
         $(OBJS)\advlib_gridsel.obj \
         $(OBJS)\advlib_helpext.obj \
         $(OBJS)\advlib_hyperlinkg.obj \
         $(OBJS)\advlib_gridsel.obj \
         $(OBJS)\advlib_helpext.obj \
         $(OBJS)\advlib_hyperlinkg.obj \
+       $(OBJS)\advlib_infobar.obj \
         $(OBJS)\advlib_laywin.obj \
         $(OBJS)\advlib_notifmsgg.obj \
         $(OBJS)\advlib_odcombo.obj \
         $(OBJS)\advlib_laywin.obj \
         $(OBJS)\advlib_notifmsgg.obj \
         $(OBJS)\advlib_odcombo.obj \
@@ -3967,7 +4341,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
         $(OBJS)\advlib_tipdlg.obj \
         $(OBJS)\advlib_wizard.obj \
         $(OBJS)\advlib_taskbarcmn.obj \
         $(OBJS)\advlib_tipdlg.obj \
         $(OBJS)\advlib_wizard.obj \
         $(OBJS)\advlib_taskbarcmn.obj \
-       $(OBJS)\advlib_animateg.obj \
         $(OBJS)\advlib_aboutdlg.obj \
         $(OBJS)\advlib_notifmsg.obj \
         $(OBJS)\advlib_sound.obj \
         $(OBJS)\advlib_aboutdlg.obj \
         $(OBJS)\advlib_notifmsg.obj \
         $(OBJS)\advlib_sound.obj \
@@ -3985,21 +4358,33 @@ ____wxadv_namelib_DEP = $(__advlib___depname)
  __mediadll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
  !endif
  __mediadll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll
  !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_263 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_263 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_263 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_263 = $(__DEBUGRUNTIME_10)
+!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_235 = D
+__RUNTIME_LIBS_271 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_235 = $(__THREADSFLAG)
+__RUNTIME_LIBS_271 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
  __medialib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
  __medialib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_248 = D
+__RUNTIME_LIBS_286 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_248 = $(__THREADSFLAG)
+__RUNTIME_LIBS_286 = $(__THREADSFLAG)
  !endif
  !if "$(SHARED)" == "1"
  ____wxmedia_namedll_DEP = $(__mediadll___depname)
  !endif
  !if "$(SHARED)" == "1"
  ____wxmedia_namedll_DEP = $(__mediadll___depname)
@@ -4011,21 +4396,33 @@ ____wxmedia_namelib_DEP = $(__medialib___depname)
  __htmldll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
  !endif
  __htmldll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll
  !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_294 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_294 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_294 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_294 = $(__DEBUGRUNTIME_10)
+!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_262 = D
+__RUNTIME_LIBS_302 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_262 = $(__THREADSFLAG)
+__RUNTIME_LIBS_302 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  __htmllib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  __htmllib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_275 = D
+__RUNTIME_LIBS_317 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_275 = $(__THREADSFLAG)
+__RUNTIME_LIBS_317 = $(__THREADSFLAG)
  !endif
  !if "$(SHARED)" == "1"
  ____wxhtml_namedll_DEP = $(__htmldll___depname)
  !endif
  !if "$(SHARED)" == "1"
  ____wxhtml_namedll_DEP = $(__htmldll___depname)
@@ -4037,21 +4434,33 @@ ____wxhtml_namelib_DEP = $(__htmllib___depname)
  __qadll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll
  !endif
  __qadll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll
  !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_325 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_325 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_325 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_325 = $(__DEBUGRUNTIME_10)
+!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_289 = D
+__RUNTIME_LIBS_333 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_289 = $(__THREADSFLAG)
+__RUNTIME_LIBS_333 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
  __qalib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
  __qalib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_302 = D
+__RUNTIME_LIBS_348 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_302 = $(__THREADSFLAG)
+__RUNTIME_LIBS_348 = $(__THREADSFLAG)
  !endif
  !if "$(SHARED)" == "1"
  ____wxqa_namedll_DEP = $(__qadll___depname)
  !endif
  !if "$(SHARED)" == "1"
  ____wxqa_namedll_DEP = $(__qadll___depname)
@@ -4063,21 +4472,33 @@ ____wxqa_namelib_DEP = $(__qalib___depname)
  __xmldll___depname = \
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
  !endif
  __xmldll___depname = \
         $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll
  !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_356 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_356 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_356 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_356 = $(__DEBUGRUNTIME_10)
+!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_316 = D
+__RUNTIME_LIBS_364 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_316 = $(__THREADSFLAG)
+__RUNTIME_LIBS_364 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  __xmllib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0"
  __xmllib___depname = \
         $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_329 = D
+__RUNTIME_LIBS_379 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_329 = $(__THREADSFLAG)
+__RUNTIME_LIBS_379 = $(__THREADSFLAG)
  !endif
  !if "$(SHARED)" == "1"
  ____wxxml_namedll_DEP = $(__xmldll___depname)
  !endif
  !if "$(SHARED)" == "1"
  ____wxxml_namedll_DEP = $(__xmldll___depname)
@@ -4089,21 +4510,33 @@ ____wxxml_namelib_DEP = $(__xmllib___depname)
  __xrcdll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
  !endif
  __xrcdll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll
  !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_387 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_387 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_387 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_387 = $(__DEBUGRUNTIME_10)
+!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_343 = D
+__RUNTIME_LIBS_395 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_343 = $(__THREADSFLAG)
+__RUNTIME_LIBS_395 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1"
  __xrclib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1"
  __xrclib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_356 = D
+__RUNTIME_LIBS_410 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_356 = $(__THREADSFLAG)
+__RUNTIME_LIBS_410 = $(__THREADSFLAG)
  !endif
  !if "$(SHARED)" == "1"
  ____wxxrc_namedll_DEP = $(__xrcdll___depname)
  !endif
  !if "$(SHARED)" == "1"
  ____wxxrc_namedll_DEP = $(__xrcdll___depname)
@@ -4115,21 +4548,33 @@ ____wxxrc_namelib_DEP = $(__xrclib___depname)
  __auidll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll
  !endif
  __auidll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll
  !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_418 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_418 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_418 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_418 = $(__DEBUGRUNTIME_10)
+!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_370 = D
+__RUNTIME_LIBS_426 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_370 = $(__THREADSFLAG)
+__RUNTIME_LIBS_426 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1"
  __auilib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1"
  __auilib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_383 = D
+__RUNTIME_LIBS_441 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_383 = $(__THREADSFLAG)
+__RUNTIME_LIBS_441 = $(__THREADSFLAG)
  !endif
  !if "$(SHARED)" == "1"
  ____wxaui_namedll_DEP = $(__auidll___depname)
  !endif
  !if "$(SHARED)" == "1"
  ____wxaui_namedll_DEP = $(__auidll___depname)
@@ -4137,25 +4582,113 @@ ____wxaui_namedll_DEP = $(__auidll___depname)
  !if "$(SHARED)" == "0"
  ____wxaui_namelib_DEP = $(__auilib___depname)
  !endif
  !if "$(SHARED)" == "0"
  ____wxaui_namelib_DEP = $(__auilib___depname)
  !endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1"
+__ribbondll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_449 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_449 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_449 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_449 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_457 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_457 = $(__THREADSFLAG)
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RIBBON)" == "1"
+__ribbonlib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_472 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_472 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1"
+____wxribbon_namedll_DEP = $(__ribbondll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxribbon_namelib_DEP = $(__ribbonlib___depname)
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"
+__propgriddll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_480 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_480 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_480 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_480 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_488 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_488 = $(__THREADSFLAG)
+!endif
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_PROPGRID)" == "1"
+__propgridlib___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_503 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_503 = $(__THREADSFLAG)
+!endif
+!if "$(SHARED)" == "1"
+____wxpropgrid_namedll_DEP = $(__propgriddll___depname)
+!endif
+!if "$(SHARED)" == "0"
+____wxpropgrid_namelib_DEP = $(__propgridlib___depname)
+!endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
  __richtextdll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
  __richtextdll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll
  !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_511 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_511 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_511 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_511 = $(__DEBUGRUNTIME_10)
+!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_397 = D
+__RUNTIME_LIBS_519 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_397 = $(__THREADSFLAG)
+__RUNTIME_LIBS_519 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RICHTEXT)" == "1"
  __richtextlib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RICHTEXT)" == "1"
  __richtextlib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_410 = D
+__RUNTIME_LIBS_534 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_410 = $(__THREADSFLAG)
+__RUNTIME_LIBS_534 = $(__THREADSFLAG)
  !endif
  !if "$(SHARED)" == "1"
  ____wxrichtext_namedll_DEP = $(__richtextdll___depname)
  !endif
  !if "$(SHARED)" == "1"
  ____wxrichtext_namedll_DEP = $(__richtextdll___depname)
@@ -4167,21 +4700,33 @@ ____wxrichtext_namelib_DEP = $(__richtextlib___depname)
  __stcdll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll
  !endif
  __stcdll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll
  !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_542 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_542 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_542 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_542 = $(__DEBUGRUNTIME_10)
+!endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_424 = D
+__RUNTIME_LIBS_550 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_424 = $(__THREADSFLAG)
+__RUNTIME_LIBS_550 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_STC)" == "1"
  __stclib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
  !endif
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_STC)" == "1"
  __stclib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_437 = D
+__RUNTIME_LIBS_565 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_437 = $(__THREADSFLAG)
+__RUNTIME_LIBS_565 = $(__THREADSFLAG)
  !endif
  !if "$(SHARED)" == "1"
  ____wxstc_namedll_DEP = $(__stcdll___depname)
  !endif
  !if "$(SHARED)" == "1"
  ____wxstc_namedll_DEP = $(__stcdll___depname)
@@ -4193,11 +4738,23 @@ ____wxstc_namelib_DEP = $(__stclib___depname)
  __gldll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
  !endif
  __gldll___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll
  !endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_451 = D
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_573 = $(__DEBUGRUNTIME_10)
  !endif
  !endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_451 = $(__THREADSFLAG)
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_573 = 
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_573 = 
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_573 = $(__DEBUGRUNTIME_10)
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_581 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_581 = $(__THREADSFLAG)
  !endif
  !if "$(MONOLITHIC)" == "0"
  __WXLIBGLDEP_CORE_p = \
  !endif
  !if "$(MONOLITHIC)" == "0"
  __WXLIBGLDEP_CORE_p = \
@@ -4216,10 +4773,10 @@ __gllib___depname = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
  !endif
  !if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_464 = D
+__RUNTIME_LIBS_596 = D
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
  !endif
  !if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_464 = $(__THREADSFLAG)
+__RUNTIME_LIBS_596 = $(__THREADSFLAG)
  !endif
  !if "$(SHARED)" == "1"
  ____wxgl_namedll_DEP = $(__gldll___depname)
  !endif
  !if "$(SHARED)" == "1"
  ____wxgl_namedll_DEP = $(__gldll___depname)
@@ -4238,64 +4795,73 @@ __htmldll_library_link_LIBR = \
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
         $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_4 = /DEBUG
+__DEBUGINFO_5 = /DEBUG
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO_4 = 
+__DEBUGINFO_5 = 
  !endif
  !if "$(DEBUG_INFO)" == "0"
  !endif
  !if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO_4 = 
+__DEBUGINFO_5 = 
  !endif
  !if "$(DEBUG_INFO)" == "1"
  !endif
  !if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO_4 = /DEBUG
+__DEBUGINFO_5 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_5 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_5 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_5 = 
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_5 = /d _DEBUG
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_4 = /d _DEBUG
+__DEBUGRUNTIME_10 = 
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
-____DEBUGRUNTIME_4 = 
+__DEBUGRUNTIME_10 = /opt:ref /opt:icf
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "0"
-____DEBUGRUNTIME_4 = 
+__DEBUGRUNTIME_10 = /opt:ref /opt:icf
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
  !endif
  !if "$(DEBUG_RUNTIME_LIBS)" == "1"
-____DEBUGRUNTIME_4 = /d _DEBUG
+__DEBUGRUNTIME_10 = 
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
  !endif
  !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
-__NO_VC_CRTDBG_p_60 = /d __NO_VC_CRTDBG__
+__NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
  !endif
  !if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
-__NO_VC_CRTDBG_p_60 = /d __NO_VC_CRTDBG__
+__NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__
  !endif
  !if "$(WXUNIV)" == "1"
  !endif
  !if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_54 = /d __WXUNIVERSAL__
+__WXUNIV_DEFINE_p_62 = /d __WXUNIVERSAL__
  !endif
  !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_53 = /d __WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_53 = /d __WXDEBUG__
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_61 = /d wxDEBUG_LEVEL=0
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
-__EXCEPTIONS_DEFINE_p_53 = /d wxNO_EXCEPTIONS
+__EXCEPTIONS_DEFINE_p_61 = /d wxNO_EXCEPTIONS
  !endif
  !if "$(USE_RTTI)" == "0"
  !endif
  !if "$(USE_RTTI)" == "0"
-__RTTI_DEFINE_p_53 = /d wxNO_RTTI
+__RTTI_DEFINE_p_61 = /d wxNO_RTTI
  !endif
  !if "$(USE_THREADS)" == "0"
  !endif
  !if "$(USE_THREADS)" == "0"
-__THREAD_DEFINE_p_53 = /d wxNO_THREADS
+__THREAD_DEFINE_p_61 = /d wxNO_THREADS
  !endif
  !if "$(UNICODE)" == "0"
  !endif
  !if "$(UNICODE)" == "0"
-__UNICODE_DEFINE_p_54 = /d wxUSE_UNICODE=0
+__UNICODE_DEFINE_p_62 = /d wxUSE_UNICODE=0
  !endif
  !if "$(UNICODE)" == "1"
  !endif
  !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_54 = /d _UNICODE
+__UNICODE_DEFINE_p_62 = /d _UNICODE
  !endif
  !if "$(MSLU)" == "1"
  !endif
  !if "$(MSLU)" == "1"
-__MSLU_DEFINE_p_53 = /d wxUSE_UNICODE_MSLU=1
+__MSLU_DEFINE_p_61 = /d wxUSE_UNICODE_MSLU=1
  !endif
  !if "$(USE_GDIPLUS)" == "1"
  !endif
  !if "$(USE_GDIPLUS)" == "1"
-__GFXCTX_DEFINE_p_53 = /d wxUSE_GRAPHICS_CONTEXT=1
+__GFXCTX_DEFINE_p_61 = /d wxUSE_GRAPHICS_CONTEXT=1
  !endif
  !if "$(USE_GUI)" == "1"
  __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
  !endif
  !if "$(USE_GUI)" == "1"
  __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -4381,11 +4947,8 @@ __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
  !if "$(WXUNIV)" == "1"
  __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
  !endif
  !if "$(WXUNIV)" == "1"
  __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
  !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = /D__WXDEBUG__
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
  __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
  !endif
  !if "$(USE_EXCEPTIONS)" == "0"
  __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
@@ -4422,7 +4985,7 @@ $(OBJS):
  
  ### Targets: ###
  
  
  ### Targets: ###
  
-all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
+all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
  
  clean: 
         -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
  
  clean: 
         -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -4490,6 +5053,16 @@ clean:
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).ilk
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).ilk
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).ilk
         -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb
@@ -4563,8 +5136,8 @@ $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS)
  
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP)
  
  !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(MONODLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib     $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(__DEBUGINFO_108)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(MONODLL_OBJECTS) $(MONODLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib     $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  <<
  !endif
  
  <<
  !endif
  
@@ -4578,8 +5151,8 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj  $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(BASEDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(__DEBUGINFO_139)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(BASEDLL_OBJECTS) $(BASEDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
  <<
  !endif
  
  <<
  !endif
  
@@ -4597,8 +5170,8 @@ wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj  $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(NETDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb" $(__DEBUGINFO_170)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(NETDLL_OBJECTS) $(NETDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
  <<
  !endif
  
  <<
  !endif
  
@@ -4616,8 +5189,8 @@ wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(COREDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb" $(__DEBUGINFO_201)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(COREDLL_OBJECTS) $(COREDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
  <<
  !endif
  
  <<
  !endif
  
@@ -4635,8 +5208,8 @@ wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(ADVDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb" $(__DEBUGINFO_232)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(ADVDLL_OBJECTS) $(ADVDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
  <<
  !endif
  
  <<
  !endif
  
@@ -4654,8 +5227,8 @@ wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj  $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(MEDIADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb" $(__DEBUGINFO_263)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(MEDIADLL_OBJECTS) $(MEDIADLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib
  <<
  !endif
  
  <<
  !endif
  
@@ -4673,8 +5246,8 @@ wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(HTMLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb" $(__DEBUGINFO_294)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(HTMLDLL_OBJECTS) $(HTMLDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
  <<
  !endif
  
  <<
  !endif
  
@@ -4692,8 +5265,8 @@ wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj  $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(QADLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb" $(__DEBUGINFO_325)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(QADLL_OBJECTS) $(QADLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib
  <<
  !endif
  
  <<
  !endif
  
@@ -4711,8 +5284,8 @@ wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1"
  $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj  $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(XMLDLL_OBJECTS)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb" $(__DEBUGINFO_356)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(XMLDLL_OBJECTS) $(XMLDLL_RESOURCES)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib  /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
  <<
  !endif
  
  <<
  !endif
  
@@ -4730,8 +5303,8 @@ wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj  $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(XRCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb" $(__DEBUGINFO_387)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(XRCDLL_OBJECTS) $(XRCDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib
  <<
  !endif
  
  <<
  !endif
  
@@ -4749,8 +5322,8 @@ wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj  $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj  $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(AUIDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb" $(__DEBUGINFO_418)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(AUIDLL_OBJECTS) $(AUIDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
  <<
  !endif
  
  <<
  !endif
  
@@ -4766,10 +5339,48 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
  wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
  !endif
  
  wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
  !endif
  
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll: $(OBJS)\ribbondll_dummy.obj  $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\ribbondll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb" $(__DEBUGINFO_449)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(RIBBONDLL_OBJECTS) $(RIBBONDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RIBBON)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib: $(OBJS)\ribbonlib_dummy.obj  $(RIBBONLIB_OBJECTS)
+       if exist $@ del $@
+       link /LIB /NOLOGO /OUT:$@ @<<
+       $(RIBBONLIB_OBJECTS)
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(USE_RIBBON)" == "1"
+wxribbon: $(____wxribbon_namedll_DEP) $(____wxribbon_namelib_DEP)
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll: $(OBJS)\propgriddll_dummy.obj  $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\propgriddll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb" $(__DEBUGINFO_480)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(PROPGRIDDLL_OBJECTS) $(PROPGRIDDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_PROPGRID)" == "1"
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib: $(OBJS)\propgridlib_dummy.obj  $(PROPGRIDLIB_OBJECTS)
+       if exist $@ del $@
+       link /LIB /NOLOGO /OUT:$@ @<<
+       $(PROPGRIDLIB_OBJECTS)
+<<
+!endif
+
+!if "$(MONOLITHIC)" == "0" && "$(USE_PROPGRID)" == "1"
+wxpropgrid: $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP)
+!endif
+
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj  $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(RICHTEXTDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb" $(__DEBUGINFO_511)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(RICHTEXTDLL_OBJECTS) $(RICHTEXTDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib
  <<
  !endif
  
  <<
  !endif
  
@@ -4787,8 +5398,8 @@ wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj  $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname)
  
  !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1"
  $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj  $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(STCDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb" $(__DEBUGINFO_542)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(STCDLL_OBJECTS) $(STCDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
  <<
  !endif
  
  <<
  !endif
  
@@ -4805,9 +5416,9 @@ wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP)
  !endif
  
  !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
  !endif
  
  !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1"
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname)
-       link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb"  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) @<<
-       $(GLDLL_OBJECTS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
+       link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb" $(__DEBUGINFO_573)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<<
+       $(GLDLL_OBJECTS) $(GLDLL_RESOURCES)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib
  <<
  !endif
  
  <<
  !endif
  
@@ -4852,7 +5463,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
  build_cfg_file: $(SETUPHDIR)
         @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
         @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)
  build_cfg_file: $(SETUPHDIR)
         @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
         @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)
-       @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
+       @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
         @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
         @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
         @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
         @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
         @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
         @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -5514,6 +6125,9 @@ $(OBJS)\wxscintilla_XPM.obj: ..\..\src\stc\scintilla\src\XPM.cxx
  $(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
+$(OBJS)\monodll_any.obj: ..\..\src\common\any.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\any.cpp
+
  $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appbase.cpp
  
  $(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appbase.cpp
  
@@ -5547,6 +6161,9 @@ $(OBJS)\monodll_convauto.obj: ..\..\src\common\convauto.cpp
  $(OBJS)\monodll_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datetime.cpp
  
  $(OBJS)\monodll_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datetime.cpp
  
+$(OBJS)\monodll_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datetimefmt.cpp
+
  $(OBJS)\monodll_datstrm.obj: ..\..\src\common\datstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datstrm.cpp
  
  $(OBJS)\monodll_datstrm.obj: ..\..\src\common\datstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datstrm.cpp
  
@@ -5664,6 +6281,9 @@ $(OBJS)\monodll_stdpbase.obj: ..\..\src\common\stdpbase.cpp
  $(OBJS)\monodll_sstream.obj: ..\..\src\common\sstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sstream.cpp
  
  $(OBJS)\monodll_sstream.obj: ..\..\src\common\sstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sstream.cpp
  
+$(OBJS)\monodll_stdstream.obj: ..\..\src\common\stdstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
  $(OBJS)\monodll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp
  
  $(OBJS)\monodll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp
  
@@ -5715,6 +6335,9 @@ $(OBJS)\monodll_unichar.obj: ..\..\src\common\unichar.cpp
  $(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\uri.cpp
  
  $(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\uri.cpp
  
+$(OBJS)\monodll_ustring.obj: ..\..\src\common\ustring.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ustring.cpp
+
  $(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\variant.cpp
  
  $(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\variant.cpp
  
@@ -5742,6 +6365,12 @@ $(OBJS)\monodll_zipstrm.obj: ..\..\src\common\zipstrm.cpp
  $(OBJS)\monodll_zstream.obj: ..\..\src\common\zstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\zstream.cpp
  
  $(OBJS)\monodll_zstream.obj: ..\..\src\common\zstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\zstream.cpp
  
+$(OBJS)\monodll_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp
+
+$(OBJS)\monodll_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp
+
  $(OBJS)\monodll_basemsw.obj: ..\..\src\msw\basemsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp
  
  $(OBJS)\monodll_basemsw.obj: ..\..\src\msw\basemsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp
  
@@ -5793,6 +6422,9 @@ $(OBJS)\monodll_utils.obj: ..\..\src\msw\utils.cpp
  $(OBJS)\monodll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
  
  $(OBJS)\monodll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
  
+$(OBJS)\monodll_fswatcher.obj: ..\..\src\msw\fswatcher.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fswatcher.cpp
+
  $(OBJS)\monodll_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\event.cpp
  
  $(OBJS)\monodll_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\event.cpp
  
@@ -5847,21 +6479,48 @@ $(OBJS)\monodll_socket.obj: ..\..\src\common\socket.cpp
  $(OBJS)\monodll_url.obj: ..\..\src\common\url.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\url.cpp
  
  $(OBJS)\monodll_url.obj: ..\..\src\common\url.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\url.cpp
  
-$(OBJS)\monodll_gsocket.obj: ..\..\src\msw\gsocket.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gsocket.cpp
-
-$(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gsockmsw.cpp
+$(OBJS)\monodll_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sockmsw.cpp
  
  $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
  
  
  $(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
  
+$(OBJS)\monodll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+
+$(OBJS)\monodll_msw_accel.obj: ..\..\src\msw\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\accel.cpp
+
+$(OBJS)\monodll_artmsw.obj: ..\..\src\msw\artmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
+
+$(OBJS)\monodll_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+
+$(OBJS)\monodll_msw_button.obj: ..\..\src\msw\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\button.cpp
+
+$(OBJS)\monodll_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+
+$(OBJS)\monodll_msw_choice.obj: ..\..\src\msw\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\choice.cpp
+
  $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp
  
  $(OBJS)\monodll_combo.obj: ..\..\src\msw\combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combo.cpp
  
  $(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp
  
  $(OBJS)\monodll_combo.obj: ..\..\src\msw\combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combo.cpp
  
+$(OBJS)\monodll_msw_combobox.obj: ..\..\src\msw\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combobox.cpp
+
+$(OBJS)\monodll_msw_control.obj: ..\..\src\msw\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\control.cpp
+
+$(OBJS)\monodll_msw_dialog.obj: ..\..\src\msw\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialog.cpp
+
  $(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
  
  $(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
  
@@ -5874,15 +6533,27 @@ $(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp
  $(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\frame.cpp
  
  $(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\frame.cpp
  
-$(OBJS)\monodll_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge95.cpp
+$(OBJS)\monodll_msw_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+
+$(OBJS)\monodll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
  
  $(OBJS)\monodll_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
  
  $(OBJS)\monodll_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
+$(OBJS)\monodll_msw_listbox.obj: ..\..\src\msw\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
+
+$(OBJS)\monodll_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+
  $(OBJS)\monodll_mdi.obj: ..\..\src\msw\mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mdi.cpp
  
  $(OBJS)\monodll_mdi.obj: ..\..\src\msw\mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mdi.cpp
  
+$(OBJS)\monodll_msw_menu.obj: ..\..\src\msw\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menu.cpp
+
  $(OBJS)\monodll_menuitem.obj: ..\..\src\msw\menuitem.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp
  
  $(OBJS)\monodll_menuitem.obj: ..\..\src\msw\menuitem.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp
  
@@ -5898,67 +6569,130 @@ $(OBJS)\monodll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
  $(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
  
  $(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
  
+$(OBJS)\monodll_msw_notebook.obj: ..\..\src\msw\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notebook.cpp
+
  $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
  
  $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
  $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
  
  $(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
-$(OBJS)\monodll_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider95.cpp
+$(OBJS)\monodll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+
+$(OBJS)\monodll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+
+$(OBJS)\monodll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+
+$(OBJS)\monodll_msw_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+
+$(OBJS)\monodll_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
  
  $(OBJS)\monodll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
  
  $(OBJS)\monodll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
-$(OBJS)\monodll_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\monodll_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+
+$(OBJS)\monodll_msw_statbox.obj: ..\..\src\msw\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbox.cpp
+
+$(OBJS)\monodll_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
+
+$(OBJS)\monodll_msw_statline.obj: ..\..\src\msw\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statline.cpp
+
+$(OBJS)\monodll_msw_stattext.obj: ..\..\src\msw\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
  
  
-$(OBJS)\monodll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
+$(OBJS)\monodll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
  
  
-$(OBJS)\monodll_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tbar95.cpp
+$(OBJS)\monodll_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
  
  $(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
  
  $(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
+$(OBJS)\monodll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+
  $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp
  
  $(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp
  
+$(OBJS)\monodll_msw_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
+
+$(OBJS)\monodll_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+
  $(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
  
  $(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
  
+$(OBJS)\monodll_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\accel.cpp
+
  $(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
  
  $(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
  
  $(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
  
  $(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
  
+$(OBJS)\monodll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+
  $(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
  
  $(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
  
  $(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
  
  $(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
  
+$(OBJS)\monodll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+
  $(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\mdig.cpp
  
  $(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
  
  $(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\mdig.cpp
  
  $(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
  
-$(OBJS)\monodll_tabg.obj: ..\..\src\generic\tabg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tabg.cpp
+$(OBJS)\monodll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+
+$(OBJS)\monodll_univ_button.obj: ..\..\src\univ\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\button.cpp
+
+$(OBJS)\monodll_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+
+$(OBJS)\monodll_univ_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checklst.cpp
+
+$(OBJS)\monodll_univ_choice.obj: ..\..\src\univ\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\choice.cpp
+
+$(OBJS)\monodll_univ_combobox.obj: ..\..\src\univ\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\combobox.cpp
  
  
-$(OBJS)\monodll_colschem.obj: ..\..\src\univ\colschem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\colschem.cpp
+$(OBJS)\monodll_univ_control.obj: ..\..\src\univ\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\control.cpp
  
  $(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
  
  
  $(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
  
+$(OBJS)\monodll_univ_dialog.obj: ..\..\src\univ\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
+
  $(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
  $(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
-$(OBJS)\monodll_gauge.obj: ..\..\src\univ\gauge.cpp
+$(OBJS)\monodll_univ_gauge.obj: ..\..\src\univ\gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
  
  $(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
  
  $(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp
@@ -5967,22 +6701,67 @@ $(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp
  $(OBJS)\monodll_inphand.obj: ..\..\src\univ\inphand.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inphand.cpp
  
  $(OBJS)\monodll_inphand.obj: ..\..\src\univ\inphand.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inphand.cpp
  
+$(OBJS)\monodll_univ_listbox.obj: ..\..\src\univ\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\listbox.cpp
+
+$(OBJS)\monodll_univ_menu.obj: ..\..\src\univ\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\menu.cpp
+
+$(OBJS)\monodll_univ_notebook.obj: ..\..\src\univ\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\notebook.cpp
+
+$(OBJS)\monodll_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+
+$(OBJS)\monodll_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+
  $(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
  
  $(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
  
+$(OBJS)\monodll_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+
  $(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
  $(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
-$(OBJS)\monodll_slider.obj: ..\..\src\univ\slider.cpp
+$(OBJS)\monodll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
+
+$(OBJS)\monodll_univ_slider.obj: ..\..\src\univ\slider.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp
  
+$(OBJS)\monodll_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+
+$(OBJS)\monodll_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+
+$(OBJS)\monodll_univ_statbox.obj: ..\..\src\univ\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbox.cpp
+
+$(OBJS)\monodll_univ_statline.obj: ..\..\src\univ\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statline.cpp
+
+$(OBJS)\monodll_univ_stattext.obj: ..\..\src\univ\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
+
+$(OBJS)\monodll_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp
+
  $(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
  $(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
+$(OBJS)\monodll_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+
+$(OBJS)\monodll_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+
  $(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\theme.cpp
  
  $(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\theme.cpp
  
-$(OBJS)\monodll_toolbar.obj: ..\..\src\univ\toolbar.cpp
+$(OBJS)\monodll_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
  
  $(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
  
  $(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp
@@ -6003,6 +6782,15 @@ $(OBJS)\monodll_mono.obj: ..\..\src\univ\themes\mono.cpp
  $(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
  
  $(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
  
+$(OBJS)\monodll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+
+$(OBJS)\monodll_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+
+$(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+
  $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
  
  $(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
  
@@ -6018,9 +6806,6 @@ $(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
  $(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
  
  $(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
  
-$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
  $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp
  
  $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp
  
@@ -6138,6 +6923,9 @@ $(OBJS)\monodll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
  $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
  
  $(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
  
+$(OBJS)\monodll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+
  $(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
  
  $(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
  
@@ -6147,11 +6935,11 @@ $(OBJS)\monodll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
  $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
  
  $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
  
-$(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+$(OBJS)\monodll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
  
  
-$(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+$(OBJS)\monodll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
  
  $(OBJS)\monodll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
  
  $(OBJS)\monodll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
@@ -6159,6 +6947,9 @@ $(OBJS)\monodll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
  $(OBJS)\monodll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
  
  $(OBJS)\monodll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
  
+$(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+
  $(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
  
  $(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
  
@@ -6183,6 +6974,9 @@ $(OBJS)\monodll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
  $(OBJS)\monodll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
  
  $(OBJS)\monodll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
  
+$(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+
  $(OBJS)\monodll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
  
  $(OBJS)\monodll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
  
@@ -6267,6 +7061,9 @@ $(OBJS)\monodll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
  $(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
  
  $(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
  
+$(OBJS)\monodll_xmladv.obj: ..\..\src\xrc\xmladv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
+
  $(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
  
  $(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
  
@@ -6282,9 +7079,66 @@ $(OBJS)\monodll_floatpane.obj: ..\..\src\aui\floatpane.cpp
  $(OBJS)\monodll_auibook.obj: ..\..\src\aui\auibook.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibook.cpp
  
  $(OBJS)\monodll_auibook.obj: ..\..\src\aui\auibook.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibook.cpp
  
+$(OBJS)\monodll_auibar.obj: ..\..\src\aui\auibar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibar.cpp
+
  $(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
  
  $(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
  
+$(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
+
+$(OBJS)\monodll_editors.obj: ..\..\src\propgrid\editors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\editors.cpp
+
+$(OBJS)\monodll_manager.obj: ..\..\src\propgrid\manager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\manager.cpp
+
+$(OBJS)\monodll_property.obj: ..\..\src\propgrid\property.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\property.cpp
+
+$(OBJS)\monodll_propgrid.obj: ..\..\src\propgrid\propgrid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp
+
+$(OBJS)\monodll_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp
+
+$(OBJS)\monodll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp
+
+$(OBJS)\monodll_props.obj: ..\..\src\propgrid\props.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\props.cpp
+
+$(OBJS)\monodll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+
+$(OBJS)\monodll_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+
+$(OBJS)\monodll_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+
+$(OBJS)\monodll_bar.obj: ..\..\src\ribbon\bar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+
+$(OBJS)\monodll_ribbon_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+
+$(OBJS)\monodll_ribbon_control.obj: ..\..\src\ribbon\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\control.cpp
+
+$(OBJS)\monodll_gallery.obj: ..\..\src\ribbon\gallery.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+
+$(OBJS)\monodll_page.obj: ..\..\src\ribbon\page.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\page.cpp
+
+$(OBJS)\monodll_panel.obj: ..\..\src\ribbon\panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+
+$(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+
  $(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
  
  $(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
  
@@ -6327,6 +7181,11 @@ $(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp
  $(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xtixml.cpp
  
  $(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xtixml.cpp
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_app.obj: ..\..\src\msw\app.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\app.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_app.obj: ..\..\src\msw\app.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\app.cpp
@@ -6587,319 +7446,69 @@ $(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_statusbr.obj: ..\..\src\generic\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_statusbr.obj: ..\..\src\univ\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp
-!endif
-
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_accel.obj: ..\..\src\msw\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\accel.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_accel.obj: ..\..\src\generic\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\accel.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_anidecod.obj: ..\..\src\common\anidecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\anidecod.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appcmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_button.obj: ..\..\src\msw\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\button.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_artprov.obj: ..\..\src\common\artprov.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artprov.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_button.obj: ..\..\src\univ\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\button.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_artstd.obj: ..\..\src\common\artstd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artstd.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_checkbox.obj: ..\..\src\msw\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_checkbox.obj: ..\..\src\univ\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_choice.obj: ..\..\src\msw\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\choice.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_btncmn.obj: ..\..\src\common\btncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\btncmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_choice.obj: ..\..\src\univ\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\choice.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_combobox.obj: ..\..\src\msw\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combobox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_combobox.obj: ..\..\src\univ\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\combobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_control.obj: ..\..\src\msw\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\control.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_control.obj: ..\..\src\univ\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\control.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_dialog.obj: ..\..\src\msw\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialog.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_dialog.obj: ..\..\src\univ\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_listbox.obj: ..\..\src\msw\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_listbox.obj: ..\..\src\univ\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\listbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_listctrl.obj: ..\..\src\msw\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_listctrl.obj: ..\..\src\generic\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_menu.obj: ..\..\src\msw\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menu.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_menu.obj: ..\..\src\univ\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\menu.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_notebook.obj: ..\..\src\msw\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notebook.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_notebook.obj: ..\..\src\univ\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\notebook.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_radiobox.obj: ..\..\src\msw\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_radiobox.obj: ..\..\src\univ\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_radiobut.obj: ..\..\src\msw\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_radiobut.obj: ..\..\src\univ\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_statbmp.obj: ..\..\src\msw\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_statbmp.obj: ..\..\src\univ\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_statbox.obj: ..\..\src\msw\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_statbox.obj: ..\..\src\univ\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_statline.obj: ..\..\src\msw\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statline.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_statline.obj: ..\..\src\univ\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statline.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_stattext.obj: ..\..\src\msw\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_stattext.obj: ..\..\src\univ\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_textctrl.obj: ..\..\src\msw\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_textctrl.obj: ..\..\src\univ\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checklst.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_anidecod.obj: ..\..\src\common\anidecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\anidecod.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_artprov.obj: ..\..\src\common\artprov.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artprov.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_artstd.obj: ..\..\src\common\artstd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artstd.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_btncmn.obj: ..\..\src\common\btncmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\btncmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  !endif
  
  !if "$(USE_GUI)" == "1"
@@ -7092,6 +7701,16 @@ $(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\helpbase.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\helpbase.cpp
@@ -7192,6 +7811,11 @@ $(OBJS)\monodll_menucmn.obj: ..\..\src\common\menucmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\menucmn.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\menucmn.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp
@@ -7207,6 +7831,11 @@ $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
@@ -7232,6 +7861,11 @@ $(OBJS)\monodll_radiocmn.obj: ..\..\src\common\radiocmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_rendcmn.obj: ..\..\src\common\rendcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rendcmn.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_rendcmn.obj: ..\..\src\common\rendcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rendcmn.cpp
@@ -7252,6 +7886,11 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp
@@ -7322,6 +7961,11 @@ $(OBJS)\monodll_windowid.obj: ..\..\src\common\windowid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\windowid.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\windowid.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
@@ -7333,7 +7977,7 @@ $(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+$(OBJS)\monodll_generic_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
  !endif
  
@@ -7372,6 +8016,11 @@ $(OBJS)\monodll_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
@@ -7432,6 +8081,16 @@ $(OBJS)\monodll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_stattextg.obj: ..\..\src\generic\stattextg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
@@ -7472,6 +8131,16 @@ $(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp
@@ -7493,8 +8162,8 @@ $(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\calctrl.cpp
+$(OBJS)\monodll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  !endif
  
  !if "$(USE_GUI)" == "1"
@@ -7522,6 +8191,11 @@ $(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_grideditors.obj: ..\..\src\generic\grideditors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\grideditors.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\gridsel.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\gridsel.cpp
@@ -7537,6 +8211,11 @@ $(OBJS)\monodll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_infobar.obj: ..\..\src\generic\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
@@ -7582,16 +8261,6 @@ $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
  !endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
@@ -7617,12 +8286,20 @@ $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+
  $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
  $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_BASE=1 /d WXMAKINGDLL /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_BASE=1 /d WXMAKINGDLL /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS ..\..\src\msw\version.rc
  
  $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  
  $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
+$(OBJS)\monolib_any.obj: ..\..\src\common\any.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\any.cpp
+
  $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appbase.cpp
  
  $(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appbase.cpp
  
@@ -7656,6 +8333,9 @@ $(OBJS)\monolib_convauto.obj: ..\..\src\common\convauto.cpp
  $(OBJS)\monolib_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datetime.cpp
  
  $(OBJS)\monolib_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datetime.cpp
  
+$(OBJS)\monolib_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datetimefmt.cpp
+
  $(OBJS)\monolib_datstrm.obj: ..\..\src\common\datstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datstrm.cpp
  
  $(OBJS)\monolib_datstrm.obj: ..\..\src\common\datstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datstrm.cpp
  
@@ -7773,6 +8453,9 @@ $(OBJS)\monolib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
  $(OBJS)\monolib_sstream.obj: ..\..\src\common\sstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sstream.cpp
  
  $(OBJS)\monolib_sstream.obj: ..\..\src\common\sstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sstream.cpp
  
+$(OBJS)\monolib_stdstream.obj: ..\..\src\common\stdstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
  $(OBJS)\monolib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp
  
  $(OBJS)\monolib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp
  
@@ -7824,6 +8507,9 @@ $(OBJS)\monolib_unichar.obj: ..\..\src\common\unichar.cpp
  $(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\uri.cpp
  
  $(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\uri.cpp
  
+$(OBJS)\monolib_ustring.obj: ..\..\src\common\ustring.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ustring.cpp
+
  $(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\variant.cpp
  
  $(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\variant.cpp
  
@@ -7851,6 +8537,12 @@ $(OBJS)\monolib_zipstrm.obj: ..\..\src\common\zipstrm.cpp
  $(OBJS)\monolib_zstream.obj: ..\..\src\common\zstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\zstream.cpp
  
  $(OBJS)\monolib_zstream.obj: ..\..\src\common\zstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\zstream.cpp
  
+$(OBJS)\monolib_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp
+
+$(OBJS)\monolib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp
+
  $(OBJS)\monolib_basemsw.obj: ..\..\src\msw\basemsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
  
  $(OBJS)\monolib_basemsw.obj: ..\..\src\msw\basemsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
  
@@ -7902,6 +8594,9 @@ $(OBJS)\monolib_utils.obj: ..\..\src\msw\utils.cpp
  $(OBJS)\monolib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
  
  $(OBJS)\monolib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
  
+$(OBJS)\monolib_fswatcher.obj: ..\..\src\msw\fswatcher.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fswatcher.cpp
+
  $(OBJS)\monolib_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\event.cpp
  
  $(OBJS)\monolib_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\event.cpp
  
@@ -7956,21 +8651,48 @@ $(OBJS)\monolib_socket.obj: ..\..\src\common\socket.cpp
  $(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\url.cpp
  
  $(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\url.cpp
  
-$(OBJS)\monolib_gsocket.obj: ..\..\src\msw\gsocket.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gsocket.cpp
-
-$(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gsockmsw.cpp
+$(OBJS)\monolib_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sockmsw.cpp
  
  $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
  
  
  $(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
  
+$(OBJS)\monolib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+
+$(OBJS)\monolib_msw_accel.obj: ..\..\src\msw\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\accel.cpp
+
+$(OBJS)\monolib_artmsw.obj: ..\..\src\msw\artmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
+
+$(OBJS)\monolib_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+
+$(OBJS)\monolib_msw_button.obj: ..\..\src\msw\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\button.cpp
+
+$(OBJS)\monolib_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+
+$(OBJS)\monolib_msw_choice.obj: ..\..\src\msw\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\choice.cpp
+
  $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp
  
  $(OBJS)\monolib_combo.obj: ..\..\src\msw\combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combo.cpp
  
  $(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp
  
  $(OBJS)\monolib_combo.obj: ..\..\src\msw\combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combo.cpp
  
+$(OBJS)\monolib_msw_combobox.obj: ..\..\src\msw\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combobox.cpp
+
+$(OBJS)\monolib_msw_control.obj: ..\..\src\msw\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\control.cpp
+
+$(OBJS)\monolib_msw_dialog.obj: ..\..\src\msw\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialog.cpp
+
  $(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
  
  $(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
  
@@ -7983,15 +8705,27 @@ $(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp
  $(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\frame.cpp
  
  $(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\frame.cpp
  
-$(OBJS)\monolib_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge95.cpp
+$(OBJS)\monolib_msw_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+
+$(OBJS)\monolib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
  
  $(OBJS)\monolib_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
  
  $(OBJS)\monolib_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
+$(OBJS)\monolib_msw_listbox.obj: ..\..\src\msw\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
+
+$(OBJS)\monolib_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+
  $(OBJS)\monolib_mdi.obj: ..\..\src\msw\mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mdi.cpp
  
  $(OBJS)\monolib_mdi.obj: ..\..\src\msw\mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mdi.cpp
  
+$(OBJS)\monolib_msw_menu.obj: ..\..\src\msw\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menu.cpp
+
  $(OBJS)\monolib_menuitem.obj: ..\..\src\msw\menuitem.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp
  
  $(OBJS)\monolib_menuitem.obj: ..\..\src\msw\menuitem.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp
  
@@ -8007,67 +8741,130 @@ $(OBJS)\monolib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
  $(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
  
  $(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
  
+$(OBJS)\monolib_msw_notebook.obj: ..\..\src\msw\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notebook.cpp
+
  $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
  
  $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
  $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
  
  $(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
-$(OBJS)\monolib_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider95.cpp
+$(OBJS)\monolib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+
+$(OBJS)\monolib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+
+$(OBJS)\monolib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+
+$(OBJS)\monolib_msw_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+
+$(OBJS)\monolib_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
  
  $(OBJS)\monolib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
  
  $(OBJS)\monolib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
-$(OBJS)\monolib_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\monolib_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+
+$(OBJS)\monolib_msw_statbox.obj: ..\..\src\msw\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbox.cpp
+
+$(OBJS)\monolib_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
+
+$(OBJS)\monolib_msw_statline.obj: ..\..\src\msw\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statline.cpp
+
+$(OBJS)\monolib_msw_stattext.obj: ..\..\src\msw\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
  
  
-$(OBJS)\monolib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
+$(OBJS)\monolib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
  
  
-$(OBJS)\monolib_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tbar95.cpp
+$(OBJS)\monolib_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
  
  $(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
  
  $(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
+$(OBJS)\monolib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+
  $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp
  
  $(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp
  
+$(OBJS)\monolib_msw_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
+
+$(OBJS)\monolib_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+
  $(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
  
  $(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
  
+$(OBJS)\monolib_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\accel.cpp
+
  $(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
  
  $(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
  
  $(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
  
  $(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
  
+$(OBJS)\monolib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+
  $(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
  
  $(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
  
  $(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
  
  $(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
  
+$(OBJS)\monolib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+
  $(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\mdig.cpp
  
  $(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
  
  $(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\mdig.cpp
  
  $(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
  
-$(OBJS)\monolib_tabg.obj: ..\..\src\generic\tabg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tabg.cpp
+$(OBJS)\monolib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+
+$(OBJS)\monolib_univ_button.obj: ..\..\src\univ\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\button.cpp
+
+$(OBJS)\monolib_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+
+$(OBJS)\monolib_univ_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checklst.cpp
+
+$(OBJS)\monolib_univ_choice.obj: ..\..\src\univ\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\choice.cpp
+
+$(OBJS)\monolib_univ_combobox.obj: ..\..\src\univ\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\combobox.cpp
  
  
-$(OBJS)\monolib_colschem.obj: ..\..\src\univ\colschem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\colschem.cpp
+$(OBJS)\monolib_univ_control.obj: ..\..\src\univ\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\control.cpp
  
  $(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
  
  
  $(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
  
+$(OBJS)\monolib_univ_dialog.obj: ..\..\src\univ\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
+
  $(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
  $(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
-$(OBJS)\monolib_gauge.obj: ..\..\src\univ\gauge.cpp
+$(OBJS)\monolib_univ_gauge.obj: ..\..\src\univ\gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
  
  $(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
  
  $(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp
@@ -8076,22 +8873,67 @@ $(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp
  $(OBJS)\monolib_inphand.obj: ..\..\src\univ\inphand.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inphand.cpp
  
  $(OBJS)\monolib_inphand.obj: ..\..\src\univ\inphand.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inphand.cpp
  
+$(OBJS)\monolib_univ_listbox.obj: ..\..\src\univ\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\listbox.cpp
+
+$(OBJS)\monolib_univ_menu.obj: ..\..\src\univ\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\menu.cpp
+
+$(OBJS)\monolib_univ_notebook.obj: ..\..\src\univ\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\notebook.cpp
+
+$(OBJS)\monolib_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+
+$(OBJS)\monolib_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+
  $(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
  
  $(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
  
+$(OBJS)\monolib_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+
  $(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
  $(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
-$(OBJS)\monolib_slider.obj: ..\..\src\univ\slider.cpp
+$(OBJS)\monolib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
+
+$(OBJS)\monolib_univ_slider.obj: ..\..\src\univ\slider.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp
  
+$(OBJS)\monolib_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+
+$(OBJS)\monolib_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+
+$(OBJS)\monolib_univ_statbox.obj: ..\..\src\univ\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbox.cpp
+
+$(OBJS)\monolib_univ_statline.obj: ..\..\src\univ\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statline.cpp
+
+$(OBJS)\monolib_univ_stattext.obj: ..\..\src\univ\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
+
+$(OBJS)\monolib_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp
+
  $(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
  $(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
+$(OBJS)\monolib_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+
+$(OBJS)\monolib_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+
  $(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\theme.cpp
  
  $(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\theme.cpp
  
-$(OBJS)\monolib_toolbar.obj: ..\..\src\univ\toolbar.cpp
+$(OBJS)\monolib_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
  
  $(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
  
  $(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp
@@ -8112,6 +8954,15 @@ $(OBJS)\monolib_mono.obj: ..\..\src\univ\themes\mono.cpp
  $(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
  
  $(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
  
+$(OBJS)\monolib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+
+$(OBJS)\monolib_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+
+$(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+
  $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
  
  $(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
  
@@ -8127,9 +8978,6 @@ $(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
  $(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
  
  $(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
  
-$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
  $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp
  
  $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp
  
@@ -8247,6 +9095,9 @@ $(OBJS)\monolib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
  $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
  
  $(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
  
+$(OBJS)\monolib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+
  $(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
  
  $(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
  
@@ -8256,11 +9107,11 @@ $(OBJS)\monolib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
  $(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
  
  $(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
  
-$(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+$(OBJS)\monolib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
  
  
-$(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+$(OBJS)\monolib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
  
  $(OBJS)\monolib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
  
  $(OBJS)\monolib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
@@ -8268,6 +9119,9 @@ $(OBJS)\monolib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
  $(OBJS)\monolib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
  
  $(OBJS)\monolib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
  
+$(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+
  $(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
  
  $(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
  
@@ -8292,6 +9146,9 @@ $(OBJS)\monolib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
  $(OBJS)\monolib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
  
  $(OBJS)\monolib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
  
+$(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+
  $(OBJS)\monolib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
  
  $(OBJS)\monolib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
  
@@ -8376,6 +9233,9 @@ $(OBJS)\monolib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
  $(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
  
  $(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
  
+$(OBJS)\monolib_xmladv.obj: ..\..\src\xrc\xmladv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
+
  $(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
  
  $(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
  
@@ -8391,9 +9251,66 @@ $(OBJS)\monolib_floatpane.obj: ..\..\src\aui\floatpane.cpp
  $(OBJS)\monolib_auibook.obj: ..\..\src\aui\auibook.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibook.cpp
  
  $(OBJS)\monolib_auibook.obj: ..\..\src\aui\auibook.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibook.cpp
  
+$(OBJS)\monolib_auibar.obj: ..\..\src\aui\auibar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibar.cpp
+
  $(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
  
  $(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
  
+$(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
+
+$(OBJS)\monolib_editors.obj: ..\..\src\propgrid\editors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\editors.cpp
+
+$(OBJS)\monolib_manager.obj: ..\..\src\propgrid\manager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\manager.cpp
+
+$(OBJS)\monolib_property.obj: ..\..\src\propgrid\property.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\property.cpp
+
+$(OBJS)\monolib_propgrid.obj: ..\..\src\propgrid\propgrid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp
+
+$(OBJS)\monolib_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp
+
+$(OBJS)\monolib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp
+
+$(OBJS)\monolib_props.obj: ..\..\src\propgrid\props.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp
+
+$(OBJS)\monolib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+
+$(OBJS)\monolib_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+
+$(OBJS)\monolib_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+
+$(OBJS)\monolib_bar.obj: ..\..\src\ribbon\bar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+
+$(OBJS)\monolib_ribbon_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+
+$(OBJS)\monolib_ribbon_control.obj: ..\..\src\ribbon\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\control.cpp
+
+$(OBJS)\monolib_gallery.obj: ..\..\src\ribbon\gallery.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+
+$(OBJS)\monolib_page.obj: ..\..\src\ribbon\page.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp
+
+$(OBJS)\monolib_panel.obj: ..\..\src\ribbon\panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+
+$(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+
  $(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
  
  $(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
  
@@ -8436,6 +9353,11 @@ $(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp
  $(OBJS)\monolib_xtixml.obj: ..\..\src\common\xtixml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xtixml.cpp
  
  $(OBJS)\monolib_xtixml.obj: ..\..\src\common\xtixml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xtixml.cpp
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_app.obj: ..\..\src\msw\app.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\app.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_app.obj: ..\..\src\msw\app.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\app.cpp
@@ -8696,349 +9618,99 @@ $(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_statusbr.obj: ..\..\src\generic\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_statusbr.obj: ..\..\src\univ\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp
-!endif
-
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_accel.obj: ..\..\src\msw\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\accel.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_accel.obj: ..\..\src\generic\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\accel.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_accesscmn.obj: ..\..\src\common\accesscmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accesscmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_anidecod.obj: ..\..\src\common\anidecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\anidecod.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appcmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_button.obj: ..\..\src\msw\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\button.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_artprov.obj: ..\..\src\common\artprov.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artprov.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_button.obj: ..\..\src\univ\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\button.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_artstd.obj: ..\..\src\common\artstd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artstd.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_checkbox.obj: ..\..\src\msw\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_checkbox.obj: ..\..\src\univ\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_choice.obj: ..\..\src\msw\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\choice.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_btncmn.obj: ..\..\src\common\btncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\btncmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_choice.obj: ..\..\src\univ\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\choice.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_combobox.obj: ..\..\src\msw\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combobox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_combobox.obj: ..\..\src\univ\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\combobox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clipcmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_control.obj: ..\..\src\msw\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\control.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_control.obj: ..\..\src\univ\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\control.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_dialog.obj: ..\..\src\msw\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialog.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\combocmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_dialog.obj: ..\..\src\univ\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmdproc.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_listbox.obj: ..\..\src\msw\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_cmndata.obj: ..\..\src\common\cmndata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmndata.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_listbox.obj: ..\..\src\univ\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\listbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_listctrl.obj: ..\..\src\msw\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_listctrl.obj: ..\..\src\generic\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_menu.obj: ..\..\src\msw\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menu.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_menu.obj: ..\..\src\univ\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\menu.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_notebook.obj: ..\..\src\msw\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notebook.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_notebook.obj: ..\..\src\univ\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\notebook.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_radiobox.obj: ..\..\src\msw\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_radiobox.obj: ..\..\src\univ\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_radiobut.obj: ..\..\src\msw\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_radiobut.obj: ..\..\src\univ\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_statbmp.obj: ..\..\src\msw\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_statbmp.obj: ..\..\src\univ\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_statbox.obj: ..\..\src\msw\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_statbox.obj: ..\..\src\univ\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_statline.obj: ..\..\src\msw\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statline.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_statline.obj: ..\..\src\univ\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statline.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_stattext.obj: ..\..\src\msw\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_stattext.obj: ..\..\src\univ\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_textctrl.obj: ..\..\src\msw\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_textctrl.obj: ..\..\src\univ\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checklst.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_accesscmn.obj: ..\..\src\common\accesscmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accesscmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_anidecod.obj: ..\..\src\common\anidecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\anidecod.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_artprov.obj: ..\..\src\common\artprov.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artprov.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_artstd.obj: ..\..\src\common\artstd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artstd.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_btncmn.obj: ..\..\src\common\btncmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\btncmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clipcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\combocmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmdproc.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_cmndata.obj: ..\..\src\common\cmndata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmndata.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_containr.obj: ..\..\src\common\containr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\containr.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_containr.obj: ..\..\src\common\containr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\containr.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  !endif
  
  !if "$(USE_GUI)" == "1"
@@ -9201,6 +9873,16 @@ $(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\helpbase.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\helpbase.cpp
@@ -9301,6 +9983,11 @@ $(OBJS)\monolib_menucmn.obj: ..\..\src\common\menucmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\menucmn.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\menucmn.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp
@@ -9316,6 +10003,11 @@ $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
@@ -9341,6 +10033,11 @@ $(OBJS)\monolib_radiocmn.obj: ..\..\src\common\radiocmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_rendcmn.obj: ..\..\src\common\rendcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rendcmn.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_rendcmn.obj: ..\..\src\common\rendcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rendcmn.cpp
@@ -9361,6 +10058,11 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp
@@ -9431,6 +10133,11 @@ $(OBJS)\monolib_windowid.obj: ..\..\src\common\windowid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\windowid.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\windowid.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
@@ -9442,7 +10149,7 @@ $(OBJS)\monolib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
+$(OBJS)\monolib_generic_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp
  !endif
  
@@ -9481,6 +10188,11 @@ $(OBJS)\monolib_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
@@ -9541,6 +10253,16 @@ $(OBJS)\monolib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_stattextg.obj: ..\..\src\generic\stattextg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
@@ -9581,6 +10303,16 @@ $(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp
@@ -9602,8 +10334,8 @@ $(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\calctrl.cpp
+$(OBJS)\monolib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  !endif
  
  !if "$(USE_GUI)" == "1"
@@ -9631,6 +10363,11 @@ $(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_grideditors.obj: ..\..\src\generic\grideditors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\grideditors.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\gridsel.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\gridsel.cpp
@@ -9646,6 +10383,11 @@ $(OBJS)\monolib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_infobar.obj: ..\..\src\generic\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
@@ -9692,18 +10434,8 @@ $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  !endif
  
  !if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
+$(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  !endif
  
  !if "$(USE_GUI)" == "1"
@@ -9726,11 +10458,19 @@ $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+!endif
+
  $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
  $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXMAKINGDLL_BASE /d wxUSE_BASE=1 ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXMAKINGDLL_BASE /d wxUSE_BASE=1 ..\..\src\msw\version.rc
+
+$(OBJS)\basedll_any.obj: ..\..\src\common\any.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\any.cpp
  
  $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\appbase.cpp
  
  $(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\appbase.cpp
@@ -9765,6 +10505,9 @@ $(OBJS)\basedll_convauto.obj: ..\..\src\common\convauto.cpp
  $(OBJS)\basedll_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datetime.cpp
  
  $(OBJS)\basedll_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datetime.cpp
  
+$(OBJS)\basedll_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datetimefmt.cpp
+
  $(OBJS)\basedll_datstrm.obj: ..\..\src\common\datstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datstrm.cpp
  
  $(OBJS)\basedll_datstrm.obj: ..\..\src\common\datstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datstrm.cpp
  
@@ -9882,6 +10625,9 @@ $(OBJS)\basedll_stdpbase.obj: ..\..\src\common\stdpbase.cpp
  $(OBJS)\basedll_sstream.obj: ..\..\src\common\sstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\sstream.cpp
  
  $(OBJS)\basedll_sstream.obj: ..\..\src\common\sstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\sstream.cpp
  
+$(OBJS)\basedll_stdstream.obj: ..\..\src\common\stdstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
  $(OBJS)\basedll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp
  
  $(OBJS)\basedll_stopwatch.obj: ..\..\src\common\stopwatch.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp
  
@@ -9933,6 +10679,9 @@ $(OBJS)\basedll_unichar.obj: ..\..\src\common\unichar.cpp
  $(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\uri.cpp
  
  $(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\uri.cpp
  
+$(OBJS)\basedll_ustring.obj: ..\..\src\common\ustring.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ustring.cpp
+
  $(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\variant.cpp
  
  $(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\variant.cpp
  
@@ -9960,6 +10709,12 @@ $(OBJS)\basedll_zipstrm.obj: ..\..\src\common\zipstrm.cpp
  $(OBJS)\basedll_zstream.obj: ..\..\src\common\zstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\zstream.cpp
  
  $(OBJS)\basedll_zstream.obj: ..\..\src\common\zstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\zstream.cpp
  
+$(OBJS)\basedll_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp
+
+$(OBJS)\basedll_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp
+
  $(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp
  
  $(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp
  
@@ -10011,6 +10766,9 @@ $(OBJS)\basedll_utils.obj: ..\..\src\msw\utils.cpp
  $(OBJS)\basedll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
  
  $(OBJS)\basedll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
  
+$(OBJS)\basedll_fswatcher.obj: ..\..\src\msw\fswatcher.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\fswatcher.cpp
+
  $(OBJS)\basedll_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\event.cpp
  
  $(OBJS)\basedll_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\event.cpp
  
@@ -10038,6 +10796,9 @@ $(OBJS)\basedll_volume.obj: ..\..\src\msw\volume.cpp
  $(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
+$(OBJS)\baselib_any.obj: ..\..\src\common\any.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\any.cpp
+
  $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\appbase.cpp
  
  $(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\appbase.cpp
  
@@ -10071,6 +10832,9 @@ $(OBJS)\baselib_convauto.obj: ..\..\src\common\convauto.cpp
  $(OBJS)\baselib_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datetime.cpp
  
  $(OBJS)\baselib_datetime.obj: ..\..\src\common\datetime.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datetime.cpp
  
+$(OBJS)\baselib_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datetimefmt.cpp
+
  $(OBJS)\baselib_datstrm.obj: ..\..\src\common\datstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datstrm.cpp
  
  $(OBJS)\baselib_datstrm.obj: ..\..\src\common\datstrm.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datstrm.cpp
  
@@ -10188,6 +10952,9 @@ $(OBJS)\baselib_stdpbase.obj: ..\..\src\common\stdpbase.cpp
  $(OBJS)\baselib_sstream.obj: ..\..\src\common\sstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\sstream.cpp
  
  $(OBJS)\baselib_sstream.obj: ..\..\src\common\sstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\sstream.cpp
  
+$(OBJS)\baselib_stdstream.obj: ..\..\src\common\stdstream.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stdstream.cpp
+
  $(OBJS)\baselib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp
  
  $(OBJS)\baselib_stopwatch.obj: ..\..\src\common\stopwatch.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp
  
@@ -10239,6 +11006,9 @@ $(OBJS)\baselib_unichar.obj: ..\..\src\common\unichar.cpp
  $(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\uri.cpp
  
  $(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\uri.cpp
  
+$(OBJS)\baselib_ustring.obj: ..\..\src\common\ustring.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ustring.cpp
+
  $(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\variant.cpp
  
  $(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\variant.cpp
  
@@ -10266,6 +11036,12 @@ $(OBJS)\baselib_zipstrm.obj: ..\..\src\common\zipstrm.cpp
  $(OBJS)\baselib_zstream.obj: ..\..\src\common\zstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\zstream.cpp
  
  $(OBJS)\baselib_zstream.obj: ..\..\src\common\zstream.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\zstream.cpp
  
+$(OBJS)\baselib_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp
+
+$(OBJS)\baselib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp
+
  $(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
  
  $(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp
  
@@ -10317,6 +11093,9 @@ $(OBJS)\baselib_utils.obj: ..\..\src\msw\utils.cpp
  $(OBJS)\baselib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
  
  $(OBJS)\baselib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp
  
+$(OBJS)\baselib_fswatcher.obj: ..\..\src\msw\fswatcher.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\fswatcher.cpp
+
  $(OBJS)\baselib_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\event.cpp
  
  $(OBJS)\baselib_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\event.cpp
  
@@ -10345,7 +11124,7 @@ $(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_NET ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_NET ..\..\src\msw\version.rc
  
  $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp
  
  $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp
@@ -10377,11 +11156,8 @@ $(OBJS)\netdll_socket.obj: ..\..\src\common\socket.cpp
  $(OBJS)\netdll_url.obj: ..\..\src\common\url.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\url.cpp
  
  $(OBJS)\netdll_url.obj: ..\..\src\common\url.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\url.cpp
  
-$(OBJS)\netdll_gsocket.obj: ..\..\src\msw\gsocket.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\gsocket.cpp
-
-$(OBJS)\netdll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\gsockmsw.cpp
+$(OBJS)\netdll_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\sockmsw.cpp
  
  $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
  
  $(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
@@ -10419,11 +11195,8 @@ $(OBJS)\netlib_socket.obj: ..\..\src\common\socket.cpp
  $(OBJS)\netlib_url.obj: ..\..\src\common\url.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\url.cpp
  
  $(OBJS)\netlib_url.obj: ..\..\src\common\url.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\url.cpp
  
-$(OBJS)\netlib_gsocket.obj: ..\..\src\msw\gsocket.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\gsocket.cpp
-
-$(OBJS)\netlib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\gsockmsw.cpp
+$(OBJS)\netlib_sockmsw.obj: ..\..\src\msw\sockmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\sockmsw.cpp
  
  $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
  
  $(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp
@@ -10432,7 +11205,7 @@ $(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_CORE /d wxUSE_BASE=0 ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_CORE /d wxUSE_BASE=0 ..\..\src\msw\version.rc
  
  $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\event.cpp
  
  $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\event.cpp
@@ -10458,12 +11231,42 @@ $(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp
  $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\volume.cpp
  
  $(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\volume.cpp
  
+$(OBJS)\coredll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+
+$(OBJS)\coredll_msw_accel.obj: ..\..\src\msw\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\accel.cpp
+
+$(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp
+
+$(OBJS)\coredll_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+
+$(OBJS)\coredll_msw_button.obj: ..\..\src\msw\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\button.cpp
+
+$(OBJS)\coredll_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+
+$(OBJS)\coredll_msw_choice.obj: ..\..\src\msw\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\choice.cpp
+
  $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp
  
  $(OBJS)\coredll_combo.obj: ..\..\src\msw\combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combo.cpp
  
  $(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp
  
  $(OBJS)\coredll_combo.obj: ..\..\src\msw\combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combo.cpp
  
+$(OBJS)\coredll_msw_combobox.obj: ..\..\src\msw\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combobox.cpp
+
+$(OBJS)\coredll_msw_control.obj: ..\..\src\msw\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\control.cpp
+
+$(OBJS)\coredll_msw_dialog.obj: ..\..\src\msw\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialog.cpp
+
  $(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
  
  $(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
  
@@ -10476,15 +11279,27 @@ $(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp
  $(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\frame.cpp
  
  $(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\frame.cpp
  
-$(OBJS)\coredll_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge95.cpp
+$(OBJS)\coredll_msw_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge.cpp
+
+$(OBJS)\coredll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
  
  $(OBJS)\coredll_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
  
  $(OBJS)\coredll_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
+$(OBJS)\coredll_msw_listbox.obj: ..\..\src\msw\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
+
+$(OBJS)\coredll_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+
  $(OBJS)\coredll_mdi.obj: ..\..\src\msw\mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\mdi.cpp
  
  $(OBJS)\coredll_mdi.obj: ..\..\src\msw\mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\mdi.cpp
  
+$(OBJS)\coredll_msw_menu.obj: ..\..\src\msw\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menu.cpp
+
  $(OBJS)\coredll_menuitem.obj: ..\..\src\msw\menuitem.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp
  
  $(OBJS)\coredll_menuitem.obj: ..\..\src\msw\menuitem.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp
  
@@ -10500,67 +11315,130 @@ $(OBJS)\coredll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
  $(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
  
  $(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
  
+$(OBJS)\coredll_msw_notebook.obj: ..\..\src\msw\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\notebook.cpp
+
  $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
  
  $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
  $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp
  
  $(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
-$(OBJS)\coredll_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider95.cpp
+$(OBJS)\coredll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+
+$(OBJS)\coredll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+
+$(OBJS)\coredll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+
+$(OBJS)\coredll_msw_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider.cpp
+
+$(OBJS)\coredll_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
  
  $(OBJS)\coredll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
  
  $(OBJS)\coredll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
-$(OBJS)\coredll_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\coredll_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+
+$(OBJS)\coredll_msw_statbox.obj: ..\..\src\msw\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbox.cpp
+
+$(OBJS)\coredll_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp
+
+$(OBJS)\coredll_msw_statline.obj: ..\..\src\msw\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statline.cpp
+
+$(OBJS)\coredll_msw_stattext.obj: ..\..\src\msw\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
  
  
-$(OBJS)\coredll_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
+$(OBJS)\coredll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp
  
  
-$(OBJS)\coredll_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tbar95.cpp
+$(OBJS)\coredll_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
  
  $(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
  
  $(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
+$(OBJS)\coredll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+
  $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp
  
  $(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp
  
+$(OBJS)\coredll_msw_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
+
+$(OBJS)\coredll_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+
  $(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
  
  $(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
  
+$(OBJS)\coredll_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\accel.cpp
+
  $(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
  
  $(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
  
  $(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
  
  $(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
  
+$(OBJS)\coredll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+
  $(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
  
  $(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
  
  $(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
  
  $(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
  
+$(OBJS)\coredll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+
  $(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\mdig.cpp
  
  $(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
  
  $(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\mdig.cpp
  
  $(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
  
-$(OBJS)\coredll_tabg.obj: ..\..\src\generic\tabg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\tabg.cpp
+$(OBJS)\coredll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+
+$(OBJS)\coredll_univ_button.obj: ..\..\src\univ\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\button.cpp
+
+$(OBJS)\coredll_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+
+$(OBJS)\coredll_univ_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checklst.cpp
+
+$(OBJS)\coredll_univ_choice.obj: ..\..\src\univ\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\choice.cpp
+
+$(OBJS)\coredll_univ_combobox.obj: ..\..\src\univ\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\combobox.cpp
  
  
-$(OBJS)\coredll_colschem.obj: ..\..\src\univ\colschem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\colschem.cpp
+$(OBJS)\coredll_univ_control.obj: ..\..\src\univ\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\control.cpp
  
  $(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
  
  
  $(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
  
+$(OBJS)\coredll_univ_dialog.obj: ..\..\src\univ\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
+
  $(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
  $(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
-$(OBJS)\coredll_gauge.obj: ..\..\src\univ\gauge.cpp
+$(OBJS)\coredll_univ_gauge.obj: ..\..\src\univ\gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
  
  $(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp
  
  $(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp
@@ -10569,22 +11447,67 @@ $(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp
  $(OBJS)\coredll_inphand.obj: ..\..\src\univ\inphand.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inphand.cpp
  
  $(OBJS)\coredll_inphand.obj: ..\..\src\univ\inphand.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inphand.cpp
  
+$(OBJS)\coredll_univ_listbox.obj: ..\..\src\univ\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\listbox.cpp
+
+$(OBJS)\coredll_univ_menu.obj: ..\..\src\univ\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\menu.cpp
+
+$(OBJS)\coredll_univ_notebook.obj: ..\..\src\univ\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\notebook.cpp
+
+$(OBJS)\coredll_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+
+$(OBJS)\coredll_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+
  $(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
  
  $(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
  
+$(OBJS)\coredll_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+
  $(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
  $(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
-$(OBJS)\coredll_slider.obj: ..\..\src\univ\slider.cpp
+$(OBJS)\coredll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
+
+$(OBJS)\coredll_univ_slider.obj: ..\..\src\univ\slider.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp
  
+$(OBJS)\coredll_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+
+$(OBJS)\coredll_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+
+$(OBJS)\coredll_univ_statbox.obj: ..\..\src\univ\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbox.cpp
+
+$(OBJS)\coredll_univ_statline.obj: ..\..\src\univ\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statline.cpp
+
+$(OBJS)\coredll_univ_stattext.obj: ..\..\src\univ\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
+
+$(OBJS)\coredll_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp
+
  $(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
  $(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
+$(OBJS)\coredll_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+
+$(OBJS)\coredll_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+
  $(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\theme.cpp
  
  $(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\theme.cpp
  
-$(OBJS)\coredll_toolbar.obj: ..\..\src\univ\toolbar.cpp
+$(OBJS)\coredll_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
  
  $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp
  
  $(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp
@@ -10605,6 +11528,11 @@ $(OBJS)\coredll_mono.obj: ..\..\src\univ\themes\mono.cpp
  $(OBJS)\coredll_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
  
  $(OBJS)\coredll_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_app.obj: ..\..\src\msw\app.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\app.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_app.obj: ..\..\src\msw\app.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\app.cpp
@@ -10865,374 +11793,124 @@ $(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_statusbr.obj: ..\..\src\generic\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_statusbr.obj: ..\..\src\univ\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp
-!endif
-
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_accel.obj: ..\..\src\msw\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\accel.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_accel.obj: ..\..\src\generic\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\accel.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_anidecod.obj: ..\..\src\common\anidecod.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\anidecod.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_appcmn.obj: ..\..\src\common\appcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\appcmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_button.obj: ..\..\src\msw\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\button.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_artprov.obj: ..\..\src\common\artprov.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artprov.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_button.obj: ..\..\src\univ\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\button.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_artstd.obj: ..\..\src\common\artstd.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artstd.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_checkbox.obj: ..\..\src\msw\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_checkbox.obj: ..\..\src\univ\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_choice.obj: ..\..\src\msw\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\choice.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_btncmn.obj: ..\..\src\common\btncmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\btncmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_choice.obj: ..\..\src\univ\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\choice.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_combobox.obj: ..\..\src\msw\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combobox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_combobox.obj: ..\..\src\univ\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\combobox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_control.obj: ..\..\src\msw\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\control.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_control.obj: ..\..\src\univ\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\control.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_dialog.obj: ..\..\src\msw\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialog.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\combocmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_dialog.obj: ..\..\src\univ\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\dialog.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cmdproc.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_listbox.obj: ..\..\src\msw\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_cmndata.obj: ..\..\src\common\cmndata.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cmndata.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_listbox.obj: ..\..\src\univ\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\listbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_containr.obj: ..\..\src\common\containr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\containr.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_listctrl.obj: ..\..\src\msw\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_cshelp.obj: ..\..\src\common\cshelp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cshelp.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_listctrl.obj: ..\..\src\generic\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_menu.obj: ..\..\src\msw\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menu.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_menu.obj: ..\..\src\univ\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\menu.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_datacmn.obj: ..\..\src\common\datacmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\datacmn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_notebook.obj: ..\..\src\msw\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\notebook.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_notebook.obj: ..\..\src\univ\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\notebook.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_radiobox.obj: ..\..\src\msw\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_radiobox.obj: ..\..\src\univ\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_radiobut.obj: ..\..\src\msw\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_radiobut.obj: ..\..\src\univ\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_statbmp.obj: ..\..\src\msw\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_statbmp.obj: ..\..\src\univ\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_statbox.obj: ..\..\src\msw\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_statbox.obj: ..\..\src\univ\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_statline.obj: ..\..\src\msw\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statline.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_statline.obj: ..\..\src\univ\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statline.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_stattext.obj: ..\..\src\msw\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\stattext.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_stattext.obj: ..\..\src\univ\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stattext.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_textctrl.obj: ..\..\src\msw\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_textctrl.obj: ..\..\src\univ\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checklst.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checklst.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\coredll_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_accesscmn.obj: ..\..\src\common\accesscmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_anidecod.obj: ..\..\src\common\anidecod.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\anidecod.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_appcmn.obj: ..\..\src\common\appcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\appcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_artprov.obj: ..\..\src\common\artprov.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artprov.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_artstd.obj: ..\..\src\common\artstd.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artstd.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_btncmn.obj: ..\..\src\common\btncmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\btncmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\combocmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cmdproc.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_cmndata.obj: ..\..\src\common\cmndata.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cmndata.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_containr.obj: ..\..\src\common\containr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\containr.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_cshelp.obj: ..\..\src\common\cshelp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cshelp.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_datacmn.obj: ..\..\src\common\datacmn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\datacmn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_dcbase.obj: ..\..\src\common\dcbase.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbase.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_dcbase.obj: ..\..\src\common\dcbase.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbase.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  !endif
  
  !if "$(USE_GUI)" == "1"
@@ -11370,6 +12048,16 @@ $(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\helpbase.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\helpbase.cpp
@@ -11470,6 +12158,11 @@ $(OBJS)\coredll_menucmn.obj: ..\..\src\common\menucmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\menucmn.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\menucmn.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp
@@ -11485,6 +12178,11 @@ $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
@@ -11510,6 +12208,11 @@ $(OBJS)\coredll_radiocmn.obj: ..\..\src\common\radiocmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_rendcmn.obj: ..\..\src\common\rendcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rendcmn.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_rendcmn.obj: ..\..\src\common\rendcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rendcmn.cpp
@@ -11530,6 +12233,11 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp
@@ -11600,6 +12308,11 @@ $(OBJS)\coredll_windowid.obj: ..\..\src\common\windowid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\windowid.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\windowid.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
@@ -11650,6 +12363,11 @@ $(OBJS)\coredll_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
@@ -11710,6 +12428,16 @@ $(OBJS)\coredll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_stattextg.obj: ..\..\src\generic\stattextg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
@@ -11772,12 +12500,42 @@ $(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp
  $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\volume.cpp
  
  $(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\volume.cpp
  
+$(OBJS)\corelib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
+
+$(OBJS)\corelib_msw_accel.obj: ..\..\src\msw\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\accel.cpp
+
+$(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp
+
+$(OBJS)\corelib_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
+
+$(OBJS)\corelib_msw_button.obj: ..\..\src\msw\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\button.cpp
+
+$(OBJS)\corelib_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp
+
+$(OBJS)\corelib_msw_choice.obj: ..\..\src\msw\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\choice.cpp
+
  $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp
  
  $(OBJS)\corelib_combo.obj: ..\..\src\msw\combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combo.cpp
  
  $(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp
  
  $(OBJS)\corelib_combo.obj: ..\..\src\msw\combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combo.cpp
  
+$(OBJS)\corelib_msw_combobox.obj: ..\..\src\msw\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combobox.cpp
+
+$(OBJS)\corelib_msw_control.obj: ..\..\src\msw\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\control.cpp
+
+$(OBJS)\corelib_msw_dialog.obj: ..\..\src\msw\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialog.cpp
+
  $(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
  
  $(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp
  
@@ -11790,15 +12548,27 @@ $(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp
  $(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\frame.cpp
  
  $(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\frame.cpp
  
-$(OBJS)\corelib_gauge95.obj: ..\..\src\msw\gauge95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge95.cpp
+$(OBJS)\corelib_msw_gauge.obj: ..\..\src\msw\gauge.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge.cpp
+
+$(OBJS)\corelib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp
  
  $(OBJS)\corelib_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
  
  $(OBJS)\corelib_iniconf.obj: ..\..\src\msw\iniconf.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp
  
+$(OBJS)\corelib_msw_listbox.obj: ..\..\src\msw\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
+
+$(OBJS)\corelib_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp
+
  $(OBJS)\corelib_mdi.obj: ..\..\src\msw\mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\mdi.cpp
  
  $(OBJS)\corelib_mdi.obj: ..\..\src\msw\mdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\mdi.cpp
  
+$(OBJS)\corelib_msw_menu.obj: ..\..\src\msw\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menu.cpp
+
  $(OBJS)\corelib_menuitem.obj: ..\..\src\msw\menuitem.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp
  
  $(OBJS)\corelib_menuitem.obj: ..\..\src\msw\menuitem.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp
  
@@ -11814,67 +12584,130 @@ $(OBJS)\corelib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
  $(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
  
  $(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
  
+$(OBJS)\corelib_msw_notebook.obj: ..\..\src\msw\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\notebook.cpp
+
  $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
  
  $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
  $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp
  
  $(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
  
-$(OBJS)\corelib_slider95.obj: ..\..\src\msw\slider95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider95.cpp
+$(OBJS)\corelib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+
+$(OBJS)\corelib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+
+$(OBJS)\corelib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+
+$(OBJS)\corelib_msw_slider.obj: ..\..\src\msw\slider.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider.cpp
+
+$(OBJS)\corelib_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
  
  $(OBJS)\corelib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
  
  $(OBJS)\corelib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp
  
-$(OBJS)\corelib_statbr95.obj: ..\..\src\msw\statbr95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbr95.cpp
+$(OBJS)\corelib_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+
+$(OBJS)\corelib_msw_statbox.obj: ..\..\src\msw\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbox.cpp
+
+$(OBJS)\corelib_statusbar.obj: ..\..\src\msw\statusbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp
+
+$(OBJS)\corelib_msw_statline.obj: ..\..\src\msw\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statline.cpp
+
+$(OBJS)\corelib_msw_stattext.obj: ..\..\src\msw\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
  
  
-$(OBJS)\corelib_tabctrl.obj: ..\..\src\msw\tabctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tabctrl.cpp
+$(OBJS)\corelib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp
  
  
-$(OBJS)\corelib_tbar95.obj: ..\..\src\msw\tbar95.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tbar95.cpp
+$(OBJS)\corelib_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
  
  $(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
  
  $(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textentry.cpp
  
+$(OBJS)\corelib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+
  $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp
  
  $(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp
  
+$(OBJS)\corelib_msw_checklst.obj: ..\..\src\msw\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
+
+$(OBJS)\corelib_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+
  $(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
  
  $(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp
  
+$(OBJS)\corelib_generic_accel.obj: ..\..\src\generic\accel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\accel.cpp
+
  $(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
  
  $(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
  
  $(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp
  
  $(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp
  
+$(OBJS)\corelib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+
  $(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
  
  $(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
  
  $(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp
  
  $(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp
  
+$(OBJS)\corelib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
+
  $(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\mdig.cpp
  
  $(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
  
  $(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\mdig.cpp
  
  $(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp
  
-$(OBJS)\corelib_tabg.obj: ..\..\src\generic\tabg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\tabg.cpp
+$(OBJS)\corelib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
+
+$(OBJS)\corelib_univ_button.obj: ..\..\src\univ\button.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\button.cpp
+
+$(OBJS)\corelib_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp
+
+$(OBJS)\corelib_univ_checklst.obj: ..\..\src\univ\checklst.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checklst.cpp
+
+$(OBJS)\corelib_univ_choice.obj: ..\..\src\univ\choice.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\choice.cpp
+
+$(OBJS)\corelib_univ_combobox.obj: ..\..\src\univ\combobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\combobox.cpp
  
  
-$(OBJS)\corelib_colschem.obj: ..\..\src\univ\colschem.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\colschem.cpp
+$(OBJS)\corelib_univ_control.obj: ..\..\src\univ\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\control.cpp
  
  $(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
  
  
  $(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp
  
+$(OBJS)\corelib_univ_dialog.obj: ..\..\src\univ\dialog.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
+
  $(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
  $(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp
  
-$(OBJS)\corelib_gauge.obj: ..\..\src\univ\gauge.cpp
+$(OBJS)\corelib_univ_gauge.obj: ..\..\src\univ\gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
  
  $(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp
  
  $(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp
@@ -11883,22 +12716,67 @@ $(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp
  $(OBJS)\corelib_inphand.obj: ..\..\src\univ\inphand.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inphand.cpp
  
  $(OBJS)\corelib_inphand.obj: ..\..\src\univ\inphand.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inphand.cpp
  
+$(OBJS)\corelib_univ_listbox.obj: ..\..\src\univ\listbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\listbox.cpp
+
+$(OBJS)\corelib_univ_menu.obj: ..\..\src\univ\menu.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\menu.cpp
+
+$(OBJS)\corelib_univ_notebook.obj: ..\..\src\univ\notebook.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\notebook.cpp
+
+$(OBJS)\corelib_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+
+$(OBJS)\corelib_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+
  $(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
  
  $(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp
  
+$(OBJS)\corelib_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+
  $(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
  $(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp
  
-$(OBJS)\corelib_slider.obj: ..\..\src\univ\slider.cpp
+$(OBJS)\corelib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp
+
+$(OBJS)\corelib_univ_slider.obj: ..\..\src\univ\slider.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp
  
+$(OBJS)\corelib_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+
+$(OBJS)\corelib_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+
+$(OBJS)\corelib_univ_statbox.obj: ..\..\src\univ\statbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbox.cpp
+
+$(OBJS)\corelib_univ_statline.obj: ..\..\src\univ\statline.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statline.cpp
+
+$(OBJS)\corelib_univ_stattext.obj: ..\..\src\univ\stattext.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
+
+$(OBJS)\corelib_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp
+
  $(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
  $(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp
  
+$(OBJS)\corelib_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+
+$(OBJS)\corelib_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+
  $(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\theme.cpp
  
  $(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\theme.cpp
  
-$(OBJS)\corelib_toolbar.obj: ..\..\src\univ\toolbar.cpp
+$(OBJS)\corelib_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
  
  $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp
  
  $(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp
@@ -11919,6 +12797,11 @@ $(OBJS)\corelib_mono.obj: ..\..\src\univ\themes\mono.cpp
  $(OBJS)\corelib_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
  
  $(OBJS)\corelib_win32.obj: ..\..\src\univ\themes\win32.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_activex.obj: ..\..\src\msw\ole\activex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_app.obj: ..\..\src\msw\app.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\app.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_app.obj: ..\..\src\msw\app.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\app.cpp
@@ -12064,374 +12947,124 @@ $(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp
  !endif
  
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_palette.obj: ..\..\src\msw\palette.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\palette.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_pen.obj: ..\..\src\msw\pen.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\pen.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_popupwin.obj: ..\..\src\msw\popupwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\popupwin.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_printdlg.obj: ..\..\src\msw\printdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printdlg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_printwin.obj: ..\..\src\msw\printwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printwin.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_region.obj: ..\..\src\msw\region.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\region.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_renderer.obj: ..\..\src\msw\renderer.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\renderer.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\settings.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_toplevel.obj: ..\..\src\msw\toplevel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_window.obj: ..\..\src\msw\window.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\window.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\helpchm.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\helpwin.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_statusbr.obj: ..\..\src\generic\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_statusbr.obj: ..\..\src\univ\statusbr.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_accel.obj: ..\..\src\msw\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\accel.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_accel.obj: ..\..\src\generic\accel.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\accel.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_button.obj: ..\..\src\msw\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\button.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_button.obj: ..\..\src\univ\button.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\button.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_checkbox.obj: ..\..\src\msw\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_checkbox.obj: ..\..\src\univ\checkbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_choice.obj: ..\..\src\msw\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\choice.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_choice.obj: ..\..\src\univ\choice.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\choice.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_combobox.obj: ..\..\src\msw\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_combobox.obj: ..\..\src\univ\combobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\combobox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_control.obj: ..\..\src\msw\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\control.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_control.obj: ..\..\src\univ\control.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\control.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_dialog.obj: ..\..\src\msw\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialog.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_dialog.obj: ..\..\src\univ\dialog.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\dialog.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_listbox.obj: ..\..\src\msw\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_listbox.obj: ..\..\src\univ\listbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\listbox.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_listctrl.obj: ..\..\src\msw\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_listctrl.obj: ..\..\src\generic\listctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_menu.obj: ..\..\src\msw\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menu.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_menu.obj: ..\..\src\univ\menu.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\menu.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_notebook.obj: ..\..\src\msw\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\notebook.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_notebook.obj: ..\..\src\univ\notebook.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\notebook.cpp
-!endif
-
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_radiobox.obj: ..\..\src\msw\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_radiobox.obj: ..\..\src\univ\radiobox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_radiobut.obj: ..\..\src\msw\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_palette.obj: ..\..\src\msw\palette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\palette.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_radiobut.obj: ..\..\src\univ\radiobut.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_pen.obj: ..\..\src\msw\pen.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\pen.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_scrolbar.obj: ..\..\src\msw\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_popupwin.obj: ..\..\src\msw\popupwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\popupwin.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_scrolbar.obj: ..\..\src\univ\scrolbar.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_printdlg.obj: ..\..\src\msw\printdlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printdlg.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_spinbutt.obj: ..\..\src\msw\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_printwin.obj: ..\..\src\msw\printwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printwin.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_spinbutt.obj: ..\..\src\univ\spinbutt.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_region.obj: ..\..\src\msw\region.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\region.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_statbmp.obj: ..\..\src\msw\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_renderer.obj: ..\..\src\msw\renderer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\renderer.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_statbmp.obj: ..\..\src\univ\statbmp.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\settings.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_statbox.obj: ..\..\src\msw\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_statbox.obj: ..\..\src\univ\statbox.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbox.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_toplevel.obj: ..\..\src\msw\toplevel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_statline.obj: ..\..\src\msw\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statline.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_statline.obj: ..\..\src\univ\statline.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statline.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_stattext.obj: ..\..\src\msw\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\stattext.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_window.obj: ..\..\src\msw\window.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\window.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_stattext.obj: ..\..\src\univ\stattext.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stattext.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\helpchm.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_textctrl.obj: ..\..\src\msw\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\helpwin.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_textctrl.obj: ..\..\src\univ\textctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_tglbtn.obj: ..\..\src\msw\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_tglbtn.obj: ..\..\src\univ\tglbtn.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_checklst.obj: ..\..\src\msw\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checklst.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_checklst.obj: ..\..\src\univ\checklst.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checklst.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0"
-$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp
  !endif
  
  !endif
  
-!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1"
-$(OBJS)\corelib_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp
  !endif
  
  !if "$(USE_GUI)" == "1"
  !endif
  
  !if "$(USE_GUI)" == "1"
@@ -12684,6 +13317,16 @@ $(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\helpbase.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_helpbase.obj: ..\..\src\common\helpbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\helpbase.cpp
@@ -12784,6 +13427,11 @@ $(OBJS)\corelib_menucmn.obj: ..\..\src\common\menucmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\menucmn.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\menucmn.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_mousemanager.obj: ..\..\src\common\mousemanager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp
@@ -12799,6 +13447,11 @@ $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
@@ -12824,6 +13477,11 @@ $(OBJS)\corelib_radiocmn.obj: ..\..\src\common\radiocmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_rendcmn.obj: ..\..\src\common\rendcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rendcmn.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_rendcmn.obj: ..\..\src\common\rendcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rendcmn.cpp
@@ -12844,6 +13502,11 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp
@@ -12914,6 +13577,11 @@ $(OBJS)\corelib_windowid.obj: ..\..\src\common\windowid.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\windowid.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\windowid.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp
@@ -12964,6 +13632,11 @@ $(OBJS)\corelib_filectrlg.obj: ..\..\src\generic\filectrlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filectrlg.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
@@ -13024,6 +13697,16 @@ $(OBJS)\corelib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
  !endif
  
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\srchctlg.cpp
  !endif
  
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_statbmpg.obj: ..\..\src\generic\statbmpg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statbmpg.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_stattextg.obj: ..\..\src\generic\stattextg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp
+!endif
+
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
  !if "$(USE_GUI)" == "1"
  $(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp
@@ -13063,7 +13746,16 @@ $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_ADV ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_ADV ..\..\src\msw\version.rc
+
+$(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+
+$(OBJS)\advdll_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+
+$(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
  
  $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
  
  $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
@@ -13071,6 +13763,12 @@ $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
  $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
  
  $(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
  
+$(OBJS)\advdll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+
+$(OBJS)\advdll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
+
  $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp
  
  $(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp
  
@@ -13083,8 +13781,8 @@ $(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
  $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
  
  $(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
  
-$(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\calctrl.cpp
+$(OBJS)\advdll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
  
  $(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp
  
  $(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp
@@ -13101,6 +13799,9 @@ $(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp
  $(OBJS)\advdll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
  
  $(OBJS)\advdll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
  
+$(OBJS)\advdll_grideditors.obj: ..\..\src\generic\grideditors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\grideditors.cpp
+
  $(OBJS)\advdll_gridsel.obj: ..\..\src\generic\gridsel.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\gridsel.cpp
  
  $(OBJS)\advdll_gridsel.obj: ..\..\src\generic\gridsel.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\gridsel.cpp
  
@@ -13110,6 +13811,9 @@ $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp
  $(OBJS)\advdll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
  
  $(OBJS)\advdll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
  
+$(OBJS)\advdll_infobar.obj: ..\..\src\generic\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
+
  $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
  
  $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
  
@@ -13137,14 +13841,6 @@ $(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp
  $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
  
  $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
  
-$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-
-!if "$(WXUNIV)" == "1"
-$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
  $(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
  
  $(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
  
@@ -13160,15 +13856,33 @@ $(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp
  $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
  
  $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp
  
+$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp
+
  $(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
+$(OBJS)\advlib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp
+
+$(OBJS)\advlib_calctrl.obj: ..\..\src\msw\calctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+
+$(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
+
  $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
  
  $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
  
  $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
  
  $(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
  
+$(OBJS)\advlib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp
+
+$(OBJS)\advlib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp
+
  $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp
  
  $(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp
  
@@ -13181,8 +13895,8 @@ $(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp
  $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
  
  $(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp
  
-$(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\calctrl.cpp
+$(OBJS)\advlib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp
  
  $(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp
  
  $(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp
@@ -13199,6 +13913,9 @@ $(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp
  $(OBJS)\advlib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
  
  $(OBJS)\advlib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\gridctrl.cpp
  
+$(OBJS)\advlib_grideditors.obj: ..\..\src\generic\grideditors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\grideditors.cpp
+
  $(OBJS)\advlib_gridsel.obj: ..\..\src\generic\gridsel.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\gridsel.cpp
  
  $(OBJS)\advlib_gridsel.obj: ..\..\src\generic\gridsel.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\gridsel.cpp
  
@@ -13208,6 +13925,9 @@ $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp
  $(OBJS)\advlib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
  
  $(OBJS)\advlib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
  
+$(OBJS)\advlib_infobar.obj: ..\..\src\generic\infobar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
+
  $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
  
  $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
  
@@ -13235,14 +13955,6 @@ $(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp
  $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
  
  $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp
  
-$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-
-!if "$(WXUNIV)" == "1"
-$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
-!endif
-
  $(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
  
  $(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
  
@@ -13258,11 +13970,14 @@ $(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp
  $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
  
  $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp
  
+$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp
+
  $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
  $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_MEDIA ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_MEDIA ..\..\src\msw\version.rc
  
  $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
  
  $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
@@ -13276,9 +13991,6 @@ $(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
  $(OBJS)\mediadll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
  
  $(OBJS)\mediadll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
  
-$(OBJS)\mediadll_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
  $(OBJS)\medialib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\medialib_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
@@ -13294,14 +14006,11 @@ $(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp
  $(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
  
  $(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp
  
-$(OBJS)\medialib_activex.obj: ..\..\src\msw\ole\activex.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp
-
  $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
  $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_HTML ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_HTML ..\..\src\msw\version.rc
  
  $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp
  
  $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp
@@ -13454,7 +14163,7 @@ $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_QA ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_QA ..\..\src\msw\version.rc
  
  $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp
  
  $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp
@@ -13475,7 +14184,7 @@ $(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_XML ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_XML ..\..\src\msw\version.rc
  
  $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\xml\xml.cpp
  
  $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\xml\xml.cpp
@@ -13496,7 +14205,7 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_XRC ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_XRC ..\..\src\msw\version.rc
  
  $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
  
  $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp
@@ -13537,6 +14246,9 @@ $(OBJS)\xrcdll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
  $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
  
  $(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
  
+$(OBJS)\xrcdll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+
  $(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
  
  $(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
  
@@ -13546,11 +14258,11 @@ $(OBJS)\xrcdll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
  $(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
  
  $(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
  
-$(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+$(OBJS)\xrcdll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
  
  
-$(OBJS)\xrcdll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+$(OBJS)\xrcdll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
  
  $(OBJS)\xrcdll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
  
  $(OBJS)\xrcdll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
@@ -13558,6 +14270,9 @@ $(OBJS)\xrcdll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
  $(OBJS)\xrcdll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
  
  $(OBJS)\xrcdll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
  
+$(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+
  $(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
  
  $(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
  
@@ -13582,6 +14297,9 @@ $(OBJS)\xrcdll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
  $(OBJS)\xrcdll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
  
  $(OBJS)\xrcdll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
  
+$(OBJS)\xrcdll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+
  $(OBJS)\xrcdll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
  
  $(OBJS)\xrcdll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
  
@@ -13666,6 +14384,9 @@ $(OBJS)\xrcdll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
  $(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
  
  $(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
  
+$(OBJS)\xrcdll_xmladv.obj: ..\..\src\xrc\xmladv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
+
  $(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
  
  $(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
  
@@ -13711,6 +14432,9 @@ $(OBJS)\xrclib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp
  $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
  
  $(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp
  
+$(OBJS)\xrclib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp
+
  $(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
  
  $(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp
  
@@ -13720,11 +14444,11 @@ $(OBJS)\xrclib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp
  $(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
  
  $(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp
  
-$(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+$(OBJS)\xrclib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
  
  
-$(OBJS)\xrclib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+$(OBJS)\xrclib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
  
  $(OBJS)\xrclib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
  
  $(OBJS)\xrclib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
@@ -13732,6 +14456,9 @@ $(OBJS)\xrclib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
  $(OBJS)\xrclib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
  
  $(OBJS)\xrclib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp
  
+$(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp
+
  $(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
  
  $(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp
  
@@ -13756,6 +14483,9 @@ $(OBJS)\xrclib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp
  $(OBJS)\xrclib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
  
  $(OBJS)\xrclib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp
  
+$(OBJS)\xrclib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp
+
  $(OBJS)\xrclib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
  
  $(OBJS)\xrclib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp
  
@@ -13840,6 +14570,9 @@ $(OBJS)\xrclib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp
  $(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
  
  $(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp
  
+$(OBJS)\xrclib_xmladv.obj: ..\..\src\xrc\xmladv.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp
+
  $(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
  
  $(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp
  
@@ -13847,7 +14580,7 @@ $(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\auidll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\auidll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_AUI ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_AUI ..\..\src\msw\version.rc
  
  $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp
  
  $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp
@@ -13861,6 +14594,9 @@ $(OBJS)\auidll_floatpane.obj: ..\..\src\aui\floatpane.cpp
  $(OBJS)\auidll_auibook.obj: ..\..\src\aui\auibook.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibook.cpp
  
  $(OBJS)\auidll_auibook.obj: ..\..\src\aui\auibook.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibook.cpp
  
+$(OBJS)\auidll_auibar.obj: ..\..\src\aui\auibar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibar.cpp
+
  $(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
  
  $(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
  
@@ -13879,14 +14615,143 @@ $(OBJS)\auilib_floatpane.obj: ..\..\src\aui\floatpane.cpp
  $(OBJS)\auilib_auibook.obj: ..\..\src\aui\auibook.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibook.cpp
  
  $(OBJS)\auilib_auibook.obj: ..\..\src\aui\auibook.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibook.cpp
  
+$(OBJS)\auilib_auibar.obj: ..\..\src\aui\auibar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibar.cpp
+
  $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
  
  $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
  
+$(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\ribbondll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RIBBON ..\..\src\msw\version.rc
+
+$(OBJS)\ribbondll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+
+$(OBJS)\ribbondll_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+
+$(OBJS)\ribbondll_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+
+$(OBJS)\ribbondll_bar.obj: ..\..\src\ribbon\bar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+
+$(OBJS)\ribbondll_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+
+$(OBJS)\ribbondll_control.obj: ..\..\src\ribbon\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\control.cpp
+
+$(OBJS)\ribbondll_gallery.obj: ..\..\src\ribbon\gallery.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+
+$(OBJS)\ribbondll_page.obj: ..\..\src\ribbon\page.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\page.cpp
+
+$(OBJS)\ribbondll_panel.obj: ..\..\src\ribbon\panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+
+$(OBJS)\ribbondll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+
+$(OBJS)\ribbonlib_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\ribbonlib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp
+
+$(OBJS)\ribbonlib_art_msw.obj: ..\..\src\ribbon\art_msw.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp
+
+$(OBJS)\ribbonlib_art_aui.obj: ..\..\src\ribbon\art_aui.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp
+
+$(OBJS)\ribbonlib_bar.obj: ..\..\src\ribbon\bar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\bar.cpp
+
+$(OBJS)\ribbonlib_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp
+
+$(OBJS)\ribbonlib_control.obj: ..\..\src\ribbon\control.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\control.cpp
+
+$(OBJS)\ribbonlib_gallery.obj: ..\..\src\ribbon\gallery.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\gallery.cpp
+
+$(OBJS)\ribbonlib_page.obj: ..\..\src\ribbon\page.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp
+
+$(OBJS)\ribbonlib_panel.obj: ..\..\src\ribbon\panel.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp
+
+$(OBJS)\ribbonlib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp
+
+$(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\propgriddll_version.res: ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_PROPGRID ..\..\src\msw\version.rc
+
+$(OBJS)\propgriddll_advprops.obj: ..\..\src\propgrid\advprops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
+
+$(OBJS)\propgriddll_editors.obj: ..\..\src\propgrid\editors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\editors.cpp
+
+$(OBJS)\propgriddll_manager.obj: ..\..\src\propgrid\manager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\manager.cpp
+
+$(OBJS)\propgriddll_property.obj: ..\..\src\propgrid\property.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\property.cpp
+
+$(OBJS)\propgriddll_propgrid.obj: ..\..\src\propgrid\propgrid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp
+
+$(OBJS)\propgriddll_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp
+
+$(OBJS)\propgriddll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp
+
+$(OBJS)\propgriddll_props.obj: ..\..\src\propgrid\props.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\props.cpp
+
+$(OBJS)\propgridlib_dummy.obj: ..\..\src\common\dummy.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
+
+$(OBJS)\propgridlib_advprops.obj: ..\..\src\propgrid\advprops.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
+
+$(OBJS)\propgridlib_editors.obj: ..\..\src\propgrid\editors.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\editors.cpp
+
+$(OBJS)\propgridlib_manager.obj: ..\..\src\propgrid\manager.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\manager.cpp
+
+$(OBJS)\propgridlib_property.obj: ..\..\src\propgrid\property.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\property.cpp
+
+$(OBJS)\propgridlib_propgrid.obj: ..\..\src\propgrid\propgrid.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp
+
+$(OBJS)\propgridlib_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp
+
+$(OBJS)\propgridlib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp
+
+$(OBJS)\propgridlib_props.obj: ..\..\src\propgrid\props.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp
+
  $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc
  $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc
  
  $(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
  
  $(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp
@@ -13949,7 +14814,7 @@ $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC ..\..\src\msw\version.rc
  
  $(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp
  
  $(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp
@@ -13976,7 +14841,7 @@ $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
         $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
  
  $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_60)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_54) $(__DEBUG_DEFINE_p_53) $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53) $(__UNICODE_DEFINE_p_54) $(__MSLU_DEFINE_p_53) $(__GFXCTX_DEFINE_p_53) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL ..\..\src\msw\version.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG)  /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL ..\..\src\msw\version.rc
  
  $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp
  
  $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp
         $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp