Fix recreating of wxBitmapComboBox using untyped client data.

[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 29ccea07d3cba671311c837b2a2b0efff297c8cc..3ec17d668a6af79710a459787f4927c7e7b6e614 100644 (file)
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -1,8 +1,8 @@
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
  <?xml version="1.0" encoding="Windows-1252"?>\r
  <!--\r
  \r
-  This makefile was generated by\r
-  Bakefile 0.2.5 (http://www.bakefile.org)\r
+  This project was generated by\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
@@ -22,100 +22,10 @@
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
         </ToolFiles>\r
         <Configurations>\r
                 <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\core"\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
-                       />\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="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
-                               ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_coredll.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\core\"\r
-                               ObjectFile="vc_mswunivudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_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
-                       <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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll"\r
-                               LinkIncremental="2"\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\wxmswuniv290u_core_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_vc8_core.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\core"\r
-                       ConfigurationType="2"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\core"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -134,12 +44,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\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
                         />\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="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;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
+                               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
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -148,10 +60,9 @@
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_coredll.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\core\"\r
-                               ObjectFile="vc_mswunivuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\wxprec_corelib.pch"\r
+                               ObjectFile="vc_mswud\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -162,26 +73,17 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_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;wxUSE_BASE=0"\r
                                 Culture="1033"\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
+                               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="VCPreLinkEventTool"\r
                         />\r
                         <Tool\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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_core.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -194,7 +96,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -205,10 +107,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\core"\r
-                       ConfigurationType="2"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\core"\r
+                       ConfigurationType="4"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -227,21 +129,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\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
                         />\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="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;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
+                               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
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r
-                               AssemblerListingLocation="vc_mswudll\core\"\r
-                               ObjectFile="vc_mswudll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"\r
+                               ObjectFile="vc_mswu\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -252,26 +155,17 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_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;wxUSE_BASE=0"\r
                                 Culture="1033"\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
+                               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="VCPreLinkEventTool"\r
                         />\r
                         <Tool\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\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
-                               TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -284,7 +178,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -317,12 +211,14 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\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
                         />\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="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_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
                                 MinimalRebuild="true"\r
                                 ExceptionHandling="1"\r
                                 BasicRuntimeChecks="3"\r
@@ -332,9 +228,8 @@
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\core\"\r
                                 ObjectFile="vc_mswuddll\core\"\r
                                 ObjectFile="vc_mswuddll\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -345,7 +240,7 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_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=wxmsw295ud_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
                                 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
@@ -355,15 +250,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\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290ud_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\wxmsw295ud_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
                                 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\wxmsw290ud_core_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb"\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
                                 TargetMachine="1"\r
                         />\r
                         <Tool\r
@@ -388,10 +283,10 @@
                         />\r
                 </Configuration>\r
                 <Configuration\r
                         />\r
                 </Configuration>\r
                 <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\core"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\core"\r
+                       ConfigurationType="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="false"\r
                         CharacterSet="1"\r
@@ -410,105 +305,22 @@
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\r
                         />\r
                         <Tool\r
                                 Name="VCMIDLTool"\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
                         />\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="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;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
+                               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
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="1"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="true"\r
                                 UsePrecompiledHeader="2"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\wxprec_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\core\"\r
-                               ObjectFile="vc_mswunivu\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_core.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_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
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.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_vc8_core.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\core"\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
-                       />\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="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
-                               MinimalRebuild="true"\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_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\core\"\r
-                               ObjectFile="vc_mswunivud\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_core.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\wxprec_coredll.pch"\r
+                               ObjectFile="vc_mswudll\core\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
                                 WarningLevel="4"\r
                                 SuppressStartupBanner="true"\r
                                 Detect64BitPortabilityProblems="true"\r
@@ -519,17 +331,28 @@
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                         />\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_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;WXDLLNAME=wxmsw295u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 Culture="1033"\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
+                               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="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
                         />\r
                         <Tool\r
                                 Name="VCPreLinkEventTool"\r
                         />\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\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\wxmsw295u_core_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_core.lib"\r
                                 SuppressStartupBanner="true"\r
                                 SuppressStartupBanner="true"\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
                         />\r
                         <Tool\r
                                 Name="VCALinkTool"\r
@@ -542,7 +365,7 @@
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
                         />\r
                         <Tool\r
                                 Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_core.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_core.bsc"\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
                                 SuppressStartupBanner="true"\r
                         />\r
                         <Tool\r
@@ -552,179 +375,14 @@
                                 Name="VCPostBuildEventTool"\r
                         />\r
                 </Configuration>\r
                                 Name="VCPostBuildEventTool"\r
                         />\r
                 </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\core"\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
-                       />\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="_LIB;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
-                               ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswu\wxprec_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswu\core\"\r
-                               ObjectFile="vc_mswu\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_core.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_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
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29u_core.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_vc8_core.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\core"\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
-                       />\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="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
-                               MinimalRebuild="true"\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_mswud\wxprec_corelib.pch"\r
-                               AssemblerListingLocation="vc_mswud\core\"\r
-                               ObjectFile="vc_mswud\core\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_core.pdb"\r
-                               WarningLevel="4"\r
-                               SuppressStartupBanner="true"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_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
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.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_vc8_core.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-               \r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Common Sources"\r
-                       UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}"\r
+       </Configurations>\r
+       <References>\r
+               \r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Common Sources"\r
+                       UniqueIdentifier="{A6A5C30D-BDB6-5050-906D-10A96065136C}"\r
                         >\r
                         <File\r
                                 RelativePath="..\..\src\common\accelcmn.cpp"\r
                         >\r
                         <File\r
                                 RelativePath="..\..\src\common\accelcmn.cpp"\r
@@ -734,6 +392,10 @@
                                 RelativePath="..\..\src\common\accesscmn.cpp"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\src\common\anidecod.cpp"\r
                                 >\r
@@ -750,10 +412,18 @@
                                 RelativePath="..\..\src\common\artstd.cpp"\r
                                 >\r
                         </File>\r
                                 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\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
                         <File\r
                                 RelativePath="..\..\src\common\bookctrl.cpp"\r
                                 >\r
@@ -766,6 +436,14 @@
                                 RelativePath="..\..\src\common\cairo.cpp"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\src\common\choiccmn.cpp"\r
                                 >\r
@@ -790,6 +468,10 @@
                                 RelativePath="..\..\src\common\colourcmn.cpp"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\src\common\combocmn.cpp"\r
                                 >\r
@@ -810,10 +492,6 @@
                                 RelativePath="..\..\src\common\ctrlsub.cpp"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\src\common\dcbase.cpp"\r
                                 >\r
@@ -830,6 +508,10 @@
                                 RelativePath="..\..\src\common\dcsvg.cpp"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\src\common\dlgcmn.cpp"\r
                                 >\r
@@ -862,15 +544,7 @@
                                 RelativePath="..\..\src\common\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\common\dummy.cpp"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -878,7 +552,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -894,31 +568,7 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\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="Universal Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
@@ -942,6 +592,10 @@
                                 RelativePath="..\..\src\common\filectrlcmn.cpp"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\src\common\filepickercmn.cpp"\r
                                 >\r
@@ -954,6 +608,10 @@
                                 RelativePath="..\..\src\common\fontcmn.cpp"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\src\common\fontenumcmn.cpp"\r
                                 >\r
@@ -1082,6 +740,10 @@
                                 RelativePath="..\..\src\common\listctrlcmn.cpp"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\src\common\matrix.cpp"\r
                                 >\r
@@ -1090,6 +752,14 @@
                                 RelativePath="..\..\src\common\menucmn.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\menucmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\modalhook.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\mousemanager.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\msgout.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\msgout.cpp"\r
                                 >\r
@@ -1102,10 +772,22 @@
                                 RelativePath="..\..\src\common\overlaycmn.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\overlaycmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               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
                         <File\r
                                 RelativePath="..\..\src\common\paper.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\persist.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\pickerbase.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\pickerbase.cpp"\r
                                 >\r
@@ -1114,6 +796,10 @@
                                 RelativePath="..\..\src\common\popupcmn.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\popupcmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\preferencescmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\prntbase.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\prntbase.cpp"\r
                                 >\r
@@ -1122,6 +808,10 @@
                                 RelativePath="..\..\src\common\quantize.cpp"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\src\common\radiocmn.cpp"\r
                                 >\r
@@ -1138,6 +828,10 @@
                                 RelativePath="..\..\src\common\rgncmn.cpp"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\src\common\settcmn.cpp"\r
                                 >\r
@@ -1147,7 +841,11 @@
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\common\spinbuttcmn.cpp"\r
+                               RelativePath="..\..\src\common\slidercmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\spinbtncmn.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
@@ -1162,6 +860,18 @@
                                 RelativePath="..\..\src\common\statbar.cpp"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\src\common\stattextcmn.cpp"\r
                                 >\r
@@ -1182,6 +892,10 @@
                                 RelativePath="..\..\src\common\textentrycmn.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\common\textentrycmn.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\textmeasurecmn.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\toplvcmn.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\common\toplvcmn.cpp"\r
                                 >\r
@@ -1190,6 +904,10 @@
                                 RelativePath="..\..\src\common\treebase.cpp"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\src\common\utilscmn.cpp"\r
                                 >\r
@@ -1202,6 +920,10 @@
                                 RelativePath="..\..\src\common\validate.cpp"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\src\common\valtext.cpp"\r
                                 >\r
@@ -1230,42 +952,18 @@
                         <File\r
                                 RelativePath="..\..\src\msw\accel.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\accel.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\access.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\access.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\ole\activex.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\anybutton.cpp"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\app.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\app.cpp"\r
@@ -1274,22 +972,6 @@
                         <File\r
                                 RelativePath="..\..\src\msw\artmsw.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\artmsw.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\automtn.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\automtn.cpp"\r
@@ -1302,22 +984,6 @@
                         <File\r
                                 RelativePath="..\..\src\msw\bmpbuttn.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\bmpbuttn.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\brush.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\brush.cpp"\r
@@ -1326,22 +992,6 @@
                         <File\r
                                 RelativePath="..\..\src\msw\button.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\button.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\caret.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\caret.cpp"\r
@@ -1350,62 +1000,14 @@
                         <File\r
                                 RelativePath="..\..\src\msw\checkbox.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\checkbox.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\checklst.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\checklst.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\choice.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\choice.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\clipbrd.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\clipbrd.cpp"\r
@@ -1414,22 +1016,6 @@
                         <File\r
                                 RelativePath="..\..\src\msw\colordlg.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\colordlg.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\colour.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\colour.cpp"\r
@@ -1438,62 +1024,14 @@
                         <File\r
                                 RelativePath="..\..\src\msw\combo.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\combo.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\combobox.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\combobox.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\control.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\control.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\cursor.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\cursor.cpp"\r
@@ -1530,22 +1068,6 @@
                         <File\r
                                 RelativePath="..\..\src\msw\dialog.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\dialog.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\dialup.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\dialup.cpp"\r
@@ -1558,22 +1080,6 @@
                         <File\r
                                 RelativePath="..\..\src\msw\dirdlg.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\dirdlg.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\display.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\display.cpp"\r
@@ -1582,22 +1088,6 @@
                         <File\r
                                 RelativePath="..\..\src\msw\dragimag.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\dragimag.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\dropsrc.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\dropsrc.cpp"\r
@@ -1618,42 +1108,10 @@
                         <File\r
                                 RelativePath="..\..\src\msw\fdrepdlg.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\fdrepdlg.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\filedlg.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\filedlg.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\font.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\font.cpp"\r
@@ -1662,22 +1120,6 @@
                         <File\r
                                 RelativePath="..\..\src\msw\fontdlg.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\fontdlg.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\fontenum.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\fontenum.cpp"\r
@@ -1690,42 +1132,10 @@
                         <File\r
                                 RelativePath="..\..\src\msw\frame.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\frame.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\gauge.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\gauge.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\gdiimage.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\gdiimage.cpp"\r
@@ -1746,22 +1156,6 @@
                         <File\r
                                 RelativePath="..\..\src\msw\headerctrl.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\headerctrl.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\helpchm.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\helpchm.cpp"\r
@@ -1782,62 +1176,14 @@
                         <File\r
                                 RelativePath="..\..\src\msw\iniconf.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\iniconf.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\listbox.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\listbox.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\listctrl.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\listctrl.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\main.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\main.cpp"\r
@@ -1846,82 +1192,18 @@
                         <File\r
                                 RelativePath="..\..\src\msw\mdi.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\mdi.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\menu.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\menu.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\menuitem.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\menuitem.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\metafile.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\metafile.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\minifram.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\minifram.cpp"\r
@@ -1930,22 +1212,6 @@
                         <File\r
                                 RelativePath="..\..\src\msw\msgdlg.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\msgdlg.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\mslu.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\mslu.cpp"\r
@@ -1954,62 +1220,18 @@
                         <File\r
                                 RelativePath="..\..\src\msw\nativdlg.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\nativdlg.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\nativewin.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\nativewin.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\nonownedwnd.cpp"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\notebook.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\notebook.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\oleutils.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\oleutils.cpp"\r
@@ -2018,27 +1240,15 @@
                         <File\r
                                 RelativePath="..\..\src\msw\ownerdrw.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\ownerdrw.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\palette.cpp"\r
                                 >\r
                         </File>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\palette.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\panel.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\pen.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\pen.cpp"\r
                                 >\r
@@ -2055,45 +1265,17 @@
                                 RelativePath="..\..\src\msw\printwin.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\msw\printwin.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\progdlg.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\radiobox.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\radiobox.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\radiobut.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\radiobut.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\region.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\region.cpp"\r
@@ -2103,25 +1285,17 @@
                                 RelativePath="..\..\src\msw\renderer.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\msw\renderer.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\richmsgdlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\ole\safearray.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\scrolbar.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\scrolbar.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\settings.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\settings.cpp"\r
@@ -2130,242 +1304,54 @@
                         <File\r
                                 RelativePath="..\..\src\msw\slider.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\slider.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\spinbutt.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\spinbutt.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\spinctrl.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\spinctrl.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statbmp.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statbmp.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statbox.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statbox.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statline.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statline.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\stattext.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\stattext.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statusbar.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statusbar.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\textctrl.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\textctrl.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\textentry.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\textentry.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\textmeasure.cpp"\r
+                               >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\tglbtn.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\tglbtn.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\toolbar.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\toolbar.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\tooltip.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\tooltip.cpp"\r
@@ -2378,27 +1364,19 @@
                         <File\r
                                 RelativePath="..\..\src\msw\treectrl.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\treectrl.cpp"\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       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
                         </File>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\utilsgui.cpp"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\utilswin.cpp"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\uuid.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\uuid.cpp"\r
                                 >\r
@@ -2411,21 +1389,13 @@
                                 RelativePath="..\..\src\msw\version.rc"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\src\msw\version.rc"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                         ExcludedFromBuild="true"\r
                                 />\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="true"\r
                                 />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\volume.cpp"\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\volume.cpp"\r
@@ -2440,26 +1410,6 @@
                         Name="Generic Sources"\r
                         UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"\r
                         >\r
                         Name="Generic Sources"\r
                         UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"\r
                         >\r
-                       <File\r
-                               RelativePath="..\..\src\generic\accel.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\busyinfo.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\generic\busyinfo.cpp"\r
                                 >\r
@@ -2484,26 +1434,6 @@
                                 RelativePath="..\..\src\generic\collpaneg.cpp"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\src\generic\collpaneg.cpp"\r
                                 >\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\colrdlgg.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\combog.cpp"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\src\generic\combog.cpp"\r
                                 >\r
@@ -2517,179 +1447,55 @@
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\dirdlgg.cpp"\r
+                               RelativePath="..\..\src\generic\dragimgg.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\dragimgg.cpp"\r
+                               RelativePath="..\..\src\generic\filectrlg.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\fdrepdlg.cpp"\r
+                               RelativePath="..\..\src\generic\filepickerg.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\filectrlg.cpp"\r
+                               RelativePath="..\..\src\generic\fontpickerg.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\filedlgg.cpp"\r
+                               RelativePath="..\..\src\generic\graphicc.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\filepickerg.cpp"\r
+                               RelativePath="..\..\src\generic\headerctrlg.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\fontdlgg.cpp"\r
+                               RelativePath="..\..\src\generic\infobar.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\fontpickerg.cpp"\r
+                               RelativePath="..\..\src\generic\listbkg.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\headerctrlg.cpp"\r
+                               RelativePath="..\..\src\generic\logg.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\listbkg.cpp"\r
+                               RelativePath="..\..\src\generic\markuptext.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\listctrl.cpp"\r
+                               RelativePath="..\..\src\generic\msgdlgg.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\logg.cpp"\r
+                               RelativePath="..\..\src\generic\numdlgg.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\mdig.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\msgdlgg.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\numdlgg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\panelg.cpp"\r
+                               RelativePath="..\..\src\generic\preferencesg.cpp"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
@@ -2709,885 +1515,68 @@
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\scrlwing.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\selstore.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\spinctlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\splitter.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\srchctlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\statbmpg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\stattextg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\statusbr.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\textdlgg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\tipwin.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\toolbkg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\treebkg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\treectlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\vlbox.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\vscroll.cpp"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="wxUniv Sources"\r
-                       UniqueIdentifier="{6F354595-5EA6-5848-AAA1-6C4820DE7AEE}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\src\univ\bmpbuttn.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\button.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\checkbox.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\checklst.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\choice.cpp"\r
+                               RelativePath="..\..\src\generic\richmsgdlgg.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\combobox.cpp"\r
+                               RelativePath="..\..\src\generic\scrlwing.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\control.cpp"\r
+                               RelativePath="..\..\src\generic\selstore.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\ctrlrend.cpp"\r
+                               RelativePath="..\..\src\generic\spinctlg.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\dialog.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\framuniv.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\gauge.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\themes\gtk.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\inpcons.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\inphand.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\listbox.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\menu.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\themes\metal.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\themes\mono.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\notebook.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\radiobox.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\radiobut.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\scrarrow.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\scrolbar.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\scrthumb.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\settingsuniv.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\slider.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\spinbutt.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\statbmp.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\statbox.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\statline.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
+                       <File\r
+                               RelativePath="..\..\src\generic\splitter.cpp"\r
+                               >\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\stattext.cpp"\r
+                               RelativePath="..\..\src\generic\srchctlg.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\statusbr.cpp"\r
+                               RelativePath="..\..\src\generic\statbmpg.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\stdrend.cpp"\r
+                               RelativePath="..\..\src\generic\stattextg.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\textctrl.cpp"\r
+                               RelativePath="..\..\src\generic\statusbr.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\tglbtn.cpp"\r
+                               RelativePath="..\..\src\generic\textdlgg.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\theme.cpp"\r
+                               RelativePath="..\..\src\generic\tipwin.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\toolbar.cpp"\r
+                               RelativePath="..\..\src\generic\toolbkg.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\topluniv.cpp"\r
+                               RelativePath="..\..\src\generic\treebkg.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\themes\win32.cpp"\r
+                               RelativePath="..\..\src\generic\treectlg.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\winuniv.cpp"\r
+                               RelativePath="..\..\src\generic\vlbox.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\vscroll.cpp"\r
                                 >\r
                                 >\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
@@ -3598,39 +1587,15 @@
                                 RelativePath="..\..\include\wx\msw\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\include\wx\msw\setup.h"\r
                                 >\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\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
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
+                                               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
                                         />\r
                                 </FileConfiguration>\r
                                         />\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                               />\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         >\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         >\r
@@ -3639,79 +1604,43 @@
                                                 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
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\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
                                         />\r
                                 </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\setup.h"\r
-                               >\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
+                                               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
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
+                                               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
                                         />\r
                                 </FileConfiguration>\r
                                         />\r
                                 </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\setup.h"\r
+                               >\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\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="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="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r
                                 />\r
                                 <FileConfiguration\r
                                 />\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                 />\r
                         </File>\r
                 </Filter>\r
                                 />\r
                         </File>\r
                 </Filter>\r
@@ -3731,6 +1660,10 @@
                                 RelativePath="..\..\include\wx\msw\ole\activex.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\msw\app.h"\r
                                 >\r
@@ -3796,7 +1729,11 @@
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\combobox.h"\r
+                               RelativePath="..\..\include\wx\msw\combobox.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\commandlinkbutton.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
@@ -3811,6 +1748,10 @@
                                 RelativePath="..\..\include\wx\msw\cursor.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\cursor.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\custombgwin.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\dataform.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\dataform.h"\r
                                 >\r
@@ -3824,11 +1765,11 @@
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\datecontrols.h"\r
+                               RelativePath="..\..\include\wx\msw\datectrl.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\datectrl.h"\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
@@ -3915,36 +1856,25 @@
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                 >\r
                                 <FileConfiguration\r
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                 >\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
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
@@ -3959,47 +1889,14 @@
                                         />\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\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="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="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                         >\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
                                         />\r
                                 </FileConfiguration>\r
                         </File>\r
                                         />\r
                                 </FileConfiguration>\r
                         </File>\r
@@ -4027,6 +1924,10 @@
                                 RelativePath="..\..\include\wx\msw\htmlhelp.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\msw\icon.h"\r
                                 >\r
@@ -4039,6 +1940,10 @@
                                 RelativePath="..\..\include\wx\msw\iniconf.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\iniconf.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\init.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\joystick.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\joystick.h"\r
                                 >\r
@@ -4083,6 +1988,10 @@
                                 RelativePath="..\..\include\wx\msw\msvcrt.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\msvcrt.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\nonownedwnd.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\notebook.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\notebook.h"\r
                                 >\r
@@ -4095,10 +2004,18 @@
                                 RelativePath="..\..\include\wx\msw\ole\oleutils.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\ole\oleutils.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               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\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
                         <File\r
                                 RelativePath="..\..\include\wx\msw\pen.h"\r
                                 >\r
@@ -4115,6 +2032,10 @@
                                 RelativePath="..\..\include\wx\msw\printwin.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\msw\radiobox.h"\r
                                 >\r
@@ -4132,11 +2053,15 @@
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\scrolbar.h"\r
+                               RelativePath="..\..\include\wx\msw\richmsgdlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\ole\safearray.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\setup0.h"\r
+                               RelativePath="..\..\include\wx\msw\scrolbar.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
@@ -4191,6 +2116,10 @@
                                 RelativePath="..\..\include\wx\msw\tglbtn.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\msw\tglbtn.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\timectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\toolbar.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\toolbar.h"\r
                                 >\r
@@ -4219,6 +2148,18 @@
                                 RelativePath="..\..\include\wx\msw\uxthemep.h"\r
                                 >\r
                         </File>\r
                                 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\webview_missing.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\window.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\window.h"\r
                                 >\r
@@ -4277,7 +2218,7 @@
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\ctrlsub.h"\r
+                               RelativePath="..\..\include\wx\generic\custombgwin.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
@@ -4285,340 +2226,167 @@
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\datectrl.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\dcpsg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\dirctrlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\dirdlgg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\dragimgg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\fdrepdlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\filectrlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\filedlgg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\filepickerg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\fontdlgg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\fontpickerg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\grid.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\gridctrl.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\grideditors.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\gridsel.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\headerctrlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\helpext.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\hyperlink.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\laywin.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\listctrl.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\logg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\mdig.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\msgdlgg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\notebook.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\notifmsg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\numdlgg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\panelg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\printps.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\prntdlgg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\progdlgg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\propdlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\sashwin.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\scrolwin.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\spinctlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\splash.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\splitter.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\srchctlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\statbmpg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\stattextg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\statusbr.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\textdlgg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\treectlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\wizard.h"\r
+                               RelativePath="..\..\include\wx\generic\datectrl.h"\r
                                 >\r
                         </File>\r
                                 >\r
                         </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="wxUniv Headers"\r
-                       UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}"\r
-                       >\r
                         <File\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\app.h"\r
+                               RelativePath="..\..\include\wx\generic\dcpsg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\bmpbuttn.h"\r
+                               RelativePath="..\..\include\wx\generic\dirctrlg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\button.h"\r
+                               RelativePath="..\..\include\wx\generic\dragimgg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\checkbox.h"\r
+                               RelativePath="..\..\include\wx\generic\dvrenderer.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\checklst.h"\r
+                               RelativePath="..\..\include\wx\generic\dvrenderers.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\chkconf.h"\r
+                               RelativePath="..\..\include\wx\generic\filectrlg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\choice.h"\r
+                               RelativePath="..\..\include\wx\generic\filepickerg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\colschem.h"\r
+                               RelativePath="..\..\include\wx\generic\fontpickerg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\combobox.h"\r
+                               RelativePath="..\..\include\wx\generic\grid.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\control.h"\r
+                               RelativePath="..\..\include\wx\generic\gridctrl.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\dialog.h"\r
+                               RelativePath="..\..\include\wx\generic\grideditors.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\frame.h"\r
+                               RelativePath="..\..\include\wx\generic\gridsel.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\gauge.h"\r
+                               RelativePath="..\..\include\wx\generic\headerctrlg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\inpcons.h"\r
+                               RelativePath="..\..\include\wx\generic\helpext.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\inphand.h"\r
+                               RelativePath="..\..\include\wx\generic\hyperlink.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\listbox.h"\r
+                               RelativePath="..\..\include\wx\generic\infobar.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\menu.h"\r
+                               RelativePath="..\..\include\wx\generic\laywin.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\menuitem.h"\r
+                               RelativePath="..\..\include\wx\generic\logg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\notebook.h"\r
+                               RelativePath="..\..\include\wx\generic\msgdlgg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\radiobox.h"\r
+                               RelativePath="..\..\include\wx\generic\notebook.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\radiobut.h"\r
+                               RelativePath="..\..\include\wx\generic\notifmsg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\renderer.h"\r
+                               RelativePath="..\..\include\wx\generic\numdlgg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\scrarrow.h"\r
+                               RelativePath="..\..\include\wx\generic\panelg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\scrolbar.h"\r
+                               RelativePath="..\..\include\wx\generic\printps.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\scrthumb.h"\r
+                               RelativePath="..\..\include\wx\generic\prntdlgg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\scrtimer.h"\r
+                               RelativePath="..\..\include\wx\generic\progdlgg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\slider.h"\r
+                               RelativePath="..\..\include\wx\generic\propdlg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\spinbutt.h"\r
+                               RelativePath="..\..\include\wx\generic\richmsgdlgg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\statbmp.h"\r
+                               RelativePath="..\..\include\wx\generic\sashwin.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\statbox.h"\r
+                               RelativePath="..\..\include\wx\generic\scrolwin.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\statline.h"\r
+                               RelativePath="..\..\include\wx\generic\spinctlg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\stattext.h"\r
+                               RelativePath="..\..\include\wx\generic\splash.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\statusbr.h"\r
+                               RelativePath="..\..\include\wx\generic\splitter.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\stdrend.h"\r
+                               RelativePath="..\..\include\wx\generic\srchctlg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\textctrl.h"\r
+                               RelativePath="..\..\include\wx\generic\statbmpg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\tglbtn.h"\r
+                               RelativePath="..\..\include\wx\generic\stattextg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\theme.h"\r
+                               RelativePath="..\..\include\wx\generic\textdlgg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\toolbar.h"\r
+                               RelativePath="..\..\include\wx\generic\timectrl.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\toplevel.h"\r
+                               RelativePath="..\..\include\wx\generic\treectlg.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\univ\window.h"\r
+                               RelativePath="..\..\include\wx\generic\wizard.h"\r
                                 >\r
                         </File>\r
                 </Filter>\r
                                 >\r
                         </File>\r
                 </Filter>\r
@@ -4682,6 +2450,10 @@
                                 RelativePath="..\..\include\wx\html\m_templ.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\html\winpars.h"\r
                                 >\r
@@ -4707,6 +2479,14 @@
                                 RelativePath="..\..\include\wx\propgrid\advprops.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\anidecod.h"\r
                                 >\r
@@ -4719,6 +2499,18 @@
                                 RelativePath="..\..\include\wx\animdecod.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\artprov.h"\r
                                 >\r
@@ -4735,6 +2527,14 @@
                                 RelativePath="..\..\include\wx\aui\auibook.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\bitmap.h"\r
                                 >\r
@@ -4751,6 +2551,10 @@
                                 RelativePath="..\..\include\wx\bookctrl.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\bookctrl.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\bookctrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\brush.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\brush.h"\r
                                 >\r
@@ -4764,7 +2568,7 @@
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\cairo.h"\r
+                               RelativePath="..\..\include\wx\ribbon\buttonbar.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
@@ -4823,6 +2627,10 @@
                                 RelativePath="..\..\include\wx\colour.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\combo.h"\r
                                 >\r
@@ -4831,10 +2639,22 @@
                                 RelativePath="..\..\include\wx\combobox.h"\r
                                 >\r
                         </File>\r
                                 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\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
                         <File\r
                                 RelativePath="..\..\include\wx\cshelp.h"\r
                                 >\r
@@ -4847,6 +2667,10 @@
                                 RelativePath="..\..\include\wx\cursor.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\cursor.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\custombgwin.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dataobj.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\dataobj.h"\r
                                 >\r
@@ -4863,6 +2687,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\dc.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\dc.h"\r
                                 >\r
@@ -4951,6 +2779,10 @@
                                 RelativePath="..\..\include\wx\dragimag.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\dragimag.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dvrenderers.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\editlbox.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\editlbox.h"\r
                                 >\r
@@ -4968,7 +2800,7 @@
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\evtloop.h"\r
+                               RelativePath="..\..\include\wx\evtloopsrc.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 >\r
                         </File>\r
                         <File\r
@@ -4983,6 +2815,10 @@
                                 RelativePath="..\..\include\wx\filedlg.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\filepicker.h"\r
                                 >\r
@@ -4999,6 +2835,10 @@
                                 RelativePath="..\..\include\wx\font.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\fontdlg.h"\r
                                 >\r
@@ -5023,6 +2863,10 @@
                                 RelativePath="..\..\include\wx\aui\framemanager.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\gauge.h"\r
                                 >\r
@@ -5147,6 +2991,14 @@
                                 RelativePath="..\..\include\wx\imagxpm.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\imagxpm.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               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
                         <File\r
                                 RelativePath="..\..\include\wx\joystick.h"\r
                                 >\r
@@ -5207,6 +3059,14 @@
                                 RelativePath="..\..\include\wx\minifram.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\minifram.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\modalhook.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\mousemanager.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msgdlg.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\msgdlg.h"\r
                                 >\r
@@ -5243,6 +3103,10 @@
                                 RelativePath="..\..\include\wx\ownerdrw.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\palette.h"\r
                                 >\r
@@ -5251,6 +3115,10 @@
                                 RelativePath="..\..\include\wx\panel.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\paper.h"\r
                                 >\r
@@ -5259,6 +3127,10 @@
                                 RelativePath="..\..\include\wx\pen.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\pen.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\pickerbase.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\pickerbase.h"\r
                                 >\r
@@ -5327,6 +3199,10 @@
                                 RelativePath="..\..\include\wx\radiobut.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\rawbmp.h"\r
                                 >\r
@@ -5343,14 +3219,38 @@
                                 RelativePath="..\..\include\wx\renderer.h"\r
                                 >\r
                         </File>\r
                                 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\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\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
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextformatdlg.h"\r
                                 >\r
@@ -5359,14 +3259,38 @@
                                 RelativePath="..\..\include\wx\richtext\richtexthtml.h"\r
                                 >\r
                         </File>\r
                                 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\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\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
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextstyles.h"\r
                                 >\r
@@ -5375,10 +3299,22 @@
                                 RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtexttabspage.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\richtext\richtextxml.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtooltip.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\sashwin.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\sashwin.h"\r
                                 >\r
@@ -5403,6 +3339,10 @@
                                 RelativePath="..\..\include\wx\settings.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\settings.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\simplebook.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\sizer.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\sizer.h"\r
                                 >\r
@@ -5427,6 +3367,10 @@
                                 RelativePath="..\..\include\wx\splash.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\splitter.h"\r
                                 >\r
@@ -5459,6 +3403,10 @@
                                 RelativePath="..\..\include\wx\stc\stc.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\stc\stc.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\aui\tabart.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\aui\tabmdi.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\aui\tabmdi.h"\r
                                 >\r
@@ -5471,6 +3419,10 @@
                                 RelativePath="..\..\include\wx\tbarbase.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\textctrl.h"\r
                                 >\r
@@ -5483,10 +3435,18 @@
                                 RelativePath="..\..\include\wx\textentry.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\textentry.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\textwrapper.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tglbtn.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tglbtn.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\timectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tipdlg.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\tipdlg.h"\r
                                 >\r
@@ -5495,6 +3455,10 @@
                                 RelativePath="..\..\include\wx\tipwin.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\toolbar.h"\r
                                 >\r
@@ -5507,6 +3471,10 @@
                                 RelativePath="..\..\include\wx\tooltip.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\tooltip.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\toplevel.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\toplevel.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\toplevel.h"\r
                                 >\r
@@ -5515,6 +3483,10 @@
                                 RelativePath="..\..\include\wx\treebase.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\treebase.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\treebook.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\treebook.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\treebook.h"\r
                                 >\r
@@ -5523,6 +3495,14 @@
                                 RelativePath="..\..\include\wx\treectrl.h"\r
                                 >\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
                         <File\r
                                 RelativePath="..\..\include\wx\valgen.h"\r
                                 >\r
@@ -5531,6 +3511,10 @@
                                 RelativePath="..\..\include\wx\validate.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\valtext.h"\r
                                 >\r
@@ -5551,6 +3535,22 @@
                                 RelativePath="..\..\include\wx\vscroll.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\vscroll.h"\r
                                 >\r
                         </File>\r
+                       <File\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\webviewfshandler.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
                                 RelativePath="..\..\include\wx\window.h"\r
                                 >\r
@@ -5559,6 +3559,10 @@
                                 RelativePath="..\..\include\wx\windowid.h"\r
                                 >\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
                         <File\r
                                 RelativePath="..\..\include\wx\wizard.h"\r
                                 >\r
@@ -5583,6 +3587,14 @@
                                 RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_auinotbk.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
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_bmp.h"\r
                                 >\r
@@ -5623,6 +3635,10 @@
                                 RelativePath="..\..\include\wx\xrc\xh_clrpicker.h"\r
                                 >\r
                         </File>\r
                                 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
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_collpane.h"\r
                                 >\r
@@ -5631,6 +3647,10 @@
                                 RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_comboctrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                 >\r
@@ -5643,6 +3663,14 @@
                                 RelativePath="..\..\include\wx\xrc\xh_dlg.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\xrc\xh_dlg.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_editlbox.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_filectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_filepicker.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_filepicker.h"\r
                                 >\r
@@ -5723,6 +3751,14 @@
                                 RelativePath="..\..\include\wx\xrc\xh_radbx.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\xrc\xh_radbx.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_ribbon.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_richtext.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_scrol.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_scrol.h"\r
                                 >\r
@@ -5779,10 +3815,18 @@
                                 RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\xrc\xh_tglbtn.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r
                                 >\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_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
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tree.h"\r
                                 >\r
@@ -5803,6 +3847,10 @@
                                 RelativePath="..\..\include\wx\xrc\xmlres.h"\r
                                 >\r
                         </File>\r
                                 RelativePath="..\..\include\wx\xrc\xmlres.h"\r
                                 >\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xmlreshandler.h"\r
+                               >\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xpmdecod.h"\r
                                 >\r
                         <File\r
                                 RelativePath="..\..\include\wx\xpmdecod.h"\r
                                 >\r
@@ -5812,6 +3860,16 @@
                                 >\r
                         </File>\r
                 </Filter>\r
                                 >\r
                         </File>\r
                 </Filter>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\xrc\xmlreshandler.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
         </Files>\r
         <Globals>\r
                 \r
         </Files>\r
         <Globals>\r
                 \r