Add (a very simple for now) wxBoxSizer unit test.

Only check that layout for a single sizer item works correctly for now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/Makefile.in b/tests/Makefile.in
index e9516311086a0a536da079846a90efa4946fec24..21d0ac5c2b1f3db63e6e79ca377d2f5f90bedba8 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -156,6 +156,7 @@ TEST_GUI_OBJECTS =  \
        test_gui_garbage.o \
        test_gui_settings.o \
        test_gui_socket.o \
+       test_gui_boxsizer.o \
        test_gui_clientsize.o \
        test_gui_setsize.o
 TEST_GUI_ODEP =  $(_____pch_testprec_test_gui_testprec_h_gch___depname)
@@ -634,6 +635,9 @@ test_gui_settings.o: $(srcdir)/misc/settings.cpp $(TEST_GUI_ODEP)
 test_gui_socket.o: $(srcdir)/net/socket.cpp $(TEST_GUI_ODEP)
        $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/net/socket.cpp
 
+test_gui_boxsizer.o: $(srcdir)/sizers/boxsizer.cpp $(TEST_GUI_ODEP)
+       $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/sizers/boxsizer.cpp
+
 test_gui_clientsize.o: $(srcdir)/window/clientsize.cpp $(TEST_GUI_ODEP)
        $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/window/clientsize.cpp
 

diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index d1d085adbf747589b9b868f4a89e7091c25ea1b3..373f224538ec16a5093cc888e0886f6213253604 100644 (file)
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -141,6 +141,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_garbage.obj \\r
        $(OBJS)\test_gui_settings.obj \\r
        $(OBJS)\test_gui_socket.obj \\r
+       $(OBJS)\test_gui_boxsizer.obj \
        $(OBJS)\test_gui_clientsize.obj \\r
        $(OBJS)\test_gui_setsize.obj\r
 \r
@@ -688,6 +689,9 @@ $(OBJS)\test_gui_settings.obj: .\misc\settings.cpp
 $(OBJS)\test_gui_socket.obj: .\net\socket.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\net\socket.cpp\r
 \r
+$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp
+
 $(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp\r
 \r

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 53fffc15f1806a90db0e6511d522ac8ef28ea57f..1595d84da855a81b9d86bd0b9bfafb515f071c9d 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -135,6 +135,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_garbage.o \\r
        $(OBJS)\test_gui_settings.o \\r
        $(OBJS)\test_gui_socket.o \\r
+       $(OBJS)\test_gui_boxsizer.o \
        $(OBJS)\test_gui_clientsize.o \\r
        $(OBJS)\test_gui_setsize.o\r
 \r
@@ -670,6 +671,9 @@ $(OBJS)\test_gui_settings.o: ./misc/settings.cpp
 $(OBJS)\test_gui_socket.o: ./net/socket.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\test_gui_boxsizer.o: ./sizers/boxsizer.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_gui_clientsize.o: ./window/clientsize.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r

diff --git a/tests/makefile.vc b/tests/makefile.vc
index 87a97c3c526dc36facd90c99b4ca30ad9020f83e..04e39ba393ec04d077ec6e72eb8c244aca1869c1 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -136,6 +136,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_garbage.obj \\r
        $(OBJS)\test_gui_settings.obj \\r
        $(OBJS)\test_gui_socket.obj \\r
+       $(OBJS)\test_gui_boxsizer.obj \
        $(OBJS)\test_gui_clientsize.obj \\r
        $(OBJS)\test_gui_setsize.obj\r
 TEST_GUI_RESOURCES =  \\r
@@ -814,6 +815,9 @@ $(OBJS)\test_gui_settings.obj: .\misc\settings.cpp
 $(OBJS)\test_gui_socket.obj: .\net\socket.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\net\socket.cpp\r
 \r
+$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp
+
 $(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp\r
 \r

diff --git a/tests/makefile.wat b/tests/makefile.wat
index f43ac68775c2bf5ba57c0a0f5f2acedc4d2bc713..f6da0821db583175d1b8203bf46b388edfb99ff0 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -379,6 +379,7 @@ TEST_GUI_OBJECTS =  &
        $(OBJS)\test_gui_garbage.obj &\r
        $(OBJS)\test_gui_settings.obj &\r
        $(OBJS)\test_gui_socket.obj &\r
+       $(OBJS)\test_gui_boxsizer.obj &
        $(OBJS)\test_gui_clientsize.obj &\r
        $(OBJS)\test_gui_setsize.obj\r
 \r
@@ -725,6 +726,9 @@ $(OBJS)\test_gui_settings.obj :  .AUTODEPEND .\misc\settings.cpp
 $(OBJS)\test_gui_socket.obj :  .AUTODEPEND .\net\socket.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
+$(OBJS)\test_gui_boxsizer.obj :  .AUTODEPEND .\sizers\boxsizer.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
 $(OBJS)\test_gui_clientsize.obj :  .AUTODEPEND .\window\clientsize.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

diff --git a/tests/sizers/boxsizer.cpp b/tests/sizers/boxsizer.cpp
new file mode 100644 (file)
index 0000000..e4dbbec
--- /dev/null
+++ b/tests/sizers/boxsizer.cpp
@@ -0,0 +1,107 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/sizers/boxsizer.cpp
+// Purpose:     Unit tests for wxBoxSizer
+// Author:      Vadim Zeitlin
+// Created:     2010-03-06
+// RCS-ID:      $Id$
+// Copyright:   (c) 2010 Vadim Zeitlin <vadim@wxwidgets.org>
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "testprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/sizer.h"
+#endif // WX_PRECOMP
+
+inline std::ostream& operator<<(std::ostream& o, const wxSize& s)
+{
+    return o << s.x << 'x' << s.y;
+}
+
+// ----------------------------------------------------------------------------
+// test class
+// ----------------------------------------------------------------------------
+
+class BoxSizerTestCase : public CppUnit::TestCase
+{
+public:
+    BoxSizerTestCase() { }
+
+    virtual void setUp();
+    virtual void tearDown();
+
+private:
+    CPPUNIT_TEST_SUITE( BoxSizerTestCase );
+        CPPUNIT_TEST( Size1 );
+    CPPUNIT_TEST_SUITE_END();
+
+    void Size1();
+
+    wxWindow *m_win;
+    wxSizer *m_sizer;
+
+    DECLARE_NO_COPY_CLASS(BoxSizerTestCase)
+};
+
+// register in the unnamed registry so that these tests are run by default
+CPPUNIT_TEST_SUITE_REGISTRATION( BoxSizerTestCase );
+
+// also include in it's own registry so that these tests can be run alone
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( BoxSizerTestCase, "BoxSizerTestCase" );
+
+// ----------------------------------------------------------------------------
+// test initialization
+// ----------------------------------------------------------------------------
+
+void BoxSizerTestCase::setUp()
+{
+    m_win = new wxWindow(wxTheApp->GetTopWindow(), wxID_ANY);
+    m_win->SetClientSize(127, 35);
+
+    m_sizer = new wxBoxSizer(wxHORIZONTAL);
+    m_win->SetSizer(m_sizer);
+}
+
+void BoxSizerTestCase::tearDown()
+{
+    delete m_win;
+    m_win = NULL;
+
+    m_sizer = NULL;
+}
+
+// ----------------------------------------------------------------------------
+// tests themselves
+// ----------------------------------------------------------------------------
+
+void BoxSizerTestCase::Size1()
+{
+    const wxSize sizeTotal = m_win->GetClientSize();
+    const wxSize sizeChild = sizeTotal / 2;
+
+    wxWindow * const
+        child = new wxWindow(m_win, wxID_ANY, wxDefaultPosition, sizeChild);
+    m_sizer->Add(child);
+    m_win->Layout();
+    CPPUNIT_ASSERT_EQUAL( sizeChild, child->GetSize() );
+;
+    m_sizer->Clear();
+    m_sizer->Add(child, wxSizerFlags(1));
+    m_win->Layout();
+    CPPUNIT_ASSERT_EQUAL( wxSize(sizeTotal.x, sizeChild.y), child->GetSize() );
+
+    m_sizer->Clear();
+    m_sizer->Add(child, wxSizerFlags(1).Expand());
+    m_win->Layout();
+    CPPUNIT_ASSERT_EQUAL( sizeTotal, child->GetSize() );
+}
+

diff --git a/tests/test.bkl b/tests/test.bkl
index 77bc56251c6c3dea95cd3b7c2e7c748aade1ff3a..edb0c7ea8fecc4386dc7eb6adb16759e9c9c23be 100644 (file)
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -142,6 +142,7 @@
                 applications.
              -->
             net/socket.cpp
+            sizers/boxsizer.cpp
             window/clientsize.cpp
             window/setsize.cpp
         </sources>

diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp
index 55121786ebbb3d480702917a2abecb2c8173403b..bb0d6829280142a5b81a2ed9da150f5f506bf56d 100644 (file)
--- a/tests/test_test_gui.dsp
+++ b/tests/test_test_gui.dsp
@@ -235,6 +235,10 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
+SOURCE=.\sizers\boxsizer.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\window\clientsize.cpp\r
 # End Source File\r
 # Begin Source File\r

diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj
index 6b0092f821ef43a34ae5422dd4a9ca259baf32a9..ae44f24eacfbf381d4afd4c10ae2dd81e6464117 100644 (file)
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -566,6 +566,9 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
                        <File\r
+                               RelativePath=".\sizers\boxsizer.cpp">
+                       </File>
+                       <File
                                RelativePath=".\window\clientsize.cpp">\r
                        </File>\r
                        <File\r

diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj
index ecf5fdfa717a509b69578b4db6e51ab486981091..54314be5b87699b1724f6b690088649e96991a8c 100644 (file)
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -828,6 +828,10 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
+                               RelativePath=".\sizers\boxsizer.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\window\clientsize.cpp"\r
                                >\r
                        </File>\r

diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj
index 941eb998ca5b22189f37a65d69f3631e21271569..761934ff67c7b9f71b934ac2fb03dbea42064769 100644 (file)
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
-<!--\r
-\r
-  This project was generated by\r
-  Bakefile 0.2.8 (http://www.bakefile.org)\r
-  Do not modify, all changes will be overwritten!\r
-\r
--->\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
        Version="9.00"\r
        Name="test_gui"\r
        ProjectGUID="{9BB295D9-A6AA-510D-AA0D-9375B5D91025}"\r
+       TargetFrameworkVersion="0"
        >\r
        <Platforms>\r
                <Platform\r
@@ -18,7 +12,6 @@
                />\r
        </Platforms>\r
        <ToolFiles>\r
-               \r
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
@@ -104,8 +97,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
+                               OutputFile="vc_mswud\test_vc9_test_gui.bsc"
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -185,9 +178,9 @@
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswu\test_gui.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               TargetMachine="1"
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -200,8 +193,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
+                               OutputFile="vc_mswu\test_vc9_test_gui.bsc"
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -296,8 +289,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
+                               OutputFile="vc_mswunivud\test_vc9_test_gui.bsc"
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -377,9 +370,9 @@
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivu\test_gui.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               TargetMachine="1"
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -392,8 +385,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
+                               OutputFile="vc_mswunivu\test_vc9_test_gui.bsc"
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -488,8 +481,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
+                               OutputFile="vc_mswuddll\test_vc9_test_gui.bsc"
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -569,9 +562,9 @@
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswudll\test_gui.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               TargetMachine="1"
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -584,8 +577,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
+                               OutputFile="vc_mswudll\test_vc9_test_gui.bsc"
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -680,8 +673,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
+                               OutputFile="vc_mswunivuddll\test_vc9_test_gui.bsc"
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -761,9 +754,9 @@
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb"\r
                                SubSystem="1"\r
-                               TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
+                               TargetMachine="1"
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -776,8 +769,8 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc9_test_gui.bsc"\r
                                SuppressStartupBanner="true"\r
+                               OutputFile="vc_mswunivudll\test_vc9_test_gui.bsc"
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -791,7 +784,6 @@
                </Configuration>\r
        </Configurations>\r
        <References>\r
-               \r
        </References>\r
        <Files>\r
                <Filter\r
@@ -800,24 +792,68 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
+                               RelativePath=".\sizers\boxsizer.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\window\clientsize.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\events\clone.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\graphics\colour.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\controls\comboboxtest.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\config\config.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\dummy.cpp"\r
@@ -894,70 +930,206 @@
                        <File\r
                                RelativePath=".\font\fonttest.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\misc\garbage.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\misc\guifuncs.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\controls\headerctrltest.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\html\htmlwindow.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\image\image.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\controls\listctrltest.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\graphics\measuring.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\geometry\point.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\events\propagation.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\image\rawbmp.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\geometry\rect.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\misc\selstoretest.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\window\setsize.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\misc\settings.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\geometry\size.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\net\socket.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\test.cpp"\r
@@ -966,14 +1138,38 @@
                        <File\r
                                RelativePath=".\controls\textctrltest.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\controls\textentrytest.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                        <File\r
                                RelativePath=".\controls\treectrltest.cpp"\r
                                >\r
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       ExcludedFromBuild="true"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                       />
+                               </FileConfiguration>
                        </File>\r
                </Filter>\r
                <Filter\r
@@ -988,7 +1184,5 @@
                </Filter>\r
        </Files>\r
        <Globals>\r
-               \r
        </Globals>\r
 </VisualStudioProject>\r
-\r