X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7219fc4f399649525000eddad593db377249ce4b..6bb000ec67f671142ba67feaddbaeddd2b575811:/src/common/msgout.cpp diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp index 316d014635..961e0c4614 100755 --- a/src/common/msgout.cpp +++ b/src/common/msgout.cpp @@ -17,7 +17,14 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__) +// Some older compilers (such as EMX) cannot handle +// #pragma interface/implementation correctly, iff +// #pragma implementation is used in _two_ translation +// units (as created by e.g. event.cpp compiled for +// libwx_base and event.cpp compiled for libwx_gui_core). +// So we must not use those pragmas for those compilers in +// such files. #pragma implementation "msgout.h" #endif @@ -48,6 +55,9 @@ #ifdef __WXMSW__ #include "wx/msw/private.h" #endif +#ifdef __WXMAC__ + #include "wx/mac/private.h" +#endif // =========================================================================== // implementation @@ -116,7 +126,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