X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7ebaf0ddd8556929c923329e4d61cb0b6520109..9a237e2f12b18f75b2602052dedeee5650180a7c:/build/msw/wx_vc7_adv.vcproj

diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj
index ef4603bbb0..ecfa5714ff 100644
--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -2,7 +2,7 @@
 <!--
 
   This project was generated by
-  Bakefile 0.2.8 (http://www.bakefile.org)
+  Bakefile 0.2.9 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -88,7 +88,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
@@ -109,7 +109,7 @@
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_UNICODE;WXBUILDING"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -119,7 +119,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
@@ -205,7 +205,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
@@ -226,7 +226,7 @@
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -236,7 +236,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
@@ -273,7 +273,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"
 				ObjectFile="vc_mswuddll\adv\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291ud_adv_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -284,13 +284,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw291ud_adv_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291ud_adv_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -304,7 +304,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
@@ -330,7 +330,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
@@ -338,7 +338,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"
 				ObjectFile="vc_mswudll\adv\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -349,19 +349,19 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw291u_adv_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -371,7 +371,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw291u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
@@ -408,7 +408,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch"
 				ObjectFile="vc_mswunivuddll\adv\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291ud_adv_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -419,13 +419,13 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"
-				OutputFile="..\..\lib\vc_dll\wxmswuniv291ud_adv_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.dll"
 				LinkIncremental="2"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291ud_adv_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -439,7 +439,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
@@ -465,7 +465,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"
-				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
@@ -473,7 +473,7 @@
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				PrecompiledHeaderFile="vc_mswunivudll\wxprec_advdll.pch"
 				ObjectFile="vc_mswunivudll\adv\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.pdb"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -484,19 +484,19 @@
 				Name="VCLinkerTool"
 				AdditionalOptions=""
 				AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"
-				OutputFile="..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.dll"
+				OutputFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.dll"
 				LinkIncremental="1"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\..\lib\vc_dll"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv291u_adv_vc_custom.pdb"
+				ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb"
 				TargetMachine="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@@ -506,7 +506,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv291u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
+				PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>
 			<Tool
@@ -591,10 +591,19 @@
 						UsePrecompiledHeader="1"/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\src\common\gridcmn.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\common\hyperlnkcmn.cpp">
 			</File>
 			<File
+				RelativePath="..\..\src\common\odcombocmn.cpp">
+			</File>
+			<File
+				RelativePath="..\..\src\common\richtooltipcmn.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src\common\taskbarcmn.cpp">
 			</File>
 		</Filter>
@@ -634,6 +643,21 @@
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
+			<File
+				RelativePath="..\..\src\msw\commandlinkbutton.cpp">
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\datecontrols.cpp">
 				<FileConfiguration
@@ -664,6 +688,36 @@
 					Name="DLL Universal Release|Win32"
 					ExcludedFromBuild="TRUE"/>
 			</File>
+			<File
+				RelativePath="..\..\src\msw\datetimectrl.cpp">
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
+				RelativePath="..\..\src\msw\hyperlink.cpp">
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\joystick.cpp">
 			</File>
@@ -671,12 +725,102 @@
 				RelativePath="..\..\src\msw\notifmsg.cpp">
 			</File>
 			<File
+				RelativePath="..\..\src\msw\richtooltip.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\adv\msw_richtooltip.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\adv\msw_richtooltip.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\adv\msw_richtooltip.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\adv\msw_richtooltip.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\adv\msw_richtooltip.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\adv\msw_richtooltip.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\adv\msw_richtooltip.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\adv\msw_richtooltip.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\..\src\msw\sound.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\msw\taskbar.cpp">
 			</File>
 			<File
+				RelativePath="..\..\src\msw\timectrl.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\adv\msw_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\adv\msw_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\adv\msw_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\adv\msw_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="TRUE"/>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="TRUE"/>
+			</File>
+			<File
 				RelativePath="..\..\src\msw\version.rc">
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -701,12 +845,18 @@
 			<File
 				RelativePath="..\..\src\generic\animateg.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\generic\bannerwindow.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\generic\bmpcboxg.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\generic\calctrlg.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\generic\commandlinkbuttong.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\generic\datavgen.cpp">
 			</File>
@@ -734,9 +884,6 @@
 			<File
 				RelativePath="..\..\src\generic\hyperlinkg.cpp">
 			</File>
-			<File
-				RelativePath="..\..\src\generic\infobar.cpp">
-			</File>
 			<File
 				RelativePath="..\..\src\generic\laywin.cpp">
 			</File>
@@ -750,14 +897,119 @@
 				RelativePath="..\..\src\generic\propdlg.cpp">
 			</File>
 			<File
+				RelativePath="..\..\src\generic\richtooltip.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\adv\generic_richtooltip.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\adv\generic_richtooltip.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\adv\generic_richtooltip.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\adv\generic_richtooltip.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\adv\generic_richtooltip.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\adv\generic_richtooltip.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\adv\generic_richtooltip.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\adv\generic_richtooltip.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\..\src\generic\sashwin.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\generic\splash.cpp">
 			</File>
 			<File
+				RelativePath="..\..\src\generic\timectrl.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswud\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswu\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivud\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivu\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswuddll\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswudll\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivuddll\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="vc_mswunivudll\adv\generic_timectrl.obj"/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\..\src\generic\tipdlg.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\generic\treelist.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\generic\wizard.cpp">
 			</File>
@@ -773,8 +1025,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32">
@@ -782,8 +1033,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Debug|Win32"/>
@@ -795,8 +1045,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Release|Win32">
@@ -804,8 +1053,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Universal Debug|Win32"/>
@@ -824,8 +1072,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Universal Release|Win32">
@@ -833,8 +1080,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"/>
@@ -846,8 +1092,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Universal Release|Win32">
@@ -855,8 +1100,7 @@
 						Name="VCCustomBuildTool"
 						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
 						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"/>
+						Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"/>
 				</FileConfiguration>
 			</File>
 		</Filter>
@@ -869,10 +1113,16 @@
 			<File
 				RelativePath="..\..\include\wx\msw\calctrl.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\commandlinkbutton.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\datectrl.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\msw\datetimectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\msw\genrcdefs.h">
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -947,6 +1197,9 @@
 						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\hyperlink.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\joystick.h">
 			</File>
@@ -959,6 +1212,9 @@
 			<File
 				RelativePath="..\..\include\wx\msw\taskbar.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\msw\timectrl.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="Generic Headers"
@@ -981,6 +1237,12 @@
 			<File
 				RelativePath="..\..\include\wx\generic\datectrl.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\dvrenderer.h">
+			</File>
+			<File
+				RelativePath="..\..\include\wx\generic\dvrenderers.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\grid.h">
 			</File>
@@ -999,9 +1261,6 @@
 			<File
 				RelativePath="..\..\include\wx\generic\hyperlink.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\infobar.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\laywin.h">
 			</File>
@@ -1018,6 +1277,9 @@
 				RelativePath="..\..\include\wx\generic\splash.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\generic\timectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\generic\wizard.h">
 			</File>
 		</Filter>
@@ -1030,12 +1292,18 @@
 			<File
 				RelativePath="..\..\include\wx\animate.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\bannerwindow.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\bmpcbox.h">
 			</File>
 			<File
 				RelativePath="..\..\include\wx\calctrl.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\commandlinkbutton.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\dataview.h">
 			</File>
@@ -1048,6 +1316,9 @@
 			<File
 				RelativePath="..\..\include\wx\dcbuffer.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\dvrenderers.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\editlbox.h">
 			</File>
@@ -1057,9 +1328,6 @@
 			<File
 				RelativePath="..\..\include\wx\hyperlink.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\infobar.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\joystick.h">
 			</File>
@@ -1076,6 +1344,9 @@
 				RelativePath="..\..\include\wx\propdlg.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\richtooltip.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\sashwin.h">
 			</File>
 			<File
@@ -1088,8 +1359,14 @@
 				RelativePath="..\..\include\wx\taskbar.h">
 			</File>
 			<File
+				RelativePath="..\..\include\wx\timectrl.h">
+			</File>
+			<File
 				RelativePath="..\..\include\wx\tipdlg.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\treelist.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\wizard.h">
 			</File>