compilation fixes (apparently, gcc <3.4 didn't validate code in templates that were...

[wxWidgets.git] / include / wx / msgout.h

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 9b9e020fe27947c17f9921e34c9618af60d156c9..cab47aa087ab7814229a37c66cc15ead42b80dd5 100755 (executable)
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -16,7 +16,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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 interface "msgout.h"
 #endif
 
     #pragma interface "msgout.h"
 #endif
 


@@ -28,7 +35,7 @@
 // something you can printf() to
 // ----------------------------------------------------------------------------
 
 // something you can printf() to
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMessageOutput
+class WXDLLIMPEXP_BASE wxMessageOutput

 {
 public:
     virtual ~wxMessageOutput() { }
 {
 public:
     virtual ~wxMessageOutput() { }


@@ -50,7 +57,7 @@ private:
 // implementation which sends output to stderr
 // ----------------------------------------------------------------------------
 
 // implementation which sends output to stderr
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMessageOutputStderr : public wxMessageOutput
+class WXDLLIMPEXP_BASE wxMessageOutputStderr : public wxMessageOutput

 {
 public:
     wxMessageOutputStderr() { }
 {
 public:
     wxMessageOutputStderr() { }


@@ -64,7 +71,7 @@ public:
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-class WXDLLEXPORT wxMessageOutputMessageBox : public wxMessageOutput
+class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput

 {
 public:
     wxMessageOutputMessageBox() { }
 {
 public:
     wxMessageOutputMessageBox() { }


@@ -74,11 +81,23 @@ public:
 
 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI
 

+// ----------------------------------------------------------------------------
+// implementation using the native way of outputting debug messages
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxMessageOutputDebug : public wxMessageOutput
+{
+public:
+    wxMessageOutputDebug() { }
+
+    virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+};
+

 // ----------------------------------------------------------------------------
 // implementation using wxLog (mainly for backwards compatibility)
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // implementation using wxLog (mainly for backwards compatibility)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMessageOutputLog : public wxMessageOutput
+class WXDLLIMPEXP_BASE wxMessageOutputLog : public wxMessageOutput

 {
 public:
     wxMessageOutputLog() { }
 {
 public:
     wxMessageOutputLog() { }