wxBusyInfo now uses wxGenericStaticText under GTK+, more Refresh/Update updates

[wxWidgets.git] / tests / test_vc9_test.vcproj

diff --git a/tests/test_vc9_test.vcproj b/tests/test_vc9_test.vcproj
index 59d33f5606cc8b37577d6198ad487e57619ae108..012c2db301f93ac1910226dc545a9576f3d3f717 100644 (file)
--- a/tests/test_vc9_test.vcproj
+++ b/tests/test_vc9_test.vcproj
@@ -2,7 +2,7 @@
 <!--\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
@@ -23,8 +23,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="vc9_mswunivudll"\r
-                       IntermediateDirectory="vc9_mswunivudll\test"\r
+                       OutputDirectory="vc_mswunivudll"\r
+                       IntermediateDirectory="vc_mswunivudll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -49,17 +49,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="3"\r
+                               UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc9_mswunivudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc9_mswunivudll\test\"\r
-                               ObjectFile="vc9_mswunivudll\test\"\r
-                               ProgramDataBaseFileName="vc9_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
                                DebugInformationFormat="3"\r
@@ -71,7 +71,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -79,14 +79,14 @@
                        <Tool\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="vc9_mswunivudll\test.exe"\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 wininet.lib"\r
+                               OutputFile="vc_mswunivudll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc9_mswunivudll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -101,7 +101,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc9_mswunivudll\test_vc9_test.bsc"\r
+                               OutputFile="vc_mswunivudll\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -116,8 +116,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="vc9_mswunivuddll"\r
-                       IntermediateDirectory="vc9_mswunivuddll\test"\r
+                       OutputDirectory="vc_mswunivuddll"\r
+                       IntermediateDirectory="vc_mswunivuddll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -142,19 +142,19 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="3"\r
+                               UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc9_mswunivuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc9_mswunivuddll\test\"\r
-                               ObjectFile="vc9_mswunivuddll\test\"\r
-                               ProgramDataBaseFileName="vc9_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
                                DebugInformationFormat="3"\r
@@ -166,7 +166,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -174,14 +174,14 @@
                        <Tool\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="vc9_mswunivuddll\test.exe"\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 wininet.lib"\r
+                               OutputFile="vc_mswunivuddll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc9_mswunivuddll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivuddll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -196,7 +196,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc9_mswunivuddll\test_vc9_test.bsc"\r
+                               OutputFile="vc_mswunivuddll\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -211,8 +211,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r
-                       OutputDirectory="vc9_mswudll"\r
-                       IntermediateDirectory="vc9_mswudll\test"\r
+                       OutputDirectory="vc_mswudll"\r
+                       IntermediateDirectory="vc_mswudll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -237,17 +237,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="3"\r
+                               UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc9_mswudll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc9_mswudll\test\"\r
-                               ObjectFile="vc9_mswudll\test\"\r
-                               ProgramDataBaseFileName="vc9_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
                                DebugInformationFormat="3"\r
@@ -259,7 +259,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -267,14 +267,14 @@
                        <Tool\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="vc9_mswudll\test.exe"\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 wininet.lib"\r
+                               OutputFile="vc_mswudll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc9_mswudll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswudll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -289,7 +289,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc9_mswudll\test_vc9_test.bsc"\r
+                               OutputFile="vc_mswudll\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -304,8 +304,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
-                       OutputDirectory="vc9_mswuddll"\r
-                       IntermediateDirectory="vc9_mswuddll\test"\r
+                       OutputDirectory="vc_mswuddll"\r
+                       IntermediateDirectory="vc_mswuddll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -330,19 +330,19 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="3"\r
+                               UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc9_mswuddll\testprec_test.pch"\r
-                               AssemblerListingLocation="vc9_mswuddll\test\"\r
-                               ObjectFile="vc9_mswuddll\test\"\r
-                               ProgramDataBaseFileName="vc9_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
                                DebugInformationFormat="3"\r
@@ -354,7 +354,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_dll\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -362,14 +362,14 @@
                        <Tool\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="vc9_mswuddll\test.exe"\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 wininet.lib"\r
+                               OutputFile="vc_mswuddll\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc9_dll"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc9_mswuddll\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswuddll\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -384,7 +384,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc9_mswuddll\test_vc9_test.bsc"\r
+                               OutputFile="vc_mswuddll\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -399,8 +399,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r
-                       OutputDirectory="vc9_mswunivu"\r
-                       IntermediateDirectory="vc9_mswunivu\test"\r
+                       OutputDirectory="vc_mswunivu"\r
+                       IntermediateDirectory="vc_mswunivu\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -425,17 +425,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="3"\r
+                               UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc9_mswunivu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc9_mswunivu\test\"\r
-                               ObjectFile="vc9_mswunivu\test\"\r
-                               ProgramDataBaseFileName="vc9_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
                                DebugInformationFormat="3"\r
@@ -447,7 +447,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -455,14 +455,14 @@
                        <Tool\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="vc9_mswunivu\test.exe"\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 wininet.lib"\r
+                               OutputFile="vc_mswunivu\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc9_mswunivu\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -477,7 +477,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc9_mswunivu\test_vc9_test.bsc"\r
+                               OutputFile="vc_mswunivu\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -492,8 +492,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r
-                       OutputDirectory="vc9_mswunivud"\r
-                       IntermediateDirectory="vc9_mswunivud\test"\r
+                       OutputDirectory="vc_mswunivud"\r
+                       IntermediateDirectory="vc_mswunivud\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -518,19 +518,19 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="3"\r
+                               UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc9_mswunivud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc9_mswunivud\test\"\r
-                               ObjectFile="vc9_mswunivud\test\"\r
-                               ProgramDataBaseFileName="vc9_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
                                DebugInformationFormat="3"\r
@@ -542,7 +542,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswunivud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -550,14 +550,14 @@
                        <Tool\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="vc9_mswunivud\test.exe"\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 wininet.lib"\r
+                               OutputFile="vc_mswunivud\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc9_mswunivud\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswunivud\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -572,7 +572,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc9_mswunivud\test_vc9_test.bsc"\r
+                               OutputFile="vc_mswunivud\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -587,8 +587,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="vc9_mswu"\r
-                       IntermediateDirectory="vc9_mswu\test"\r
+                       OutputDirectory="vc_mswu"\r
+                       IntermediateDirectory="vc_mswu\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -613,17 +613,17 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="3"\r
+                               UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc9_mswu\testprec_test.pch"\r
-                               AssemblerListingLocation="vc9_mswu\test\"\r
-                               ObjectFile="vc9_mswu\test\"\r
-                               ProgramDataBaseFileName="vc9_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
                                DebugInformationFormat="3"\r
@@ -635,7 +635,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswu;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -643,14 +643,14 @@
                        <Tool\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="vc9_mswu\test.exe"\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 wininet.lib"\r
+                               OutputFile="vc_mswu\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc9_mswu\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswu\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -665,7 +665,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc9_mswu\test_vc9_test.bsc"\r
+                               OutputFile="vc_mswu\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -680,8 +680,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="vc9_mswud"\r
-                       IntermediateDirectory="vc9_mswud\test"\r
+                       OutputDirectory="vc_mswud"\r
+                       IntermediateDirectory="vc_mswud\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -706,19 +706,19 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="3"\r
+                               UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="testprec.h"\r
-                               PrecompiledHeaderFile="vc9_mswud\testprec_test.pch"\r
-                               AssemblerListingLocation="vc9_mswud\test\"\r
-                               ObjectFile="vc9_mswud\test\"\r
-                               ProgramDataBaseFileName="vc9_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
                                DebugInformationFormat="3"\r
@@ -730,7 +730,7 @@
                                Name="VCResourceCompilerTool"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc9_lib\mswud;.\..\include;."\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -738,14 +738,14 @@
                        <Tool\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="vc9_mswud\test.exe"\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 wininet.lib"\r
+                               OutputFile="vc_mswud\test.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=".\..\lib\vc9_lib"\r
+                               AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="vc9_mswud\test.pdb"\r
+                               ProgramDatabaseFile="vc_mswud\test.pdb"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -760,7 +760,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc9_mswud\test_vc9_test.bsc"\r
+                               OutputFile="vc_mswud\test_vc9_test.bsc"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -895,6 +895,10 @@
                                RelativePath=".\weakref\evtconnection.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\events\evthandler.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\streams\ffilestream.cpp"\r
                                >\r
@@ -1027,6 +1031,10 @@
                                RelativePath=".\streams\textstreamtest.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\events\timertest.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\thread\tls.cpp"\r
                                >\r