]> git.saurik.com Git - wxWidgets.git/commitdiff
Compilation fix for "interactive" test in wxUSE_STL=1 build.
authorVadim Zeitlin <vadim@wxwidgets.org>
Mon, 12 Jul 2010 22:50:41 +0000 (22:50 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Mon, 12 Jul 2010 22:50:41 +0000 (22:50 +0000)
wxString is not convertible (even explicitly) to char* in this case.

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

tests/interactive/output.cpp

index 2e7358822c361d6926b67829dbd86b3c432ba4ca..6d6294abb898d220923d923900c0b0d17d504d60 100644 (file)
@@ -119,7 +119,7 @@ void InteractiveOutputTestCase::TestDllListLoaded()
 
         printf(" %s\n", (const char *)details.GetVersion().mb_str());
     }
-    
+
     wxPuts(wxEmptyString);
 #endif // TEST_DYNLIB
 }
@@ -328,7 +328,7 @@ public:
         : wxStackWalker(argv0)
     {
     }
-    
+
     virtual void Walk(size_t skip = 1, size_t maxdepth = wxSTACKWALKER_MAX_DEPTH)
     {
         wxPuts(wxT("Stack dump:"));
@@ -377,9 +377,9 @@ void InteractiveOutputTestCase::TestStackWalk()
 #if wxUSE_STACKWALKER
     wxPuts(wxT("*** Testing wxStackWalker ***"));
 
-    StackDump dump((const char*)wxTheApp->argv[0]);
+    StackDump dump(wxTheApp->argv[0].utf8_str());
     dump.Walk();
-    
+
     wxPuts("\n");
 #endif
 #endif // TEST_STACKWALKER
@@ -419,7 +419,7 @@ void InteractiveOutputTestCase::TestStandardPaths()
                     wxT("fr"),
                     wxStandardPaths::ResourceCat_Messages
                   ).c_str());
-                  
+
     wxPuts("\n");
 #endif // TEST_STDPATHS
 }
@@ -482,7 +482,7 @@ void InteractiveOutputTestCase::TestFSVolume()
                  vol.GetFlags() & wxFS_VOL_REMOVABLE ? wxT("removable")
                                                      : wxT("fixed"));
     }
-    
+
     wxPuts("\n");
 #endif // TEST_VOLUME
 }