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

more changes to make wx compile without implicit wxString->char* conversion (for STL build)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-06-20 07:44:45 +00:00
parent d38f70b249
commit e0a050e347
55 changed files with 183 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/msgout.cpp
View File

@@ -128,7 +128,8 @@ void wxMessageOutputBest::Output(const wxString& str)
#ifdef __WINDOWS__
if ( !IsInConsole() )
{
::MessageBox(NULL, str, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK);
::MessageBox(NULL, str.wx_str(), _T("wxWidgets"),
MB_ICONINFORMATION | MB_OK);
}
else
#endif // __WINDOWS__/!__WINDOWS__
@@ -167,7 +168,7 @@ void wxMessageOutputDebug::Output(const wxString& str)
#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
out.Replace(wxT("\t"), wxT(" "));
out.Replace(wxT("\n"), wxT("\r\n"));
::OutputDebugString(out);
::OutputDebugString(out.wx_str());
#elif defined(__WXMAC__) && !defined(__DARWIN__)
if ( wxIsDebuggerRunning() )
{