Reviewed and cleaned up the rest of the graphics.h interface header.

[wxWidgets.git] / tests / test_vc7_test.vcproj

diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj
index b483937bfe12648f77ca26a257937a464f590a23..6dafda7a87844b10a2222e7e396c4c584fa19632 100644 (file)
--- a/tests/test_vc7_test.vcproj
+++ b/tests/test_vc7_test.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This makefile was generated by\r
 <!--\r
 \r
   This makefile was generated by\r

-  Bakefile 0.2.4 (http://www.bakefile.org)\r
+  Bakefile 0.2.5 (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


@@ -18,8 +18,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="DLL Universal Release|Win32"\r
        <Configurations>\r
                <Configuration\r
                        Name="DLL Universal Release|Win32"\r

-                       OutputDirectory="vc7_mswunivudll"\r
-                       IntermediateDirectory="vc7_mswunivudll\test"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\test"\r

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


@@ -27,17 +27,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r

                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc7_mswunivudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswunivudll\test\"\r
-                               ObjectFile="vc7_mswunivudll\test\"\r
-                               ProgramDataBaseFileName="vc7_mswunivudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivudll\test\"\r
+                               ObjectFile="vc_mswunivudll\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r

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


@@ -48,12 +48,12 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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

-                               OutputFile="vc7_mswunivudll\test.exe"\r
+                               OutputFile="vc_mswunivudll\test.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

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

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc7_mswunivudll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r

                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r


@@ -68,7 +68,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivu;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/>\r

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


@@ -82,8 +82,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r

-                       OutputDirectory="vc7_mswunivuddll"\r
-                       IntermediateDirectory="vc7_mswunivuddll\test"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\test"\r

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


@@ -91,7 +91,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r

                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r


@@ -101,10 +101,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc7_mswunivuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswunivuddll\test\"\r
-                               ObjectFile="vc7_mswunivuddll\test\"\r
-                               ProgramDataBaseFileName="vc7_mswunivuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivuddll\test\"\r
+                               ObjectFile="vc_mswunivuddll\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r

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


@@ -115,12 +115,12 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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

-                               OutputFile="vc7_mswunivuddll\test.exe"\r
+                               OutputFile="vc_mswunivuddll\test.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

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

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc7_mswunivuddll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\test.pdb"\r

                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r


@@ -135,7 +135,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswunivud;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/>\r

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


@@ -149,8 +149,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r

-                       OutputDirectory="vc7_mswudll"\r
-                       IntermediateDirectory="vc7_mswudll\test"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\test"\r

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


@@ -158,17 +158,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r

                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc7_mswudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswudll\test\"\r
-                               ObjectFile="vc7_mswudll\test\"\r
-                               ProgramDataBaseFileName="vc7_mswudll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswudll\test\"\r
+                               ObjectFile="vc_mswudll\test\"\r
+                               ProgramDataBaseFileName="vc_mswudll\test.pdb"\r

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


@@ -179,12 +179,12 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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

-                               OutputFile="vc7_mswudll\test.exe"\r
+                               OutputFile="vc_mswudll\test.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

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

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc7_mswudll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\test.pdb"\r

                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r


@@ -199,7 +199,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswu;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>\r

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


@@ -213,8 +213,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r

-                       OutputDirectory="vc7_mswuddll"\r
-                       IntermediateDirectory="vc7_mswuddll\test"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\test"\r

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


@@ -222,7 +222,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r

                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r


@@ -232,10 +232,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc7_mswuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswuddll\test\"\r
-                               ObjectFile="vc7_mswuddll\test\"\r
-                               ProgramDataBaseFileName="vc7_mswuddll\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswuddll\test\"\r
+                               ObjectFile="vc_mswuddll\test\"\r
+                               ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r

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


@@ -246,12 +246,12 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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

-                               OutputFile="vc7_mswuddll\test.exe"\r
+                               OutputFile="vc_mswuddll\test.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

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

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc7_mswuddll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\test.pdb"\r

                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r


@@ -266,7 +266,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_dll\mswud;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>\r

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


@@ -280,8 +280,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r

-                       OutputDirectory="vc7_mswunivu"\r
-                       IntermediateDirectory="vc7_mswunivu\test"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\test"\r

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


@@ -289,17 +289,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r

                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc7_mswunivu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswunivu\test\"\r
-                               ObjectFile="vc7_mswunivu\test\"\r
-                               ProgramDataBaseFileName="vc7_mswunivu\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivu\test\"\r
+                               ObjectFile="vc_mswunivu\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r

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


@@ -310,12 +310,12 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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

-                               OutputFile="vc7_mswunivu\test.exe"\r
+                               OutputFile="vc_mswunivu\test.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

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

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc7_mswunivu\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\test.pdb"\r

                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r


@@ -330,7 +330,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivu;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/>\r

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


@@ -344,8 +344,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r

-                       OutputDirectory="vc7_mswunivud"\r
-                       IntermediateDirectory="vc7_mswunivud\test"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\test"\r

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


@@ -353,7 +353,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r

                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r


@@ -363,10 +363,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc7_mswunivud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswunivud\test\"\r
-                               ObjectFile="vc7_mswunivud\test\"\r
-                               ProgramDataBaseFileName="vc7_mswunivud\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswunivud\test\"\r
+                               ObjectFile="vc_mswunivud\test\"\r
+                               ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r

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


@@ -377,12 +377,12 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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

-                               OutputFile="vc7_mswunivud\test.exe"\r
+                               OutputFile="vc_mswunivud\test.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

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

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc7_mswunivud\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivud\test.pdb"\r

                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r


@@ -397,7 +397,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswunivud;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/>\r

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


@@ -411,8 +411,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r

-                       OutputDirectory="vc7_mswu"\r
-                       IntermediateDirectory="vc7_mswu\test"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\test"\r

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


@@ -420,17 +420,17 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r

                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc7_mswu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswu\test\"\r
-                               ObjectFile="vc7_mswu\test\"\r
-                               ProgramDataBaseFileName="vc7_mswu\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswu\test\"\r
+                               ObjectFile="vc_mswu\test\"\r
+                               ProgramDataBaseFileName="vc_mswu\test.pdb"\r

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


@@ -441,12 +441,12 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.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

-                               OutputFile="vc7_mswu\test.exe"\r
+                               OutputFile="vc_mswu\test.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

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

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc7_mswu\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\test.pdb"\r

                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r


@@ -461,7 +461,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswu;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>\r

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


@@ -475,8 +475,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r

-                       OutputDirectory="vc7_mswud"\r
-                       IntermediateDirectory="vc7_mswud\test"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\test"\r

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


@@ -484,7 +484,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r

                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r


@@ -494,10 +494,10 @@
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                RuntimeTypeInfo="TRUE"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r

-                               PrecompiledHeaderFile="vc7_mswud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc7_mswud\test\"\r
-                               ObjectFile="vc7_mswud\test\"\r
-                               ProgramDataBaseFileName="vc7_mswud\test.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
+                               AssemblerListingLocation="vc_mswud\test\"\r
+                               ObjectFile="vc_mswud\test\"\r
+                               ProgramDataBaseFileName="vc_mswud\test.pdb"\r

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


@@ -508,12 +508,12 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.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

-                               OutputFile="vc7_mswud\test.exe"\r
+                               OutputFile="vc_mswud\test.exe"\r

                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="TRUE"\r

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

                                GenerateDebugInformation="TRUE"\r
                                GenerateDebugInformation="TRUE"\r

-                               ProgramDatabaseFile="vc7_mswud\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\test.pdb"\r

                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r
                                SubSystem="1"\r
                                TargetMachine="1"/>\r
                        <Tool\r


@@ -528,7 +528,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories=".\..\lib\vc7_lib\mswud;.\..\include;."/>\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>\r

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


@@ -732,6 +732,9 @@
                        <File\r
                                RelativePath=".\streams\textstreamtest.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\streams\textstreamtest.cpp">\r
                        </File>\r

+                       <File\r
+                               RelativePath=".\events\timertest.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\thread\tls.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath=".\thread\tls.cpp">\r
                        </File>\r