Get rid of ugly wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST macro.

[wxWidgets.git] / tests / test_vc8_test_gui.vcproj

diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj
index 65aa8f61de6de526ef6f8e3774ea485189e6195d..978c1aa7332da76ce4316b028f3e83f1131e56f9 100644 (file)
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r

 <!--\r
 \r
 <!--\r
 \r

-  This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.9 (http://www.bakefile.org)\r

   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r


@@ -22,9 +22,9 @@
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r

-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivudll"\r
-                       IntermediateDirectory="vc_mswunivudll\test_gui"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\test_gui"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r


@@ -43,66 +43,69 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
-                               MinimalRebuild="false"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               MinimalRebuild="true"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\test_gui\"\r
-                               ObjectFile="vc_mswunivudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswud\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmswuniv29u_core.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"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

-                               OutputFile="vc_mswunivudll\test_gui.exe"\r
+                               AdditionalDependencies="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
                                LinkIncremental="2"\r

-                               SubSystem="1"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r

                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r

-                               ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\test_gui.pdb"\r
+                               SubSystem="1"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="vc_mswunivudll\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswud\test_vc8_test_gui.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -119,9 +122,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivuddll"\r
-                       IntermediateDirectory="vc_mswunivuddll\test_gui"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\test_gui"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r


@@ -140,66 +143,68 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\test_gui\"\r
-                               ObjectFile="vc_mswunivuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswu\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmswuniv29ud_core.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"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

-                               OutputFile="vc_mswunivuddll\test_gui.exe"\r
-                               LinkIncremental="2"\r
-                               SubSystem="1"\r
+                               AdditionalDependencies="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="1"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r

                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r

-                               ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
+                               SubSystem="1"\r

                                TargetMachine="1"\r
                                TargetMachine="1"\r

+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r

                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="vc_mswunivuddll\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswu\test_vc8_test_gui.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -216,9 +221,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="vc_mswudll"\r
-                       IntermediateDirectory="vc_mswudll\test_gui"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\test_gui"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r


@@ -237,66 +242,69 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
-                               MinimalRebuild="false"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               MinimalRebuild="true"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc_mswudll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswudll\test_gui\"\r
-                               ObjectFile="vc_mswudll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivud\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmsw29u_core.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"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

-                               OutputFile="vc_mswudll\test_gui.exe"\r
+                               AdditionalDependencies="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
                                LinkIncremental="2"\r

-                               SubSystem="1"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r

                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r

-                               ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"\r
+                               SubSystem="1"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="vc_mswudll\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswunivud\test_vc8_test_gui.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -313,9 +321,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc_mswuddll"\r
-                       IntermediateDirectory="vc_mswuddll\test_gui"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\test_gui"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r


@@ -334,66 +342,68 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc_mswuddll\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\test_gui\"\r
-                               ObjectFile="vc_mswuddll\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivu\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;NOPCH;_CONSOLE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmsw29ud_core.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"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

-                               OutputFile="vc_mswuddll\test_gui.exe"\r
-                               LinkIncremental="2"\r
-                               SubSystem="1"\r
+                               AdditionalDependencies="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="1"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r

                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r

-                               ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
+                               SubSystem="1"\r

                                TargetMachine="1"\r
                                TargetMachine="1"\r

+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r

                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="vc_mswuddll\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswunivu\test_vc8_test_gui.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -410,9 +420,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="vc_mswunivu"\r
-                       IntermediateDirectory="vc_mswunivu\test_gui"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\test_gui"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r


@@ -431,66 +441,69 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
-                               MinimalRebuild="false"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               MinimalRebuild="true"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivu\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\test_gui\"\r
-                               ObjectFile="vc_mswunivu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivu\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswuddll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\test_gui.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmswuniv29u_core.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"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

-                               OutputFile="vc_mswunivu\test_gui.exe"\r
+                               AdditionalDependencies="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
                                LinkIncremental="2"\r

-                               SubSystem="1"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r

                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r

-                               ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\test_gui.pdb"\r
+                               SubSystem="1"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="vc_mswunivu\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswuddll\test_vc8_test_gui.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -507,9 +520,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc_mswunivud"\r
-                       IntermediateDirectory="vc_mswunivud\test_gui"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\test_gui"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r


@@ -528,66 +541,68 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivud\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\test_gui\"\r
-                               ObjectFile="vc_mswunivud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswunivud\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswudll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswudll\test_gui.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmswuniv29ud_core.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"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

-                               OutputFile="vc_mswunivud\test_gui.exe"\r
-                               LinkIncremental="2"\r
-                               SubSystem="1"\r
+                               AdditionalDependencies="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="1"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r

                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r

-                               ProgramDatabaseFile="vc_mswunivud\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
+                               SubSystem="1"\r

                                TargetMachine="1"\r
                                TargetMachine="1"\r

+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r

                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="vc_mswunivud\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswudll\test_vc8_test_gui.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -604,9 +619,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="Release|Win32"\r
-                       OutputDirectory="vc_mswu"\r
-                       IntermediateDirectory="vc_mswu\test_gui"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\test_gui"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r


@@ -625,66 +640,69 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
-                               MinimalRebuild="false"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               MinimalRebuild="true"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc_mswu\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswu\test_gui\"\r
-                               ObjectFile="vc_mswu\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswu\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivuddll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\test_gui.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmsw29u_core.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"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

-                               OutputFile="vc_mswu\test_gui.exe"\r
+                               AdditionalDependencies="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
                                LinkIncremental="2"\r

-                               SubSystem="1"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r

                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r

-                               ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\test_gui.pdb"\r
+                               SubSystem="1"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="vc_mswu\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswunivuddll\test_vc8_test_gui.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -701,9 +719,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="Debug|Win32"\r
-                       OutputDirectory="vc_mswud"\r
-                       IntermediateDirectory="vc_mswud\test_gui"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\test_gui"\r

                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r


@@ -722,66 +740,68 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r

-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r
+                               PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc_mswud\testprec_test_gui.pch"\r
-                               AssemblerListingLocation="vc_mswud\test_gui\"\r
-                               ObjectFile="vc_mswud\test_gui\"\r
-                               ProgramDataBaseFileName="vc_mswud\test_gui.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test_gui.pch"\r
+                               ObjectFile="vc_mswunivudll\test_gui\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\test_gui.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXUSINGDLL;NOPCH;_CONSOLE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;.\..\samples"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;NOPCH;_CONSOLE"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;.;.\..\samples"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxmsw29ud_core.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"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

-                               OutputFile="vc_mswud\test_gui.exe"\r
-                               LinkIncremental="2"\r
-                               SubSystem="1"\r
+                               AdditionalDependencies="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="1"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r

                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r

-                               ProgramDatabaseFile="vc_mswud\test_gui.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
+                               SubSystem="1"\r

                                TargetMachine="1"\r
                                TargetMachine="1"\r

+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r

                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="vc_mswud\test_vc8_test_gui.bsc"\r
+                               OutputFile="vc_mswunivudll\test_vc8_test_gui.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -804,23 +824,90 @@
        <Files>\r
                <Filter\r
                        Name="Source Files"\r
        <Files>\r
                <Filter\r
                        Name="Source Files"\r

-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r

                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r

+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r

                        >\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
                        <File\r
                                RelativePath=".\window\clientsize.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\events\clone.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\graphics\colour.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\controls\comboboxtest.cpp"\r
                        <File\r
                                RelativePath=".\controls\comboboxtest.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\config\config.cpp"\r
                        <File\r
                                RelativePath=".\config\config.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                        <File\r

+                               RelativePath=".\controls\datepickerctrltest.cpp"
+                               >
+                       </File>
+                       <File

                                RelativePath=".\dummy.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath=".\dummy.cpp"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -828,7 +915,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -836,7 +923,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -844,7 +931,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -852,7 +939,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -860,7 +947,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -868,7 +955,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -876,7 +963,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -884,45 +971,248 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
                                        />\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
                        <File\r
                                RelativePath=".\misc\guifuncs.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               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
                        <File\r
                                RelativePath=".\geometry\point.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               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
                        <File\r
                                RelativePath=".\image\rawbmp.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\rearrangelisttest.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\geometry\rect.cpp"\r
                        <File\r
                                RelativePath=".\geometry\rect.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\richtextctrltest.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\misc\selstoretest.cpp"\r
                        <File\r
                                RelativePath=".\misc\selstoretest.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\window\setsize.cpp"\r
                        <File\r
                                RelativePath=".\window\setsize.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\misc\settings.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\geometry\size.cpp"\r
                        <File\r
                                RelativePath=".\geometry\size.cpp"\r

-                       />\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
                        <File\r
                                RelativePath=".\test.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\testableframe.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\controls\textctrltest.cpp"\r
                        <File\r
                                RelativePath=".\controls\textctrltest.cpp"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath=".\controls\textentrytest.cpp"\r
                        <File\r
                                RelativePath=".\controls\textentrytest.cpp"\r

-                       />\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=".\validators\valnum.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\controls\virtlistctrltest.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
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r

-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r

                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r

+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r

                        >\r
                        <File\r
                        >\r
                        <File\r

-                               RelativePath=".\..\samples\sample.rc"\r
-                       />\r
+                               RelativePath="..\samples\sample.rc"\r
+                               >\r
+                       </File>\r

                </Filter>\r
        </Files>\r
        <Globals>\r
                </Filter>\r
        </Files>\r
        <Globals>\r