Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fix for "interactive" test in wxUSE_STL=1 build.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2010-07-12 22:50:41 +00:00
parent 71e33c7524
commit da569065d8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/interactive/output.cpp
View File

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