From da569065d835d713860baf0afa20f6e4bd77d617 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 12 Jul 2010 22:50:41 +0000 Subject: [PATCH] Compilation fix for "interactive" test in wxUSE_STL=1 build. 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 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/interactive/output.cpp b/tests/interactive/output.cpp index 2e7358822c..6d6294abb8 100644 --- a/tests/interactive/output.cpp +++ b/tests/interactive/output.cpp @@ -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 } -- 2.50.0