From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 22 Mar 2009 16:10:09 +0000 (+0000)
Subject: compilation fix for wxUSE_STD_STRING==0
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6582f5920737cb6ceadddc19170e27d4d0834123

compilation fix for wxUSE_STD_STRING==0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/tests/test.cpp b/tests/test.cpp
index afc4ad2ab5..1701ad36f5 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -118,7 +118,7 @@ private:
     bool m_longlist;
     bool m_detail;
     bool m_timing;
-    vector<string> m_registries;
+    wxArrayString m_registries;
 
     // event handling hooks
     FilterEventFunc m_filterEventFunc;
@@ -186,7 +186,7 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
 {
     if (parser.GetParamCount())
         for (size_t i = 0; i < parser.GetParamCount(); i++)
-            m_registries.push_back(string(parser.GetParam(i).mb_str()));
+            m_registries.push_back(parser.GetParam(i));
     else
         m_registries.push_back("");
 
@@ -233,21 +233,20 @@ int TestApp::OnRun()
 
     for (size_t i = 0; i < m_registries.size(); i++)
     {
-        std::string reg = m_registries[i];
-        if (!reg.empty() && !wxString(reg).EndsWith("TestCase"))
+        wxString reg = m_registries[i];
+        if (!reg.empty() && !reg.EndsWith("TestCase"))
             reg += "TestCase";
         // allow the user to specify the name of the testcase "in short form"
         // (all wx test cases end with TestCase postfix)
 
         auto_ptr<Test> test(reg.empty() ?
             TestFactoryRegistry::getRegistry().makeTest() :
-            TestFactoryRegistry::getRegistry(reg).makeTest());
+            TestFactoryRegistry::getRegistry(string(reg.mb_str())).makeTest());
 
         TestSuite *suite = dynamic_cast<TestSuite*>(test.get());
 
         if (suite && suite->countTestCases() == 0)
-            wxLogError(_T("No such test suite: %s"),
-                wxString(reg.c_str(), wxConvUTF8).c_str());
+            wxLogError(_T("No such test suite: %s"), reg);
         else if (m_list)
             List(test.get());
         else