add wrappers to avoid compiling code which will never be used

[wxWidgets.git] / tests / test_vc9_test_gui.vcproj

diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj
index e9c44cc253981642c482e036bee7f201ef35a574..df66968922b565f5b9a500c159833add2cf7e63e 100644 (file)
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.9 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -43,8 +43,8 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
@@ -52,7 +52,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -72,7 +72,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
                        />\r
@@ -82,7 +82,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
+                               AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                OutputFile="vc_mswud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
@@ -139,8 +139,8 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
@@ -148,7 +148,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -166,7 +166,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
                        />\r
@@ -176,9 +176,9 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
+                               AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                OutputFile="vc_mswu\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -186,6 +186,8 @@
                                ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -233,8 +235,8 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
@@ -242,7 +244,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -262,7 +264,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
                        />\r
@@ -272,7 +274,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
+                               AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                OutputFile="vc_mswunivud\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
@@ -329,8 +331,8 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
@@ -338,7 +340,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -356,7 +358,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
                        />\r
@@ -366,9 +368,9 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
+                               AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                OutputFile="vc_mswunivu\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
@@ -376,6 +378,8 @@
                                ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -423,8 +427,8 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
@@ -432,7 +436,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -452,7 +456,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
                        />\r
@@ -462,7 +466,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
+                               AdditionalDependencies="wxmsw29ud_webview.lib wxmsw29ud_richtext.lib  wxmsw29ud_media.lib  wxmsw29ud_xrc.lib  wxbase29ud_xml.lib  wxmsw29ud_adv.lib  wxmsw29ud_html.lib  wxmsw29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                OutputFile="vc_mswuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
@@ -519,8 +523,8 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
@@ -528,7 +532,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -546,7 +550,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
                        />\r
@@ -556,9 +560,9 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
+                               AdditionalDependencies="wxmsw29u_webview.lib wxmsw29u_richtext.lib  wxmsw29u_media.lib  wxmsw29u_xrc.lib  wxbase29u_xml.lib  wxmsw29u_adv.lib  wxmsw29u_html.lib  wxmsw29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                OutputFile="vc_mswudll\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -566,6 +570,8 @@
                                ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -613,8 +619,8 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
@@ -622,7 +628,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -642,7 +648,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
                        />\r
@@ -652,7 +658,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
+                               AdditionalDependencies="wxmswuniv29ud_webview.lib wxmswuniv29ud_richtext.lib  wxmswuniv29ud_media.lib  wxmswuniv29ud_xrc.lib  wxbase29ud_xml.lib  wxmswuniv29ud_adv.lib  wxmswuniv29ud_html.lib  wxmswuniv29ud_core.lib  wxbase29ud_net.lib  wxbase29ud.lib   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"\r
                                OutputFile="vc_mswunivuddll\test_gui.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
@@ -709,8 +715,8 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
-                               Name="VCIDLTool"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
                        />\r
                        <Tool\r
@@ -718,7 +724,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -736,7 +742,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
                        />\r
@@ -746,9 +752,9 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
-                               AdditionalDependencies="wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
+                               AdditionalDependencies="wxmswuniv29u_webview.lib wxmswuniv29u_richtext.lib  wxmswuniv29u_media.lib  wxmswuniv29u_xrc.lib  wxbase29u_xml.lib  wxmswuniv29u_adv.lib  wxmswuniv29u_html.lib  wxmswuniv29u_core.lib  wxbase29u_net.lib  wxbase29u.lib   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"\r
                                OutputFile="vc_mswunivudll\test_gui.exe"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
@@ -756,6 +762,8 @@
                                ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -791,6 +799,58 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
+                       <File\r
+                               RelativePath=".\menu\accelentry.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\graphics\affinematrix.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\asserthelper.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\graphics\bitmap.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\bitmapcomboboxtest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\bitmaptogglebuttontest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\bookctrlbasetest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\sizers\boxsizer.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\buttontest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\checkboxtest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\checklistboxtest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\choicebooktest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\choicetest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\window\clientsize.cpp"\r
                                >\r
@@ -800,10 +860,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\graphics\colour.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath=".\graphics\colour.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\controls\comboboxtest.cpp"\r
                                >\r
                        </File>\r
@@ -811,6 +871,18 @@
                                RelativePath=".\config\config.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\controls\dataviewctrltest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\datepickerctrltest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\dialogtest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\dummy.cpp"\r
                                >\r
@@ -879,14 +951,30 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\graphics\ellipsization.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\font\fonttest.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\controls\frametest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\misc\garbage.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\controls\gaugetest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\gridtest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\misc\guifuncs.cpp"\r
                                >\r
@@ -895,22 +983,86 @@
                                RelativePath=".\controls\headerctrltest.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\controls\htmllboxtest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\html\htmlparser.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\html\htmlwindow.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\controls\hyperlinkctrltest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\image\image.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\controls\itemcontainertest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\events\keyboard.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\label.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\listbasetest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\listbooktest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\listboxtest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\controls\listctrltest.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\controls\listviewtest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\markuptest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\graphics\measuring.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\menu\menu.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\notebooktest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\ownerdrawncomboboxtest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\pickerbasetest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\pickertest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\geometry\point.cpp"\r
                                >\r
@@ -919,14 +1071,34 @@
                                RelativePath=".\events\propagation.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\controls\radioboxtest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\radiobuttontest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\image\rawbmp.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\controls\rearrangelisttest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\geometry\rect.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\geometry\region.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\richtextctrltest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\misc\selstoretest.cpp"\r
                                >\r
@@ -943,14 +1115,30 @@
                                RelativePath=".\geometry\size.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\controls\slidertest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\net\socket.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\controls\spinctrldbltest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\spinctrltest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\test.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\testableframe.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\controls\textctrltest.cpp"\r
                                >\r
@@ -959,10 +1147,54 @@
                                RelativePath=".\controls\textentrytest.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\controls\togglebuttontest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\toolbooktest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\toplevel\toplevel.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\treebooktest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\controls\treectrltest.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\controls\treelistctrltest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\validators\valnum.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\virtlistctrltest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\webtest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\windowtest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\sizers\wrapsizer.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\xml\xrctest.cpp"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r