X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74698d3a22d5e611bbcd731a3ade616c66cfaca6..af8481937288aa79f67b5e7df3caeef5a7824248:/include/wx/msgout.h

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 2576f19446..f6422c6f38 100755
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -16,63 +16,87 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "msgout.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/wxchar.h"
 
+// ----------------------------------------------------------------------------
+// wxMessageOutput is a class abstracting formatted output target, i.e.
+// something you can printf() to
+// ----------------------------------------------------------------------------
+
 class WXDLLEXPORT wxMessageOutput
 {
 public:
-    virtual ~wxMessageOutput() {};
+    virtual ~wxMessageOutput() { }
 
     // show a message to the user
     virtual void Printf(const wxChar* format, ...)  ATTRIBUTE_PRINTF_2 = 0;
+
     // gets the current wxMessageOutput object
     static wxMessageOutput* Get();
+
     // sets the global wxMessageOutput instance; returns the previous one
     static wxMessageOutput* Set(wxMessageOutput* msgout);
+
 private:
     static wxMessageOutput* ms_msgOut;
 };
 
-// sends output to stderr
+// ----------------------------------------------------------------------------
+// implementation which sends output to stderr
+// ----------------------------------------------------------------------------
+
 class WXDLLEXPORT wxMessageOutputStderr : public wxMessageOutput
 {
 public:
-    wxMessageOutputStderr() {};
+    wxMessageOutputStderr() { }
 
     virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
 };
 
+// ----------------------------------------------------------------------------
+// implementation which shows output in a message box
+// ----------------------------------------------------------------------------
+
 #if wxUSE_GUI
 
-// shows output in a message box
 class WXDLLEXPORT wxMessageOutputMessageBox : public wxMessageOutput
 {
 public:
-    wxMessageOutputMessageBox() {};
+    wxMessageOutputMessageBox() { }
 
     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 WXDLLEXPORT wxMessageOutputDebug : public wxMessageOutput
 {
 public:
-    wxMessageOutputLog() {};
+    wxMessageOutputDebug() { }
 
     virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
 };
 
-#endif // __WXMOTIF__
+// ----------------------------------------------------------------------------
+// implementation using wxLog (mainly for backwards compatibility)
+// ----------------------------------------------------------------------------
 
-#endif // wxUSE_GUI
+class WXDLLEXPORT wxMessageOutputLog : public wxMessageOutput
+{
+public:
+    wxMessageOutputLog() { }
+
+    virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+};
 
 #endif
     // _WX_MSGOUT_H_