update version check for glib 2.32

[wxWidgets.git] / tests / scopeguard / scopeguardtest.cpp

diff --git a/tests/scopeguard/scopeguardtest.cpp b/tests/scopeguard/scopeguardtest.cpp
index 24c19fd9812ef73a72efb4259e34b61815b34823..3a6b3ff67497697e202cf98c0875c7e31ccff1af 100644 (file)
--- a/tests/scopeguard/scopeguardtest.cpp
+++ b/tests/scopeguard/scopeguardtest.cpp
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // RCS-ID:      $Id$
 // Copyright:   (c) 2005 Vadim Zeitlin
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -21,6 +21,7 @@
     #pragma hdrstop
 #endif
 
+#include "wx/string.h"
 #include "wx/scopeguard.h"
 
 // ----------------------------------------------------------------------------
@@ -82,7 +83,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION(ScopeGuardTestCase);
 
-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(ScopeGuardTestCase,
                                       "ScopeGuardTestCase");
 
@@ -232,9 +233,9 @@ void ScopeGuardTestCase::BlockExitSetVar()
     {
         wxON_BLOCK_EXIT_SET(s, "bye");
 
-        WX_ASSERT_STR_EQUAL( "hi", s );
+        CPPUNIT_ASSERT_EQUAL( "hi", s );
     }
-    WX_ASSERT_STR_EQUAL( "bye", s );
+    CPPUNIT_ASSERT_EQUAL( "bye", s );
 
     ScopeGuardTestCase *p = this;
     {