Applied gnome print rounded rect patch.

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

diff --git a/tests/regex/regextest.cpp b/tests/regex/regextest.cpp
index be54588c77b9de71597ba7de22f12bb201d0533d..c146caf6727cb040818019f7a4c635a70203a37c 100644 (file)
--- a/tests/regex/regextest.cpp
+++ b/tests/regex/regextest.cpp
@@ -30,7 +30,7 @@
 //
 
 // For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
+#include "testprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -41,8 +41,13 @@
     #include "wx/wx.h"
 #endif
 
+
+// many of the tests are specific to the builtin regex lib, so only attempts
+// to do them when using the builtin regex lib.
+//
+#ifdef wxHAS_REGEX_ADVANCED
+
 #include "wx/regex.h"
-#include "wx/cppunit.h"
 #include <string>
 #include <vector>
 
@@ -51,14 +56,8 @@ using CppUnit::TestCase;
 using CppUnit::TestSuite;
 using CppUnit::Exception;
 
-using std::vector;
 using std::string;
-
-// many of the tests are specific to the builtin regex lib, so only attempts
-// to do them when using the builtin regex lib.
-//
-#ifdef wxHAS_REGEX_ADVANCED
-
+using std::vector;
 
 ///////////////////////////////////////////////////////////////////////////////
 // The test case - an instance represents a single test
@@ -133,7 +132,8 @@ RegExTestCase::RegExTestCase(
     m_advanced(false)
 {
     bool badconv = m_pattern == convError() || m_data == convError();
-    vector<const char *>::const_iterator it;
+    //RN:  Removing the std:: here will break MSVC6 compilation
+    std::vector<const char *>::const_iterator it;
 
     for (it = expected.begin(); it != expected.end(); ++it) {
         m_expected.push_back(Conv(*it));
@@ -158,7 +158,7 @@ int wxWcscmp(const wchar_t* s1, const wchar_t* s2)
     if (nLen1 != nLen2)
         return nLen1 - nLen2;
 
-    return wxMemcmp(s1, s2, nLen1);
+    return wxTmemcmp(s1, s2, nLen1);
 }
 
 // convert a string from UTF8 to the internal encoding