]> git.saurik.com Git - wxWidgets.git/blobdiff - build/msw/wx_vc9_adv.vcproj
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
using button impl
[wxWidgets.git] / build / msw / wx_vc9_adv.vcproj
diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj
index 24233502bcb705d976e7784ee3a3c3a52c05ce17..9ba84db6ebb4146a7b9498e8529de9037f3014dd 100644 (file)
--- a/build/msw/wx_vc9_adv.vcproj
+++ b/build/msw/wx_vc9_adv.vcproj
@@ -44,7 +44,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
@@ -52,7 +52,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -72,7 +72,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
@@ -128,7 +128,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
@@ -136,7 +136,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -154,7 +154,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
@@ -210,7 +210,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
@@ -218,7 +218,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -238,7 +238,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
@@ -294,7 +294,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
@@ -302,7 +302,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -320,7 +320,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
@@ -376,7 +376,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
@@ -384,7 +384,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -394,7 +394,7 @@
                                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
                                DebugInformationFormat="3"\r
@@ -404,7 +404,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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
                        />\r
@@ -415,14 +415,14 @@
                                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
+                               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
                                GenerateManifest="true"\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
                        />\r
                        <Tool\r
@@ -469,7 +469,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
@@ -477,7 +477,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -485,7 +485,7 @@
                                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
                                DebugInformationFormat="3"\r
@@ -495,7 +495,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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
                        />\r
@@ -506,14 +506,14 @@
                                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
+                               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
                                GenerateManifest="true"\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
@@ -562,7 +562,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
@@ -570,7 +570,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -580,7 +580,7 @@
                                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
                                DebugInformationFormat="3"\r
@@ -590,7 +590,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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
                        />\r
@@ -601,14 +601,14 @@
                                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
+                               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
                                GenerateManifest="true"\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
                        />\r
                        <Tool\r
@@ -655,7 +655,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
                        />\r
                        <Tool\r
@@ -663,7 +663,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -671,7 +671,7 @@
                                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
                                DebugInformationFormat="3"\r
@@ -681,7 +681,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__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
                        />\r
@@ -692,14 +692,14 @@
                                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
+                               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
                                GenerateManifest="true"\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
@@ -825,22 +825,22 @@
                        <File\r
                                RelativePath="..\..\src\common\hyperlnkcmn.cpp"\r
                                >\r
-                       </File>
-                       <File
-                               RelativePath="..\..\src\common\odcombocmn.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\common\richtooltipcmn.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\common\taskbarcmn.cpp"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="MSW Sources"
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\odcombocmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\richtooltipcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\taskbarcmn.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="MSW Sources"\r
                        UniqueIdentifier="{D030D8C2-53EE-5B96-8F89-D78157B06140}"\r
                        >\r
                        <File\r
@@ -942,38 +942,38 @@
                                        Name="DLL Universal Debug|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
-                               <FileConfiguration
-                                       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\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\datetimectrl.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\hyperlink.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
                                <FileConfiguration\r
                                        Name="Universal Release|Win32"\r
                                        ExcludedFromBuild="true"\r
@@ -990,146 +990,50 @@
                        <File\r
                                RelativePath="..\..\src\msw\joystick.cpp"\r
                                >\r
-                       </File>
-                       <File
-                               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"
-                                       ExcludedFromBuild="true"
-                               />
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\notifmsg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\richtooltip.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\sound.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\taskbar.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\timectrl.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\msw\version.rc"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="true"\r
+                               />\r
                                <FileConfiguration\r
                                        Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
@@ -1219,162 +1123,34 @@
                        <File\r
                                RelativePath="..\..\src\generic\odcombo.cpp"\r
                                >\r
-                       </File>
-                       <File
-                               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>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\propdlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\richtooltipg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\sashwin.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\splash.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\timectrlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\tipdlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\generic\treelist.cpp"\r
+                               >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\generic\wizard.cpp"\r
@@ -1513,22 +1289,22 @@
                        <File\r
                                RelativePath="..\..\include\wx\msw\commandlinkbutton.h"\r
                                >\r
-                       </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"
-                                       >
-                                       <Tool
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\datetimectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
                                                Name="VCCustomBuildTool"\r
                                                Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
                                                CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
@@ -1628,22 +1404,22 @@
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\sound.h"\r
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\taskbar.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\msw\timectrl.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Generic Headers"
-                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
-                       >
-                       <File
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\taskbar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\timectrl.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Generic Headers"\r
+                       UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"\r
+                       >\r
+                       <File\r
                                RelativePath="..\..\include\wx\generic\aboutdlgg.h"\r
                                >\r
                        </File>\r
@@ -1714,22 +1490,22 @@
                        <File\r
                                RelativePath="..\..\include\wx\generic\sashwin.h"\r
                                >\r
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\generic\splash.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\generic\timectrl.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\generic\wizard.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Common Headers"
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\splash.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\generic\wizard.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Common Headers"\r
                        UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}"\r
                        >\r
                        <File\r
@@ -1763,22 +1539,22 @@
                        <File\r
                                RelativePath="..\..\include\wx\datectrl.h"\r
                                >\r
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\dateevt.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\datetimectrl.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\dcbuffer.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\dvrenderers.h"
-                               >
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dateevt.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\datetimectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dcbuffer.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\dvrenderers.h"\r
+                               >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\editlbox.h"\r
@@ -1807,42 +1583,42 @@
                        <File\r
                                RelativePath="..\..\include\wx\odcombo.h"\r
                                >\r
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\propdlg.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\richtooltip.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\sashwin.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\include\wx\sound.h"
-                               >
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\propdlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\richtooltip.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\sashwin.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\sound.h"\r
+                               >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\splash.h"\r
                                >\r
-                       </File>
-                       <File
-                               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>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\taskbar.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\timectrl.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\tipdlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\treelist.h"\r
+                               >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\wizard.h"\r
wxWidgets (Impactor)