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

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

index 6d3367540e5430e145020dc63d1f2b2a1c01bdaf..395c3df11b3e6640e5b4a28c946d410f6633f96a 100644 (file)
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_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
@@ -17,82 +17,18 @@
         </Platforms>\r
         <Configurations>\r
                 <Configuration\r
         </Platforms>\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
-                       <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="TRUE"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               UsePrecompiledHeader="3"\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
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\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 ..\..\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
-                               GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\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
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="0"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\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;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
@@ -101,10 +37,9 @@
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\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
@@ -112,19 +47,13 @@
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\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 ..\..\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
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__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
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -133,9 +62,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\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;__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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -148,27 +77,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\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;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\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
@@ -176,19 +104,13 @@
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\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 ..\..\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
-                               SuppressStartupBanner="TRUE"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateDebugInformation="TRUE"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
-                               TargetMachine="1"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__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
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -197,9 +119,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__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
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -223,7 +145,7 @@
                                 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
                                 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;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
                                 MinimalRebuild="TRUE"\r
                                 ExceptionHandling="TRUE"\r
                                 BasicRuntimeChecks="3"\r
@@ -233,9 +155,8 @@
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch"\r
                                 UsePrecompiledHeader="3"\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
@@ -245,17 +166,19 @@
                         <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 ..\..\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
                                 GenerateDebugInformation="TRUE"\r
                                 LinkIncremental="2"\r
                                 ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_core.lib"\r
                                 SuppressStartupBanner="TRUE"\r
                                 AdditionalLibraryDirectories="..\..\lib\vc_dll"\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
                         <Tool\r
                                 TargetMachine="1"/>\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__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
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -264,7 +187,7 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\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;__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
                         <Tool\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
                         <Tool\r
@@ -279,86 +202,26 @@
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                 </Configuration>\r
                 <Configuration\r
                                 Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                         <Tool\r
                                 Name="VCCLCompilerTool"\r
                                 Optimization="2"\r
                         UseOfMFC="0"\r
                         ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
                         CharacterSet="1">\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;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\r
                                 PrecompiledHeaderThrough="wx/wxprec.h"\r
                                 ExceptionHandling="TRUE"\r
                                 RuntimeLibrary="2"\r
                                 RuntimeTypeInfo="TRUE"\r
                                 UsePrecompiledHeader="3"\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
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_core.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\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
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
-                       <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="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               UsePrecompiledHeader="3"\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
@@ -366,67 +229,23 @@
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCCustomBuildTool"/>\r
                         <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_core.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
-                       <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="TRUE"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               UsePrecompiledHeader="3"\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
+                               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
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29u_core.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"/>\r
                         <Tool\r
                         <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__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
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCPostBuildEventTool"/>\r
                         <Tool\r
@@ -435,68 +254,9 @@
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
                                 Name="VCPreLinkEventTool"/>\r
                         <Tool\r
                                 Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0"\r
+                               PreprocessorDefinitions="__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\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
-                       <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="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               UsePrecompiledHeader="3"\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
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\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
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
                         <Tool\r
                                 Name="VCWebServiceProxyGeneratorTool"/>\r
                         <Tool\r
@@ -522,6 +282,9 @@
                         <File\r
                                 RelativePath="..\..\src\common\accesscmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\accesscmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\affinematrix2d.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\anidecod.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\anidecod.cpp">\r
                         </File>\r
@@ -534,9 +297,15 @@
                         <File\r
                                 RelativePath="..\..\src\common\artstd.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\artstd.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\arttango.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\bmpbase.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\bmpbase.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\bmpbtncmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\bookctrl.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\bookctrl.cpp">\r
                         </File>\r
@@ -546,6 +315,12 @@
                         <File\r
                                 RelativePath="..\..\src\common\cairo.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\cairo.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\checkboxcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\checklstcmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\choiccmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\choiccmn.cpp">\r
                         </File>\r
@@ -564,6 +339,9 @@
                         <File\r
                                 RelativePath="..\..\src\common\colourcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\colourcmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\colourdata.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\combocmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\combocmn.cpp">\r
                         </File>\r
@@ -579,9 +357,6 @@
                         <File\r
                                 RelativePath="..\..\src\common\ctrlsub.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\ctrlsub.cpp">\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\src\common\datacmn.cpp">\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\dcbase.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\dcbase.cpp">\r
                         </File>\r
@@ -594,6 +369,9 @@
                         <File\r
                                 RelativePath="..\..\src\common\dcsvg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\dcsvg.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\dirctrlcmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\dlgcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\dlgcmn.cpp">\r
                         </File>\r
@@ -618,19 +396,13 @@
                         <File\r
                                 RelativePath="..\..\src\common\dummy.cpp">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\common\dummy.cpp">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32">\r
+                                       Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
@@ -642,25 +414,7 @@
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 UsePrecompiledHeader="1"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"/>\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
                                         <Tool\r
                                                 Name="VCCLCompilerTool"\r
                                                 UsePrecompiledHeader="1"/>\r
@@ -678,6 +432,9 @@
                         <File\r
                                 RelativePath="..\..\src\common\filectrlcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\filectrlcmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\filehistorycmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\filepickercmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\filepickercmn.cpp">\r
                         </File>\r
@@ -687,6 +444,9 @@
                         <File\r
                                 RelativePath="..\..\src\common\fontcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\fontcmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\fontdata.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\fontenumcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\fontenumcmn.cpp">\r
                         </File>\r
@@ -783,12 +543,18 @@
                         <File\r
                                 RelativePath="..\..\src\common\listctrlcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\listctrlcmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\markupparser.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\matrix.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\menucmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\matrix.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\menucmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\mousemanager.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\msgout.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\msgout.cpp">\r
                         </File>\r
@@ -798,9 +564,18 @@
                         <File\r
                                 RelativePath="..\..\src\common\overlaycmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\overlaycmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\ownerdrwcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\panelcmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\paper.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\paper.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\persist.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\pickerbase.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\pickerbase.cpp">\r
                         </File>\r
@@ -813,6 +588,9 @@
                         <File\r
                                 RelativePath="..\..\src\common\quantize.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\quantize.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\radiobtncmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\radiocmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\radiocmn.cpp">\r
                         </File>\r
@@ -825,18 +603,39 @@
                         <File\r
                                 RelativePath="..\..\src\common\rgncmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\rgncmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\scrolbarcmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\settcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\sizer.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\settcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\sizer.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\slidercmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\spinbtncmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\spinctrlcmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\srchcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\statbar.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\srchcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\statbar.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statbmpcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statboxcmn.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\statlinecmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\stattextcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\stattextcmn.cpp">\r
                         </File>\r
@@ -852,12 +651,18 @@
                         <File\r
                                 RelativePath="..\..\src\common\textentrycmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\textentrycmn.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\textmeasurecmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\toplvcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\treebase.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\toplvcmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\treebase.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\uiactioncmn.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\utilscmn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\utilscmn.cpp">\r
                         </File>\r
@@ -867,6 +672,9 @@
                         <File\r
                                 RelativePath="..\..\src\common\validate.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\validate.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\valnum.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\valtext.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\common\valtext.cpp">\r
                         </File>\r
@@ -888,51 +696,21 @@
                         UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">\r
                         <File\r
                                 RelativePath="..\..\src\msw\accel.cpp">\r
                         UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}">\r
                         <File\r
                                 RelativePath="..\..\src\msw\accel.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\access.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\access.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\ole\activex.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\anybutton.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\app.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\artmsw.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\app.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\artmsw.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\automtn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\automtn.cpp">\r
@@ -942,150 +720,42 @@
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\bmpbuttn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\bmpbuttn.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\brush.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\button.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\brush.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\button.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\caret.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\checkbox.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\caret.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\checkbox.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\checklst.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\checklst.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\choice.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\choice.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\clipbrd.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\colordlg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\clipbrd.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\colordlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\colour.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\combo.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\colour.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\combo.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\combobox.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\combobox.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\control.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\control.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\cursor.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\cursor.cpp">\r
@@ -1113,18 +783,6 @@
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\dialog.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\dialog.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\dialup.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\dialup.cpp">\r
@@ -1134,36 +792,12 @@
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\dirdlg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\dirdlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\display.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\dragimag.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\display.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\dragimag.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\dropsrc.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\dropsrc.cpp">\r
@@ -1179,51 +813,15 @@
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\fdrepdlg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\fdrepdlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\filedlg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\filedlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\font.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\fontdlg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\font.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\fontdlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\fontenum.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\fontenum.cpp">\r
@@ -1233,33 +831,9 @@
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\frame.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\frame.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\gauge.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\gauge.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\gdiimage.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\gdiimage.cpp">\r
@@ -1275,18 +849,6 @@
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\headerctrl.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\headerctrl.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\helpchm.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\helpchm.cpp">\r
@@ -1302,199 +864,61 @@
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\iniconf.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\iniconf.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\listbox.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\listbox.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\listctrl.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\listctrl.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\main.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\mdi.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\main.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\mdi.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\menu.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\menu.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\menuitem.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\menuitem.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\metafile.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\metafile.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\minifram.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\msgdlg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\minifram.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\msgdlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\mslu.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\nativdlg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\mslu.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\nativdlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\nativewin.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\nativewin.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\nonownedwnd.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\notebook.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\notebook.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\oleutils.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ownerdrw.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\oleutils.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ownerdrw.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\palette.cpp">\r
                         </File>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\palette.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\panel.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\pen.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\pen.cpp">\r
                         </File>\r
@@ -1507,35 +931,14 @@
                         <File\r
                                 RelativePath="..\..\src\msw\printwin.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\printwin.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\progdlg.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\radiobox.cpp">\r
                         <File\r
                                 RelativePath="..\..\src\msw\radiobox.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\radiobut.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\radiobut.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\region.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\region.cpp">\r
@@ -1543,218 +946,56 @@
                         <File\r
                                 RelativePath="..\..\src\msw\renderer.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\renderer.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\richmsgdlg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\ole\safearray.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\scrolbar.cpp">\r
                         <File\r
                                 RelativePath="..\..\src\msw\scrolbar.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\settings.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\slider.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\settings.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\slider.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\spinbutt.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\spinbutt.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\spinctrl.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\spinctrl.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statbmp.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statbmp.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statbox.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statbox.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statline.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statline.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\stattext.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\stattext.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statusbar.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\statusbar.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\msw\tabctrl.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\textctrl.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\textctrl.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\textentry.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\textentry.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\textmeasure.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\tglbtn.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\tglbtn.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\toolbar.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\toolbar.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\tooltip.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\tooltip.cpp">\r
@@ -1764,22 +1005,16 @@
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\treectrl.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\treectrl.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\uiaction.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\utilsgui.cpp">\r
                         </File>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\utilsgui.cpp">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\utilswin.cpp">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\uuid.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\ole\uuid.cpp">\r
                         </File>\r
@@ -1789,17 +1024,11 @@
                         <File\r
                                 RelativePath="..\..\src\msw\version.rc">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\src\msw\version.rc">\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
+                                       Name="Debug|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
                                         ExcludedFromBuild="TRUE"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32"\r
                                         ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\volume.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\msw\volume.cpp">\r
@@ -1811,21 +1040,6 @@
                 <Filter\r
                         Name="Generic Sources"\r
                         UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">\r
                 <Filter\r
                         Name="Generic Sources"\r
                         UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">\r
-                       <File\r
-                               RelativePath="..\..\src\generic\accel.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\busyinfo.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\busyinfo.cpp">\r
                         </File>\r
@@ -1844,21 +1058,6 @@
                         <File\r
                                 RelativePath="..\..\src\generic\collpaneg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\collpaneg.cpp">\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\colrdlgg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\combog.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\combog.cpp">\r
                         </File>\r
@@ -1868,138 +1067,42 @@
                         <File\r
                                 RelativePath="..\..\src\generic\dirctrlg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\dirctrlg.cpp">\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\dirdlgg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\dragimgg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\dragimgg.cpp">\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\fdrepdlg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\filectrlg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\filectrlg.cpp">\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\filedlgg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\filepickerg.cpp">\r
                         </File>\r
                         <File\r
                         <File\r
                                 RelativePath="..\..\src\generic\filepickerg.cpp">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\fontdlgg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\fontpickerg.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\fontpickerg.cpp">\r
+                               RelativePath="..\..\src\generic\graphicc.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\headerctrlg.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\headerctrlg.cpp">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\listbkg.cpp">\r
+                               RelativePath="..\..\src\generic\infobar.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\listctrl.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\listbkg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\logg.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\logg.cpp">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\mdig.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\markuptext.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\msgdlgg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\msgdlgg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\numdlgg.cpp">\r
                         </File>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\numdlgg.cpp">\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\panelg.cpp">\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\printps.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\printps.cpp">\r
                         </File>\r
@@ -2013,680 +1116,52 @@
                                 RelativePath="..\..\src\generic\renderg.cpp">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\src\generic\renderg.cpp">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\generic\scrlwing.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\selstore.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\spinctlg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\splitter.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\srchctlg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\statbmpg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\stattextg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\statusbr.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\tabg.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\textdlgg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\tipwin.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\toolbkg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\treebkg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\treectlg.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\vlbox.cpp">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\generic\vscroll.cpp">\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="wxUniv Sources"\r
-                       UniqueIdentifier="{6F354595-5EA6-5848-AAA1-6C4820DE7AEE}">\r
-                       <File\r
-                               RelativePath="..\..\src\univ\bmpbuttn.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\button.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\checkbox.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\checklst.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\choice.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\combobox.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\richmsgdlgg.cpp">\r
                         </File>\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\control.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\ctrlrend.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\dialog.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\framuniv.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\gauge.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\themes\gtk.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\inpcons.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\inphand.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\listbox.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\menu.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\themes\metal.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\themes\mono.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\notebook.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\radiobox.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\radiobut.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\scrarrow.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\scrolbar.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\scrthumb.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\settingsuniv.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\slider.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\spinbutt.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\univ\statbmp.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\scrlwing.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\statbox.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\selstore.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\statline.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\spinctlg.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\stattext.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\splitter.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\statusbr.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\srchctlg.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\stdrend.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\statbmpg.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\textctrl.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\stattextg.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\tglbtn.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\statusbr.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\theme.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\textdlgg.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\toolbar.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\tipwin.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\topluniv.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\toolbkg.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\themes\win32.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\treebkg.cpp">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\src\univ\winuniv.cpp">\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       ExcludedFromBuild="TRUE"/>\r
+                               RelativePath="..\..\src\generic\treectlg.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\vlbox.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\vscroll.cpp">\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
@@ -2695,96 +1170,48 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\setup.h">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\setup.h">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"/>\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32">\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
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Debug|Win32">\r
+                                       Name="Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
                                 </FileConfiguration>\r
                                 </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"/>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"/>\r
                                 <FileConfiguration\r
                                         Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\r
                                                 Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                                 CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                 <FileConfiguration\r
                                         Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
+                                               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
                                 </FileConfiguration>\r
                                 </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\setup.h">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\r
+                                       Name="DLL Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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\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
                                 </FileConfiguration>\r
                                 </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\setup.h">\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\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
-                               </FileConfiguration>\r
+                                       Name="Debug|Win32"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32"/>\r
+                                       Name="Release|Win32"/>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"/>\r
                                 <FileConfiguration\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32"/>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32">\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
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\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
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"/>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"/>\r
+                                       Name="DLL Release|Win32"/>\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
                         </File>\r
                 </Filter>\r
                 <Filter\r
@@ -2799,6 +1226,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\activex.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\activex.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\anybutton.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\app.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\app.h">\r
                         </File>\r
@@ -2850,6 +1280,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\combobox.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\combobox.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\commandlinkbutton.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\control.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\control.h">\r
                         </File>\r
@@ -2859,6 +1292,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\cursor.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\cursor.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\custombgwin.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\dataform.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\dataform.h">\r
                         </File>\r
@@ -2869,10 +1305,10 @@
                                 RelativePath="..\..\include\wx\msw\ole\dataobj2.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\dataobj2.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\datecontrols.h">\r
+                               RelativePath="..\..\include\wx\msw\datectrl.h">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\datectrl.h">\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\dc.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\dc.h">\r
@@ -2937,31 +1373,22 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h">\r
                                 <FileConfiguration\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\genrcdefs.h">\r
                                 <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32">\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
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32">\r
+                                       Name="Debug|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="DLL Release|Win32">\r
+                                       Name="Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32">\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                         Name="DLL Debug|Win32">\r
@@ -2973,40 +1400,13 @@
                                                 AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
                                                 AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>\r
                                 </FileConfiguration>\r
                                 <FileConfiguration\r
-                                       Name="Universal Release|Win32">\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
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32">\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
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32">\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
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32">\r
+                                       Name="DLL Release|Win32">\r
                                         <Tool\r
                                                 Name="VCCustomBuildTool"\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
                                 </FileConfiguration>\r
                         </File>\r
                         <File\r
                                 </FileConfiguration>\r
                         </File>\r
                         <File\r
@@ -3027,6 +1427,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\htmlhelp.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\htmlhelp.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\hyperlink.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\icon.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\icon.h">\r
                         </File>\r
@@ -3036,6 +1439,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\iniconf.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\iniconf.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\init.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\joystick.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\joystick.h">\r
                         </File>\r
@@ -3069,6 +1475,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\msvcrt.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\msvcrt.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\nonownedwnd.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\notebook.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\notebook.h">\r
                         </File>\r
@@ -3078,9 +1487,15 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\oleutils.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\ole\oleutils.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\ownerdrw.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\palette.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\palette.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\panel.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\pen.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\pen.h">\r
                         </File>\r
@@ -3093,6 +1508,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\printwin.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\printwin.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\progdlg.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\radiobox.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\radiobox.h">\r
                         </File>\r
@@ -3106,10 +1524,13 @@
                                 RelativePath="..\..\include\wx\msw\region.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\region.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\scrolbar.h">\r
+                               RelativePath="..\..\include\wx\msw\richmsgdlg.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\ole\safearray.h">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\msw\setup0.h">\r
+                               RelativePath="..\..\include\wx\msw\scrolbar.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\slider.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\slider.h">\r
@@ -3138,9 +1559,6 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\statusbar.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\statusbar.h">\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\msw\tabctrl.h">\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\taskbar.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\taskbar.h">\r
                         </File>\r
@@ -3153,6 +1571,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\tglbtn.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\tglbtn.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\timectrl.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\toolbar.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\toolbar.h">\r
                         </File>\r
@@ -3174,6 +1595,15 @@
                         <File\r
                                 RelativePath="..\..\include\wx\msw\uxthemep.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\uxthemep.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webview_ie.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webview_missing.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\webviewhistoryitem_ie.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\window.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msw\window.h">\r
                         </File>\r
@@ -3218,7 +1648,7 @@
                                 RelativePath="..\..\include\wx\generic\combo.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\combo.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\ctrlsub.h">\r
+                               RelativePath="..\..\include\wx\generic\custombgwin.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\dataview.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\dataview.h">\r
@@ -3232,27 +1662,21 @@
                         <File\r
                                 RelativePath="..\..\include\wx\generic\dirctrlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\dirctrlg.h">\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\dirdlgg.h">\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\dragimgg.h">\r
                         </File>\r
                         <File\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\dragimgg.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\fdrepdlg.h">\r
+                               RelativePath="..\..\include\wx\generic\dvrenderer.h">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\filectrlg.h">\r
+                               RelativePath="..\..\include\wx\generic\dvrenderers.h">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\filedlgg.h">\r
+                               RelativePath="..\..\include\wx\generic\filectrlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\filepickerg.h">\r
                         </File>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\filepickerg.h">\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\fontdlgg.h">\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\fontpickerg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\fontpickerg.h">\r
                         </File>\r
@@ -3262,6 +1686,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\generic\gridctrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\gridctrl.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\grideditors.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\gridsel.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\gridsel.h">\r
                         </File>\r
@@ -3275,17 +1702,14 @@
                                 RelativePath="..\..\include\wx\generic\hyperlink.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\hyperlink.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\laywin.h">\r
+                               RelativePath="..\..\include\wx\generic\infobar.h">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\listctrl.h">\r
+                               RelativePath="..\..\include\wx\generic\laywin.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\logg.h">\r
                         </File>\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\logg.h">\r
                         </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\mdig.h">\r
-                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\msgdlgg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\msgdlgg.h">\r
                         </File>\r
@@ -3313,6 +1737,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\generic\propdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\propdlg.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\richmsgdlgg.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\sashwin.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\sashwin.h">\r
                         </File>\r
@@ -3338,13 +1765,10 @@
                                 RelativePath="..\..\include\wx\generic\stattextg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\stattextg.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\statusbr.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\generic\tabg.h">\r
+                               RelativePath="..\..\include\wx\generic\textdlgg.h">\r
                         </File>\r
                         <File\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\generic\textdlgg.h">\r
+                               RelativePath="..\..\include\wx\generic\timectrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\treectlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\generic\treectlg.h">\r
@@ -3353,130 +1777,6 @@
                                 RelativePath="..\..\include\wx\generic\wizard.h">\r
                         </File>\r
                 </Filter>\r
                                 RelativePath="..\..\include\wx\generic\wizard.h">\r
                         </File>\r
                 </Filter>\r
-               <Filter\r
-                       Name="wxUniv Headers"\r
-                       UniqueIdentifier="{46168D7C-2783-50F3-AE9D-A740D5FF0B44}">\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\app.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\bmpbuttn.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\button.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\checkbox.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\checklst.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\chkconf.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\choice.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\colschem.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\combobox.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\control.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\dialog.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\frame.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\gauge.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\inpcons.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\inphand.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\listbox.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\menu.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\menuitem.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\notebook.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\radiobox.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\radiobut.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\renderer.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\scrarrow.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\scrolbar.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\scrthumb.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\scrtimer.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\slider.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\spinbutt.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\statbmp.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\statbox.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\statline.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\stattext.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\statusbr.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\stdrend.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\textctrl.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\tglbtn.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\theme.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\toolbar.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\toplevel.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\univ\window.h">\r
-                       </File>\r
-               </Filter>\r
                 <Filter\r
                         Name="wxHTML Headers"\r
                         UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">\r
                 <Filter\r
                         Name="wxHTML Headers"\r
                         UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">\r
@@ -3522,6 +1822,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\html\m_templ.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\html\m_templ.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\html\styleparams.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\html\winpars.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\html\winpars.h">\r
                         </File>\r
@@ -3541,6 +1844,12 @@
                         <File\r
                                 RelativePath="..\..\include\wx\propgrid\advprops.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\propgrid\advprops.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\affinematrix2d.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\affinematrix2dbase.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\anidecod.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\anidecod.h">\r
                         </File>\r
@@ -3550,6 +1859,15 @@
                         <File\r
                                 RelativePath="..\..\include\wx\animdecod.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\animdecod.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\anybutton.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\art.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\art_internal.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\artprov.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\artprov.h">\r
                         </File>\r
@@ -3562,6 +1880,12 @@
                         <File\r
                                 RelativePath="..\..\include\wx\aui\auibook.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\aui\auibook.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\bannerwindow.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\bar.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\bitmap.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\bitmap.h">\r
                         </File>\r
@@ -3574,6 +1898,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\bookctrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\bookctrl.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\bookctrl.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\brush.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\brush.h">\r
                         </File>\r
@@ -3584,7 +1911,7 @@
                                 RelativePath="..\..\include\wx\button.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\button.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\cairo.h">\r
+                               RelativePath="..\..\include\wx\ribbon\buttonbar.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\calctrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\calctrl.h">\r
@@ -3628,15 +1955,27 @@
                         <File\r
                                 RelativePath="..\..\include\wx\colour.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\colour.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\colourdata.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\combo.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\combobox.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\combo.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\combobox.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\commandlinkbutton.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\compositewin.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\control.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\control.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\control.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\cshelp.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\cshelp.h">\r
                         </File>\r
@@ -3646,6 +1985,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\cursor.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\cursor.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\custombgwin.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dataobj.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dataobj.h">\r
                         </File>\r
@@ -3658,6 +2000,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\dateevt.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dateevt.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datetimectrl.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dc.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dc.h">\r
                         </File>\r
@@ -3724,6 +2069,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\dragimag.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\dragimag.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dvrenderers.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\editlbox.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\editlbox.h">\r
                         </File>\r
@@ -3737,7 +2085,7 @@
                                 RelativePath="..\..\include\wx\encinfo.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\encinfo.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\evtloop.h">\r
+                               RelativePath="..\..\include\wx\evtloopsrc.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\fdrepdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\fdrepdlg.h">\r
@@ -3748,6 +2096,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\filedlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\filedlg.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\filehistory.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\filepicker.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\filepicker.h">\r
                         </File>\r
@@ -3760,6 +2111,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\font.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\font.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\fontdata.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\fontdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\fontdlg.h">\r
                         </File>\r
@@ -3778,6 +2132,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\aui\framemanager.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\aui\framemanager.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\gallery.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\gauge.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\gauge.h">\r
                         </File>\r
@@ -3871,6 +2228,12 @@
                         <File\r
                                 RelativePath="..\..\include\wx\imagxpm.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\imagxpm.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\infobar.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\itemid.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\joystick.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\joystick.h">\r
                         </File>\r
@@ -3916,6 +2279,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\minifram.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\minifram.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\mousemanager.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msgdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\msgdlg.h">\r
                         </File>\r
@@ -3943,18 +2309,27 @@
                         <File\r
                                 RelativePath="..\..\include\wx\ownerdrw.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\ownerdrw.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\page.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\palette.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\panel.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\palette.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\panel.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\panel.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\paper.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\pen.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\paper.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\pen.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\pickerbase.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\pickerbase.h">\r
                         </File>\r
@@ -4006,6 +2381,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\radiobut.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\radiobut.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\range.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\rawbmp.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\rawbmp.h">\r
                         </File>\r
@@ -4018,33 +2396,78 @@
                         <File\r
                                 RelativePath="..\..\include\wx\renderer.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\renderer.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richmsgdlg.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextbackgroundpage.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextborderspage.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextbuffer.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextbuffer.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextbulletspage.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextctrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextctrl.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextdialogpage.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextfontpage.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextformatdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtexthtml.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextformatdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtexthtml.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextimagedlg.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextindentspage.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextliststylepage.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextmarginspage.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextprint.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextprint.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextsizepage.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextstyledlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextstyledlg.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextstylepage.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextstyles.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextstyles.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextsymboldlg.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtexttabspage.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtext\richtextuicustomization.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextxml.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\richtext\richtextxml.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtooltip.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\sashwin.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\sashwin.h">\r
                         </File>\r
@@ -4063,6 +2486,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\settings.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\settings.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\simplebook.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\sizer.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\sizer.h">\r
                         </File>\r
@@ -4081,6 +2507,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\splash.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\splash.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\splitter.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\splitter.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\splitter.h">\r
                         </File>\r
@@ -4106,10 +2535,7 @@
                                 RelativePath="..\..\include\wx\stc\stc.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\stc\stc.h">\r
                         </File>\r
                         <File\r
-                               RelativePath="..\..\include\wx\tab.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\tabctrl.h">\r
+                               RelativePath="..\..\include\wx\aui\tabart.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\aui\tabmdi.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\aui\tabmdi.h">\r
@@ -4120,6 +2546,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\tbarbase.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tbarbase.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\textcompleter.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\textctrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\textctrl.h">\r
                         </File>\r
@@ -4129,15 +2558,24 @@
                         <File\r
                                 RelativePath="..\..\include\wx\textentry.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\textentry.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\textwrapper.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tglbtn.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tglbtn.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\timectrl.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tipdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tipwin.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tipdlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tipwin.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\ribbon\toolbar.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\toolbar.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\toolbar.h">\r
                         </File>\r
@@ -4147,24 +2585,39 @@
                         <File\r
                                 RelativePath="..\..\include\wx\tooltip.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\tooltip.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\toplevel.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\toplevel.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\treebase.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\toplevel.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\treebase.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\treebook.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\treebook.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\treectrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\treebook.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\treectrl.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\treelist.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\uiaction.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\valgen.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\validate.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\valgen.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\validate.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\valnum.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\valtext.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\valtext.h">\r
                         </File>\r
@@ -4180,12 +2633,27 @@
                         <File\r
                                 RelativePath="..\..\include\wx\vscroll.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\vscroll.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webview.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webviewarchivehandler.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webviewfshandler.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\persist\window.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\window.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\windowid.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\window.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\windowid.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\withimages.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\wizard.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\wizard.h">\r
                         </File>\r
@@ -4204,6 +2672,12 @@
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_animatctrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_animatctrl.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_auinotbk.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_bmp.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_bmp.h">\r
                         </File>\r
@@ -4234,12 +2708,18 @@
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_clrpicker.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_clrpicker.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_cmdlinkbn.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_collpane.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_combo.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_collpane.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_combo.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_comboctrl.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_datectrl.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_datectrl.h">\r
                         </File>\r
@@ -4249,6 +2729,12 @@
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_dlg.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_dlg.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_editlbox.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_filectrl.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_filepicker.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_filepicker.h">\r
                         </File>\r
@@ -4309,6 +2795,12 @@
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_radbx.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_radbx.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_ribbon.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_richtext.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_scrol.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_scrol.h">\r
                         </File>\r
@@ -4351,9 +2843,15 @@
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tglbtn.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_timectrl.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_toolb.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_toolb.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tree.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xh_tree.h">\r
                         </File>\r
@@ -4369,6 +2867,9 @@
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xmlres.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xrc\xmlres.h">\r
                         </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xmlreshandler.h">\r
+                       </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xpmdecod.h">\r
                         </File>\r
                         <File\r
                                 RelativePath="..\..\include\wx\xpmdecod.h">\r
                         </File>\r
@@ -4376,6 +2877,14 @@
                                 RelativePath="..\..\include\wx\xpmhand.h">\r
                         </File>\r
                 </Filter>\r
                                 RelativePath="..\..\include\wx\xpmhand.h">\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
+                       <File\r
+                               RelativePath="..\..\src\xrc\xmlreshandler.cpp">\r
+                       </File>\r
+               </Filter>\r
         </Files>\r
         <Globals>\r
                 \r
         </Files>\r
         <Globals>\r
                 \r