simplify code setting backing pixmap

[wxWidgets.git] / build / msw / wx_vc7_adv.vcproj

diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj
index 5f8489eecad23247ef389e1b6c640a3df9e1a772..eeb06c77df053964a2ae19bd1b1dd8dc5f167dfb 100644 (file)
--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -273,7 +273,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswuddll\adv\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswuddll\adv\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295ud_adv_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -283,14 +283,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.dll"\r
+                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw295ud_adv_vc_custom.dll"\r

                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_adv.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295ud_adv_vc_custom.pdb"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r


@@ -304,7 +304,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <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


@@ -338,7 +338,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswudll\adv\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswudll\adv\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw295u_adv_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -348,14 +348,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.dll"\r
+                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw295u_adv_vc_custom.dll"\r

                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmsw29u_adv.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw295u_adv_vc_custom.pdb"\r

                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r


@@ -371,7 +371,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw295u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <Tool\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
                        <Tool\r


@@ -408,7 +408,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswunivuddll\adv\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswunivuddll\adv\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv295ud_adv_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -418,14 +418,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.dll"\r
+                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv295ud_adv_vc_custom.dll"\r

                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                LinkIncremental="2"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_adv.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295ud_adv_vc_custom.pdb"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r


@@ -439,7 +439,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <Tool\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
                        <Tool\r


@@ -473,7 +473,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswunivudll\adv\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\wxprec_advdll.pch"\r
                                ObjectFile="vc_mswunivudll\adv\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv295u_adv_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r


@@ -483,14 +483,14 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.dll"\r
+                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv295u_adv_vc_custom.dll"\r

                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r
                                LinkIncremental="1"\r
                                ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_adv.lib"\r
                                SuppressStartupBanner="TRUE"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_adv_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv295u_adv_vc_custom.pdb"\r

                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"/>\r


@@ -506,7 +506,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv295u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"/>\r
                        <Tool\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


@@ -601,9 +601,9 @@
                                RelativePath="..\..\src\common\odcombocmn.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\odcombocmn.cpp">\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\common\richtooltipcmn.cpp">
-                       </File>
-                       <File
+                               RelativePath="..\..\src\common\richtooltipcmn.cpp">\r
+                       </File>\r
+                       <File\r

                                RelativePath="..\..\src\common\taskbarcmn.cpp">\r
                        </File>\r
                </Filter>\r
                                RelativePath="..\..\src\common\taskbarcmn.cpp">\r
                        </File>\r
                </Filter>\r


@@ -689,21 +689,21 @@
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r
                                        ExcludedFromBuild="TRUE"/>\r
                        </File>\r
                        <File\r

-                               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\datetimectrl.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r

                                RelativePath="..\..\src\msw\hyperlink.cpp">\r
                                <FileConfiguration\r
                                        Name="Universal Debug|Win32"\r
                                RelativePath="..\..\src\msw\hyperlink.cpp">\r
                                <FileConfiguration\r
                                        Name="Universal Debug|Win32"\r


@@ -725,102 +725,30 @@
                                RelativePath="..\..\src\msw\notifmsg.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\notifmsg.cpp">\r
                        </File>\r
                        <File\r

-                               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\richtooltip.cpp">\r
+                       </File>\r
+                       <File\r

                                RelativePath="..\..\src\msw\sound.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\taskbar.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\sound.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\taskbar.cpp">\r
                        </File>\r
                        <File\r

-                               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\timectrl.cpp">\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="TRUE"/>\r
+                       </File>\r
+                       <File\r

                                RelativePath="..\..\src\msw\version.rc">\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r
                                RelativePath="..\..\src\msw\version.rc">\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r


@@ -897,114 +825,18 @@
                                RelativePath="..\..\src\generic\propdlg.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\propdlg.cpp">\r
                        </File>\r
                        <File\r

-                               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\richtooltipg.cpp">\r
+                       </File>\r
+                       <File\r

                                RelativePath="..\..\src\generic\sashwin.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\splash.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\sashwin.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\splash.cpp">\r
                        </File>\r
                        <File\r

-                               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\timectrlg.cpp">\r
+                       </File>\r
+                       <File\r

                                RelativePath="..\..\src\generic\tipdlg.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\tipdlg.cpp">\r
                        </File>\r
                        <File\r


@@ -1120,9 +952,9 @@
                                RelativePath="..\..\include\wx\msw\datectrl.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\datectrl.h">\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\include\wx\msw\datetimectrl.h">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h">\r
+                       </File>\r
+                       <File\r

                                RelativePath="..\..\include\wx\msw\genrcdefs.h">\r
                                <FileConfiguration\r
                                        Name="Debug|Win32">\r
                                RelativePath="..\..\include\wx\msw\genrcdefs.h">\r
                                <FileConfiguration\r
                                        Name="Debug|Win32">\r


@@ -1212,9 +1044,9 @@
                        <File\r
                                RelativePath="..\..\include\wx\msw\taskbar.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\taskbar.h">\r
                        </File>\r

-                       <File
-                               RelativePath="..\..\include\wx\msw\timectrl.h">
-                       </File>
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\timectrl.h">\r
+                       </File>\r

                </Filter>\r
                <Filter\r
                        Name="Generic Headers"\r
                </Filter>\r
                <Filter\r
                        Name="Generic Headers"\r


@@ -1277,9 +1109,9 @@
                                RelativePath="..\..\include\wx\generic\splash.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\generic\splash.h">\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\include\wx\generic\timectrl.h">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\generic\timectrl.h">\r
+                       </File>\r
+                       <File\r

                                RelativePath="..\..\include\wx\generic\wizard.h">\r
                        </File>\r
                </Filter>\r
                                RelativePath="..\..\include\wx\generic\wizard.h">\r
                        </File>\r
                </Filter>\r


@@ -1314,9 +1146,9 @@
                                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">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\datetimectrl.h">\r
+                       </File>\r
+                       <File\r

                                RelativePath="..\..\include\wx\dcbuffer.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\dcbuffer.h">\r
                        </File>\r
                        <File\r


@@ -1347,9 +1179,9 @@
                                RelativePath="..\..\include\wx\propdlg.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\propdlg.h">\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\include\wx\richtooltip.h">
-                       </File>
-                       <File
+                               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
                        <File\r


@@ -1362,9 +1194,9 @@
                                RelativePath="..\..\include\wx\taskbar.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\taskbar.h">\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\include\wx\timectrl.h">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\timectrl.h">\r
+                       </File>\r
+                       <File\r

                                RelativePath="..\..\include\wx\tipdlg.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\tipdlg.h">\r
                        </File>\r
                        <File\r