X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46446cc2aa025f445815545b31552a509b5e3f7e..e3b8a866960ec59e5c1dfa927e3e222b73ea8a57:/src/common/msgout.cpp?ds=sidebyside diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp index aa06d2208b..f66ffdc2b2 100755 --- a/src/common/msgout.cpp +++ b/src/common/msgout.cpp @@ -39,16 +39,24 @@ #endif #include "wx/msgout.h" +#include "wx/apptrait.h" #include "wx/log.h" #include #include +#ifdef __WXMSW__ + #include "wx/msw/private.h" +#endif +#ifdef __WXMAC__ + #include "wx/mac/private.h" +#endif + // =========================================================================== // implementation // =========================================================================== -#ifdef __WXBASE__ +#if wxUSE_BASE // ---------------------------------------------------------------------------- // wxMessageOutput @@ -60,7 +68,7 @@ wxMessageOutput* wxMessageOutput::Get() { if ( !ms_msgOut && wxTheApp ) { - ms_msgOut = wxTheApp->CreateMessageOutput(); + ms_msgOut = wxTheApp->GetTraits()->CreateMessageOutput(); } return ms_msgOut; @@ -111,7 +119,7 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...) if ( wxIsDebuggerRunning() ) { Str255 pstr; - wxString output = str + wxT(";g") ; + wxString output = out + wxT(";g") ; wxMacStringToPascal(output.c_str(), pstr); #ifdef __powerc @@ -146,7 +154,7 @@ void wxMessageOutputLog::Printf(const wxChar* format, ...) ::wxLogMessage(wxT("%s"), out.c_str()); } -#endif // __WXBASE__ +#endif // wxUSE_BASE // ---------------------------------------------------------------------------- // wxMessageOutputMessageBox