Reapplied patch to change the two scrolled window implementations

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

diff --git a/tests/regex/wxregextest.cpp b/tests/regex/wxregextest.cpp
index 6e798a1821d8d92203a0286ca69daca02d89714b..7d7b3085b92bd35769faf2b69a5178603a060a17 100644 (file)
--- a/tests/regex/wxregextest.cpp
+++ b/tests/regex/wxregextest.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "wx/wxprec.h"
+#include "testprec.h"
 
 #ifdef __BORLANDC__
 #   pragma hdrstop
@@ -20,12 +20,13 @@
 #if wxUSE_REGEX
 
 #include "wx/regex.h"
-#include "wx/cppunit.h"
 #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)
-    { }    
+    { }
 
 protected:
     void runTest();