Make SetFont actually do something

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

diff --git a/tests/regex/regextest.cpp b/tests/regex/regextest.cpp
index e5a0c89f3d504364adf90fa61c1ef504cbb96325..ef63306560d8f04c85f2ccb53a729cba757517c9 100644 (file)
--- a/tests/regex/regextest.cpp
+++ b/tests/regex/regextest.cpp
@@ -178,8 +178,9 @@ wxString RegExTestCase::Conv(const char *str)
 //
 void RegExTestCase::parseFlags(const wxString& flags)
 {
-    for (const wxChar *p = flags; *p; p++) {
-        switch (*p) {
+    for ( wxString::const_iterator p = flags.begin(); p != flags.end(); ++p )
+    {
+        switch ( (*p).GetValue() ) {
             // noop
             case '-': break;
 
@@ -323,7 +324,7 @@ wxString RegExTestCase::quote(const wxString& arg)
     wxString str;
 
     for (size_t i = 0; i < arg.length(); i++) {
-        wxUChar ch = arg[i];
+        wxUChar ch = (wxChar)arg[i];
         const wxChar *p = wxStrchr(needEscape, ch);
 
         if (p)
@@ -331,7 +332,7 @@ wxString RegExTestCase::quote(const wxString& arg)
         else if (wxIscntrl(ch))
             str += wxString::Format(_T("\\%03o"), ch);
         else
-            str += ch;
+            str += (wxChar)ch;
     }
 
     return str.length() == arg.length() && str.find(' ') == wxString::npos ?