Fix wxHash{Set,Map} compilation with g++ 4.7 in C++11 mode.

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

index 817e71e2ac61f5d322d4a23c644d88c9478bf368..85402b6a9f5364c67c5c95ef56a8f8e7e4c461bc 100644 (file)
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -2,7 +2,7 @@
  <!--\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
@@ -44,14 +44,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
                                 Name="VCCLCompilerTool"\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;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -73,7 +73,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
@@ -129,14 +129,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
                                 Name="VCCLCompilerTool"\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;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -155,7 +155,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
@@ -211,14 +211,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
                                 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;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -240,7 +240,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
@@ -296,14 +296,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
                                 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;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -322,7 +322,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\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
@@ -378,14 +378,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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_CORE;wxUSE_BASE=0"\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
                                 Name="VCCLCompilerTool"\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_CORE;wxUSE_BASE=0"\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_CORE;wxUSE_BASE=0"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -396,7 +396,7 @@
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r
                                 ObjectFile="vc_mswuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291ud_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -407,7 +407,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
@@ -417,15 +417,15 @@
                         <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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw291ud_core_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\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.dll"\r
                                 LinkIncremental="2"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291ud_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294ud_core_vc_custom.pdb"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
@@ -472,14 +472,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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_CORE;wxUSE_BASE=0"\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
                                 Name="VCCLCompilerTool"\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_CORE;wxUSE_BASE=0"\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_CORE;wxUSE_BASE=0"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -487,7 +487,7 @@
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r
                                 ObjectFile="vc_mswudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291u_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -498,7 +498,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw294u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
@@ -508,15 +508,15 @@
                         <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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw291u_core_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\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.dll"\r
                                 LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw294u_core_vc_custom.pdb"\r
                                 TargetMachine="1"\r
                                 OptimizeReferences="2"\r
                                 EnableCOMDATFolding="2"\r
@@ -565,14 +565,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                                 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_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -583,7 +583,7 @@
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"\r
                                 ObjectFile="vc_mswunivuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291ud_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -594,7 +594,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
@@ -604,15 +604,15 @@
                         <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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv291ud_core_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\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.dll"\r
                                 LinkIncremental="2"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291ud_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294ud_core_vc_custom.pdb"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
@@ -659,14 +659,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
                                 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_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
@@ -674,7 +674,7 @@
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"\r
                                 ObjectFile="vc_mswunivudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -685,7 +685,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv294u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\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
@@ -695,15 +695,15 @@
                         <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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv291u_core_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\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.dll"\r
                                 LinkIncremental="1"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                 GenerateManifest="true"\r
                                 GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv294u_core_vc_custom.pdb"\r
                                 TargetMachine="1"\r
                                 OptimizeReferences="2"\r
                                 EnableCOMDATFolding="2"\r
@@ -746,6 +746,10 @@
                                 RelativePath="..\..\src\common\accesscmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\affinematrix2d.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\anidecod.cpp"\r
                                 >\r
@@ -762,10 +766,18 @@
                                 RelativePath="..\..\src\common\artstd.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\arttango.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\bmpbase.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\bmpbtncmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\bookctrl.cpp"\r
                                 >\r
@@ -778,6 +790,14 @@
                                 RelativePath="..\..\src\common\cairo.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\checkboxcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\checklstcmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\choiccmn.cpp"\r
                                 >\r
@@ -802,6 +822,10 @@
                                 RelativePath="..\..\src\common\colourcmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\colourdata.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\combocmn.cpp"\r
                                 >\r
@@ -822,10 +846,6 @@
                                 RelativePath="..\..\src\common\ctrlsub.cpp"\r
                                 >\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\src\common\datacmn.cpp"\r
-                               >\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\dcbase.cpp"\r
                                 >\r
@@ -842,6 +862,10 @@
                                 RelativePath="..\..\src\common\dcsvg.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\dirctrlcmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\dlgcmn.cpp"\r
                                 >\r
@@ -954,6 +978,10 @@
                                 RelativePath="..\..\src\common\filectrlcmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\filehistorycmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\filepickercmn.cpp"\r
                                 >\r
@@ -966,6 +994,10 @@
                                 RelativePath="..\..\src\common\fontcmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\fontdata.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\fontenumcmn.cpp"\r
                                 >\r
@@ -1094,6 +1126,10 @@
                                 RelativePath="..\..\src\common\listctrlcmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\markupparser.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\matrix.cpp"\r
                                 >\r
@@ -1119,10 +1155,14 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\common\ownerdrwcmn.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\src\common\ownerdrwcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\panelcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\src\common\paper.cpp"\r
                                 >\r
                         </File>\r
@@ -1146,6 +1186,10 @@
                                 RelativePath="..\..\src\common\quantize.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\radiobtncmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\radiocmn.cpp"\r
                                 >\r
@@ -1162,6 +1206,10 @@
                                 RelativePath="..\..\src\common\rgncmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\scrolbarcmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\settcmn.cpp"\r
                                 >\r
@@ -1170,6 +1218,14 @@
                                 RelativePath="..\..\src\common\sizer.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\slidercmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\spinbtncmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\spinctrlcmn.cpp"\r
                                 >\r
@@ -1182,6 +1238,18 @@
                                 RelativePath="..\..\src\common\statbar.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statbmpcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statboxcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statlinecmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\stattextcmn.cpp"\r
                                 >\r
@@ -1210,6 +1278,10 @@
                                 RelativePath="..\..\src\common\treebase.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\uiactioncmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\utilscmn.cpp"\r
                                 >\r
@@ -1222,6 +1294,10 @@
                                 RelativePath="..\..\src\common\validate.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\valnum.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\valtext.cpp"\r
                                 >\r
@@ -1323,6 +1399,26 @@
                                 RelativePath="..\..\src\msw\ole\activex.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\anybutton.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\app.cpp"\r
                                 >\r
@@ -2463,6 +2559,10 @@
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\nonownedwnd.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\notebook.cpp"\r
                                 >\r
@@ -2543,6 +2643,26 @@
                                 RelativePath="..\..\src\msw\palette.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\panel.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\pen.cpp"\r
                                 >\r
@@ -2559,6 +2679,26 @@
                                 RelativePath="..\..\src\msw\printwin.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\progdlg.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\radiobox.cpp"\r
                                 >\r
@@ -2671,6 +2811,26 @@
                                 RelativePath="..\..\src\msw\renderer.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\richmsgdlg.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\scrolbar.cpp"\r
                                 >\r
@@ -3283,6 +3443,10 @@
                                         ExcludedFromBuild="true"\r
                                 />\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\uiaction.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\utilsgui.cpp"\r
                                 >\r
@@ -3572,6 +3736,10 @@
                                 RelativePath="..\..\src\generic\headerctrlg.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\infobar.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\listbkg.cpp"\r
                                 >\r
@@ -3633,27 +3801,11 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\mdig.cpp"\r
+                               RelativePath="..\..\src\generic\markuptext.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\msgdlgg.cpp"\r
+                               RelativePath="..\..\src\generic\mdig.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                         Name="Debug|Win32"\r
@@ -3673,11 +3825,11 @@
                                 />\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\numdlgg.cpp"\r
+                               RelativePath="..\..\src\generic\msgdlgg.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\panelg.cpp"\r
+                               RelativePath="..\..\src\generic\numdlgg.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
@@ -3696,6 +3848,10 @@
                                 RelativePath="..\..\src\generic\renderg.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\richmsgdlgg.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\scrlwing.cpp"\r
                                 >\r
@@ -5425,7 +5581,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
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
@@ -5436,7 +5591,6 @@
                                                 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
                                 <FileConfiguration\r
@@ -5453,7 +5607,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
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
@@ -5464,7 +5617,6 @@
                                                 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
                                 <FileConfiguration\r
@@ -5491,7 +5643,6 @@
                                                 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
@@ -5502,7 +5653,6 @@
                                                 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
@@ -5519,7 +5669,6 @@
                                                 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
@@ -5530,7 +5679,6 @@
                                                 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
@@ -5551,6 +5699,10 @@
                                 RelativePath="..\..\include\wx\msw\ole\activex.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\anybutton.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\app.h"\r
                                 >\r
@@ -5619,6 +5771,10 @@
                                 RelativePath="..\..\include\wx\msw\combobox.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\commandlinkbutton.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\control.h"\r
                                 >\r
@@ -5631,6 +5787,10 @@
                                 RelativePath="..\..\include\wx\msw\cursor.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\custombgwin.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\dataform.h"\r
                                 >\r
@@ -5647,6 +5807,10 @@
                                 RelativePath="..\..\include\wx\msw\datectrl.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\dc.h"\r
                                 >\r
@@ -5843,6 +6007,10 @@
                                 RelativePath="..\..\include\wx\msw\htmlhelp.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\hyperlink.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\icon.h"\r
                                 >\r
@@ -5899,6 +6067,10 @@
                                 RelativePath="..\..\include\wx\msw\msvcrt.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\nonownedwnd.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\notebook.h"\r
                                 >\r
@@ -5912,13 +6084,17 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\ownerdrw.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\msw\ownerdrw.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                 RelativePath="..\..\include\wx\msw\palette.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\panel.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\pen.h"\r
                                 >\r
@@ -5935,6 +6111,10 @@
                                 RelativePath="..\..\include\wx\msw\printwin.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\progdlg.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\radiobox.h"\r
                                 >\r
@@ -5951,6 +6131,10 @@
                                 RelativePath="..\..\include\wx\msw\region.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\richmsgdlg.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\scrolbar.h"\r
                                 >\r
@@ -6011,6 +6195,10 @@
                                 RelativePath="..\..\include\wx\msw\tglbtn.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\timectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\toolbar.h"\r
                                 >\r
@@ -6039,6 +6227,14 @@
                                 RelativePath="..\..\include\wx\msw\uxthemep.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webview_ie.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\window.h"\r
                                 >\r
@@ -6100,6 +6296,10 @@
                                 RelativePath="..\..\include\wx\generic\ctrlsub.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\custombgwin.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\dataview.h"\r
                                 >\r
@@ -6240,6 +6440,10 @@
                                 RelativePath="..\..\include\wx\generic\propdlg.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\richmsgdlgg.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\sashwin.h"\r
                                 >\r
@@ -6280,6 +6484,10 @@
                                 RelativePath="..\..\include\wx\generic\textdlgg.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\timectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\treectlg.h"\r
                                 >\r
@@ -6293,6 +6501,10 @@
                         Name="wxUniv Headers"\r
                         UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}"\r
                         >\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\anybutton.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\app.h"\r
                                 >\r
@@ -6333,6 +6545,10 @@
                                 RelativePath="..\..\include\wx\univ\control.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\custombgwin.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\dialog.h"\r
                                 >\r
@@ -6369,6 +6585,10 @@
                                 RelativePath="..\..\include\wx\univ\notebook.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\panel.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\univ\radiobox.h"\r
                                 >\r
@@ -6514,6 +6734,10 @@
                                 RelativePath="..\..\include\wx\html\m_templ.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\html\styleparams.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\html\winpars.h"\r
                                 >\r
@@ -6539,6 +6763,14 @@
                                 RelativePath="..\..\include\wx\propgrid\advprops.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\affinematrix2d.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\affinematrix2dbase.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\anidecod.h"\r
                                 >\r
@@ -6551,6 +6783,18 @@
                                 RelativePath="..\..\include\wx\animdecod.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\anybutton.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\art.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\art_internal.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\artprov.h"\r
                                 >\r
@@ -6567,6 +6811,14 @@
                                 RelativePath="..\..\include\wx\aui\auibook.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\bannerwindow.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\bar.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\bitmap.h"\r
                                 >\r
@@ -6580,11 +6832,11 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\persist\bookctrl.h"\r
+                               RelativePath="..\..\include\wx\bookctrl.h"\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\bookctrl.h"\r
+                               RelativePath="..\..\include\wx\persist\bookctrl.h"\r
                                 >\r
                         </File>\r
                         <File\r
@@ -6599,6 +6851,10 @@
                                 RelativePath="..\..\include\wx\button.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\buttonbar.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\cairo.h"\r
                                 >\r
@@ -6659,6 +6915,10 @@
                                 RelativePath="..\..\include\wx\colour.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\colourdata.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\combo.h"\r
                                 >\r
@@ -6667,10 +6927,22 @@
                                 RelativePath="..\..\include\wx\combobox.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\commandlinkbutton.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\compositewin.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\control.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\control.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\cshelp.h"\r
                                 >\r
@@ -6683,6 +6955,10 @@
                                 RelativePath="..\..\include\wx\cursor.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\custombgwin.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dataobj.h"\r
                                 >\r
@@ -6699,6 +6975,10 @@
                                 RelativePath="..\..\include\wx\dateevt.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datetimectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dc.h"\r
                                 >\r
@@ -6807,10 +7087,6 @@
                                 RelativePath="..\..\include\wx\encinfo.h"\r
                                 >\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\evtloop.h"\r
-                               >\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\evtloopsrc.h"\r
                                 >\r
@@ -6827,6 +7103,10 @@
                                 RelativePath="..\..\include\wx\filedlg.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\filehistory.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\filepicker.h"\r
                                 >\r
@@ -6843,6 +7123,10 @@
                                 RelativePath="..\..\include\wx\font.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\fontdata.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\fontdlg.h"\r
                                 >\r
@@ -6867,6 +7151,10 @@
                                 RelativePath="..\..\include\wx\aui\framemanager.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\gallery.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\gauge.h"\r
                                 >\r
@@ -6995,6 +7283,10 @@
                                 RelativePath="..\..\include\wx\infobar.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\itemid.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\joystick.h"\r
                                 >\r
@@ -7095,6 +7387,10 @@
                                 RelativePath="..\..\include\wx\ownerdrw.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\page.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\palette.h"\r
                                 >\r
@@ -7103,6 +7399,10 @@
                                 RelativePath="..\..\include\wx\panel.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\panel.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\paper.h"\r
                                 >\r
@@ -7183,6 +7483,10 @@
                                 RelativePath="..\..\include\wx\radiobut.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\range.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\rawbmp.h"\r
                                 >\r
@@ -7199,14 +7503,38 @@
                                 RelativePath="..\..\include\wx\renderer.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richmsgdlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextbackgroundpage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextborderspage.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextbuffer.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextbulletspage.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextctrl.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextdialogpage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextfontpage.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextformatdlg.h"\r
                                 >\r
@@ -7215,14 +7543,38 @@
                                 RelativePath="..\..\include\wx\richtext\richtexthtml.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextimagedlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextindentspage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextliststylepage.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextmarginspage.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextprint.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextsizepage.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextstyledlg.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextstylepage.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextstyles.h"\r
                                 >\r
@@ -7231,10 +7583,18 @@
                                 RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextuicustomization.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextxml.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtooltip.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\sashwin.h"\r
                                 >\r
@@ -7283,6 +7643,10 @@
                                 RelativePath="..\..\include\wx\splash.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\splitter.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\splitter.h"\r
                                 >\r
@@ -7327,6 +7691,10 @@
                                 RelativePath="..\..\include\wx\tbarbase.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\textcompleter.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\textctrl.h"\r
                                 >\r
@@ -7347,6 +7715,10 @@
                                 RelativePath="..\..\include\wx\tglbtn.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\timectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tipdlg.h"\r
                                 >\r
@@ -7355,6 +7727,10 @@
                                 RelativePath="..\..\include\wx\tipwin.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\toolbar.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\toolbar.h"\r
                                 >\r
@@ -7368,11 +7744,11 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\toplevel.h"\r
+                               RelativePath="..\..\include\wx\persist\toplevel.h"\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\persist\toplevel.h"\r
+                               RelativePath="..\..\include\wx\toplevel.h"\r
                                 >\r
                         </File>\r
                         <File\r
@@ -7380,17 +7756,25 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\treebook.h"\r
+                               RelativePath="..\..\include\wx\persist\treebook.h"\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\persist\treebook.h"\r
+                               RelativePath="..\..\include\wx\treebook.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\treectrl.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\treelist.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\uiaction.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\valgen.h"\r
                                 >\r
@@ -7399,6 +7783,10 @@
                                 RelativePath="..\..\include\wx\validate.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\valnum.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\valtext.h"\r
                                 >\r
@@ -7420,17 +7808,29 @@
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\window.h"\r
+                               RelativePath="..\..\include\wx\webview.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webviewarchivehandler.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\persist\window.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\window.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\windowid.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\withimages.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\wizard.h"\r
                                 >\r
@@ -7455,6 +7855,10 @@
                                 RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_bmp.h"\r
                                 >\r
@@ -7495,6 +7899,10 @@
                                 RelativePath="..\..\include\wx\xrc\xh_clrpicker.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_cmdlinkbn.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_collpane.h"\r
                                 >\r
@@ -7663,10 +8071,18 @@
                                 RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tree.h"\r
                                 >\r