Don't include Common-Controls manifest in wxBase apps.

[wxWidgets.git] / build / msw / wx_vc9_adv.vcproj
diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj

index 526c4078333dfcb5987b79486ecef62fb74c8014..97bcc2548a1cbecb7e95590796fd3740332de8a5 100644 (file)
--- a/build/msw/wx_vc9_adv.vcproj
+++ b/build/msw/wx_vc9_adv.vcproj
@@ -2,7 +2,7 @@
  <!--\r
  \r
    This project was generated by\r
  <!--\r
  \r
    This project was generated by\r
-  Bakefile 0.2.8 (http://www.bakefile.org)\r
+  Bakefile 0.2.9 (http://www.bakefile.org)\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
    Do not modify, all changes will be overwritten!\r
  \r
  -->\r
@@ -44,7 +44,7 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
@@ -52,7 +52,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -72,7 +72,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -128,7 +128,7 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
@@ -136,7 +136,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -154,7 +154,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -187,172 +187,6 @@
                                 Name="VCPostBuildEventTool"\r
                         />\r
                 </Configuration>\r
                                 Name="VCPostBuildEventTool"\r
                         />\r
                 </Configuration>\r
-               <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\adv"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
-                               ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\wxprec_advlib.pch"\r
-                               ObjectFile="vc_mswunivud\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_adv.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_adv.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc9_adv.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\adv"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
-                               ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\wxprec_advlib.pch"\r
-                               ObjectFile="vc_mswunivu\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_adv.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_adv.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc9_adv.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
                         OutputDirectory="..\..\lib\vc_dll"\r
                 <Configuration\r
                         Name="DLL Debug|Win32"\r
                         OutputDirectory="..\..\lib\vc_dll"\r
@@ -376,7 +210,7 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
@@ -384,7 +218,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                                 AdditionalOptions="/MP"\r
                                 Optimization="0"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
                                 RuntimeLibrary="3"\r
@@ -394,7 +228,7 @@
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"\r
                                 ObjectFile="vc_mswuddll\adv\"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"\r
                                 ObjectFile="vc_mswuddll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291ud_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295ud_adv_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -404,7 +238,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -414,15 +248,15 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw291ud_adv_vc_custom.dll"\r
+                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    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 ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw295ud_adv_vc_custom.dll"\r
                                 LinkIncremental="2"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 LinkIncremental="2"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291ud_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295ud_adv_vc_custom.pdb"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
@@ -469,7 +303,7 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                         <Tool\r
@@ -477,7 +311,7 @@
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                                 AdditionalOptions="/MP"\r
                                 Optimization="2"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -485,7 +319,7 @@
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"\r
                                 ObjectFile="vc_mswudll\adv\"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"\r
                                 ObjectFile="vc_mswudll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295u_adv_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 DebugInformationFormat="3"\r
@@ -495,7 +329,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
                                 Culture="1033"\r
                                 AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                         />\r
@@ -505,201 +339,15 @@
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
                         <Tool\r
                                 Name="VCLinkerTool"\r
                                 AdditionalOptions=""\r
-                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.dll"\r
+                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib    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 ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw295u_adv_vc_custom.dll"\r
                                 LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
                                 LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.pdb"\r
-                               TargetMachine="1"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc9_adv.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\adv"\r
-                       ConfigurationType="2"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalOptions="/MP"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
-                               ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch"\r
-                               ObjectFile="vc_mswunivuddll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291ud_adv_vc_custom.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    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 ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv291ud_adv_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291ud_adv_vc_custom.pdb"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc9_adv.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\adv"\r
-                       ConfigurationType="2"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalOptions="/MP"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
-                               ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_advdll.pch"\r
-                               ObjectFile="vc_mswunivudll\adv\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    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 ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.dll"\r
-                               LinkIncremental="1"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295u_adv_vc_custom.pdb"\r
                                 TargetMachine="1"\r
                                 OptimizeReferences="2"\r
                                 EnableCOMDATFolding="2"\r
                                 TargetMachine="1"\r
                                 OptimizeReferences="2"\r
                                 EnableCOMDATFolding="2"\r
@@ -769,22 +417,6 @@
                                                 UsePrecompiledHeader="1"\r
                                         />\r
                                 </FileConfiguration>\r
                                                 UsePrecompiledHeader="1"\r
                                         />\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         >\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         >\r
@@ -801,27 +433,23 @@
                                                 UsePrecompiledHeader="1"\r
                                         />\r
                                 </FileConfiguration>\r
                                                 UsePrecompiledHeader="1"\r
                                         />\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\gridcmn.cpp"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\hyperlnkcmn.cpp"\r
                                 >\r
                         </File>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\hyperlnkcmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\odcombocmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\richtooltipcmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\taskbarcmn.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\taskbarcmn.cpp"\r
                                 >\r
@@ -838,82 +466,30 @@
                         <File\r
                                 RelativePath="..\..\src\msw\bmpcbox.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\bmpcbox.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\calctrl.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\calctrl.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\commandlinkbutton.cpp"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\datecontrols.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\datecontrols.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\datectrl.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\datectrl.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\datetimectrl.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\hyperlink.cpp"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\joystick.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\joystick.cpp"\r
@@ -923,6 +499,10 @@
                                 RelativePath="..\..\src\msw\notifmsg.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\msw\notifmsg.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\richtooltip.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\sound.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\sound.cpp"\r
                                 >\r
@@ -931,6 +511,10 @@
                                 RelativePath="..\..\src\msw\taskbar.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\msw\taskbar.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\timectrl.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\version.rc"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\version.rc"\r
                                 >\r
@@ -942,14 +526,6 @@
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
@@ -964,6 +540,10 @@
                                 RelativePath="..\..\src\generic\animateg.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\generic\animateg.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\bannerwindow.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\bmpcboxg.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\generic\bmpcboxg.cpp"\r
                                 >\r
@@ -972,6 +552,10 @@
                                 RelativePath="..\..\src\generic\calctrlg.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\generic\calctrlg.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\commandlinkbuttong.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\datavgen.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\generic\datavgen.cpp"\r
                                 >\r
@@ -1024,6 +608,10 @@
                                 RelativePath="..\..\src\generic\propdlg.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\generic\propdlg.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\richtooltipg.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\sashwin.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\generic\sashwin.cpp"\r
                                 >\r
@@ -1032,10 +620,18 @@
                                 RelativePath="..\..\src\generic\splash.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\generic\splash.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\timectrlg.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\tipdlg.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\tipdlg.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\treelist.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\wizard.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\generic\wizard.cpp"\r
                                 >\r
@@ -1056,7 +652,6 @@
                                                 Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
                                                 CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
                                                 Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
                                                 Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
                                                 CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
                                                 Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
@@ -1067,15 +662,8 @@
                                                 Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                                 CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                                 Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                                 Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                                 CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                                 Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                         />\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                               />\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         >\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         >\r
@@ -1084,7 +672,6 @@
                                                 Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
                                                 CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
                                                 Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
                                                 Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
                                                 CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
                                                 Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
@@ -1095,15 +682,8 @@
                                                 Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                                 CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                                 Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                                 Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                                 CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                                 Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                         />\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\setup.h"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\setup.h"\r
@@ -1114,56 +694,12 @@
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                 />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
-                                       />\r
-                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                         Name="DLL Release|Win32"\r
                                 />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
-                                       />\r
-                               </FileConfiguration>\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
@@ -1178,10 +714,18 @@
                                 RelativePath="..\..\include\wx\msw\calctrl.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\calctrl.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\commandlinkbutton.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\datectrl.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\datectrl.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                 >\r
@@ -1207,28 +751,6 @@
                                                 AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                                 AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"\r
-                                       />\r
-                               </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         >\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"\r
                                         >\r
@@ -1251,28 +773,10 @@
                                                 AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                                 AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"\r
-                                       />\r
-                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\hyperlink.h"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\joystick.h"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\joystick.h"\r
@@ -1290,6 +794,10 @@
                                 RelativePath="..\..\include\wx\msw\taskbar.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\taskbar.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\timectrl.h"\r
+                               >\r
+                       </File>\r
                 </Filter>\r
                 <Filter\r
                         Name="Generic Headers"\r
                 </Filter>\r
                 <Filter\r
                         Name="Generic Headers"\r
@@ -1371,6 +879,10 @@
                                 RelativePath="..\..\include\wx\generic\splash.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\generic\splash.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\timectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\wizard.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\wizard.h"\r
                                 >\r
@@ -1388,6 +900,10 @@
                                 RelativePath="..\..\include\wx\animate.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\animate.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\bannerwindow.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\bmpcbox.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\bmpcbox.h"\r
                                 >\r
@@ -1396,6 +912,10 @@
                                 RelativePath="..\..\include\wx\calctrl.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\calctrl.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\commandlinkbutton.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dataview.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\dataview.h"\r
                                 >\r
@@ -1408,6 +928,10 @@
                                 RelativePath="..\..\include\wx\dateevt.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\dateevt.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datetimectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dcbuffer.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\dcbuffer.h"\r
                                 >\r
@@ -1448,6 +972,10 @@
                                 RelativePath="..\..\include\wx\propdlg.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\propdlg.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtooltip.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\sashwin.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\sashwin.h"\r
                                 >\r
@@ -1464,10 +992,18 @@
                                 RelativePath="..\..\include\wx\taskbar.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\taskbar.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\timectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tipdlg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tipdlg.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\treelist.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\wizard.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\wizard.h"\r
                                 >\r