New icon for combobox with bitmaps. Improved readability of icons on dark backgrounds...

[wxWidgets.git] / tests / regex / wxregextest.cpp

diff --git a/tests/regex/wxregextest.cpp b/tests/regex/wxregextest.cpp
index 6e798a1821d8d92203a0286ca69daca02d89714b..1d9c75acc8f385bd6c85f801d2e9b1460ac6fce9 100644 (file)
--- a/tests/regex/wxregextest.cpp
+++ b/tests/regex/wxregextest.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#include "wx/wxprec.h"
+#include "testprec.h"

 
 #ifdef __BORLANDC__
 #   pragma hdrstop
 
 #ifdef __BORLANDC__
 #   pragma hdrstop


@@ -20,12 +20,13 @@
 #if wxUSE_REGEX
 
 #include "wx/regex.h"
 #if wxUSE_REGEX
 
 #include "wx/regex.h"

-#include "wx/cppunit.h"

 #include "wx/tokenzr.h"
 #include <string>
 
 #include "wx/tokenzr.h"
 #include <string>
 

-using namespace std;
-using namespace CppUnit;
+using CppUnit::Test;
+using CppUnit::TestCase;
+using CppUnit::TestSuite;
+using std::string;

 
 
 ///////////////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////////////


@@ -143,7 +144,7 @@ public:
         m_expected(expected),
         m_count(count),
         m_flags(flags)
         m_expected(expected),
         m_count(count),
         m_flags(flags)

-    { }    
+    { }

 
 protected:
     void runTest();
 
 protected:
     void runTest();


@@ -168,7 +169,7 @@ void RegExReplaceTestCase::runTest()
     msgstr.Printf(_T("returns '%s' (expected '%s')"), text.c_str(), m_expected.c_str());
     CPPUNIT_ASSERT_MESSAGE((const char*)msgstr.mb_str(), text == m_expected);
 
     msgstr.Printf(_T("returns '%s' (expected '%s')"), text.c_str(), m_expected.c_str());
     CPPUNIT_ASSERT_MESSAGE((const char*)msgstr.mb_str(), text == m_expected);
 

-    msgstr.Printf(_T("matches %d times (expected %d)"), nRepl, m_count);
+    msgstr.Printf(_T("matches %d times (expected %d)"), (int)nRepl, (int)m_count);

     CPPUNIT_ASSERT_MESSAGE((const char*)msgstr.mb_str(), nRepl == m_count);
 }
 
     CPPUNIT_ASSERT_MESSAGE((const char*)msgstr.mb_str(), nRepl == m_count);
 }