X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..9941ff2d65e13d3de3e0e4d452118df34a168455:/include/wx/msgout.h?ds=sidebyside diff --git a/include/wx/msgout.h b/include/wx/msgout.h index 747f2a9d40..cab47aa087 100755 --- a/include/wx/msgout.h +++ b/include/wx/msgout.h @@ -16,7 +16,14 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(__APPLE__) +#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 interface "msgout.h" #endif @@ -28,7 +35,7 @@ // something you can printf() to // ---------------------------------------------------------------------------- -class WXDLLEXPORT_BASE wxMessageOutput +class WXDLLIMPEXP_BASE wxMessageOutput { public: virtual ~wxMessageOutput() { } @@ -50,7 +57,7 @@ private: // implementation which sends output to stderr // ---------------------------------------------------------------------------- -class WXDLLEXPORT_BASE wxMessageOutputStderr : public wxMessageOutput +class WXDLLIMPEXP_BASE wxMessageOutputStderr : public wxMessageOutput { public: wxMessageOutputStderr() { } @@ -64,7 +71,7 @@ public: #if wxUSE_GUI -class WXDLLEXPORT_CORE wxMessageOutputMessageBox : public wxMessageOutput +class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput { public: wxMessageOutputMessageBox() { } @@ -78,7 +85,7 @@ public: // implementation using the native way of outputting debug messages // ---------------------------------------------------------------------------- -class WXDLLEXPORT_BASE wxMessageOutputDebug : public wxMessageOutput +class WXDLLIMPEXP_BASE wxMessageOutputDebug : public wxMessageOutput { public: wxMessageOutputDebug() { } @@ -90,7 +97,7 @@ public: // implementation using wxLog (mainly for backwards compatibility) // ---------------------------------------------------------------------------- -class WXDLLEXPORT_BASE wxMessageOutputLog : public wxMessageOutput +class WXDLLIMPEXP_BASE wxMessageOutputLog : public wxMessageOutput { public: wxMessageOutputLog() { }