added missing #include <wx/defs.h> (parts of patch 649438)

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

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 2576f194464d209a17a3d32b5fe6301e34f12bb7..b82c3b72a85c6151bd21d9301effcf5a28e7a4b1 100755 (executable)
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -16,63 +16,87 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "msgout.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/wxchar.h"
 
     #pragma interface "msgout.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/wxchar.h"
 

-class WXDLLEXPORT wxMessageOutput
+// ----------------------------------------------------------------------------
+// wxMessageOutput is a class abstracting formatted output target, i.e.
+// something you can printf() to
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxMessageOutput

 {
 public:
 {
 public:

-    virtual ~wxMessageOutput() {};
+    virtual ~wxMessageOutput() { }

 
     // show a message to the user
     virtual void Printf(const wxChar* format, ...)  ATTRIBUTE_PRINTF_2 = 0;
 
     // show a message to the user
     virtual void Printf(const wxChar* format, ...)  ATTRIBUTE_PRINTF_2 = 0;

+

     // gets the current wxMessageOutput object
     static wxMessageOutput* Get();
     // gets the current wxMessageOutput object
     static wxMessageOutput* Get();

+

     // sets the global wxMessageOutput instance; returns the previous one
     static wxMessageOutput* Set(wxMessageOutput* msgout);
     // sets the global wxMessageOutput instance; returns the previous one
     static wxMessageOutput* Set(wxMessageOutput* msgout);

+

 private:
     static wxMessageOutput* ms_msgOut;
 };
 
 private:
     static wxMessageOutput* ms_msgOut;
 };
 

-// sends output to stderr
-class WXDLLEXPORT wxMessageOutputStderr : public wxMessageOutput
+// ----------------------------------------------------------------------------
+// implementation which sends output to stderr
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxMessageOutputStderr : public wxMessageOutput

 {
 public:
 {
 public:

-    wxMessageOutputStderr() {};
+    wxMessageOutputStderr() { }

 
     virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
 };
 
 
     virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
 };
 

+// ----------------------------------------------------------------------------
+// implementation which shows output in a message box
+// ----------------------------------------------------------------------------
+

 #if wxUSE_GUI
 
 #if wxUSE_GUI
 

-// shows output in a message box
-class WXDLLEXPORT wxMessageOutputMessageBox : public wxMessageOutput
+class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput

 {
 public:
 {
 public:

-    wxMessageOutputMessageBox() {};
+    wxMessageOutputMessageBox() { }

 
     virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
 };
 
 
     virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
 };
 

-#ifdef __WXMOTIF__
+#endif // wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// implementation using the native way of outputting debug messages
+// ----------------------------------------------------------------------------

 
 

-// use wxLog; this is only required for wxMotif, so we put this code
-// inside wxUSE_GUI; it will work even without GUI
-class WXDLLEXPORT wxMessageOutputLog : public wxMessageOutput
+class WXDLLIMPEXP_BASE wxMessageOutputDebug : public wxMessageOutput

 {
 public:
 {
 public:

-    wxMessageOutputLog() {};
+    wxMessageOutputDebug() { }

 
     virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
 };
 
 
     virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
 };
 

-#endif // __WXMOTIF__
+// ----------------------------------------------------------------------------
+// implementation using wxLog (mainly for backwards compatibility)
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxMessageOutputLog : public wxMessageOutput
+{
+public:
+    wxMessageOutputLog() { }

 
 

-#endif // wxUSE_GUI
+    virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+};

 
 #endif
     // _WX_MSGOUT_H_
 
 #endif
     // _WX_MSGOUT_H_