renamed wxWindow::Clear() to ClearBackground() (fixes bug 783576)

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

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index b1e2aa118f785f395b9c3ef150e364f2a5194c12..f5bee59ac8d1051faf5dd480c69e92a8e29beecd 100755 (executable)
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -16,54 +16,84 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #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:
-    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
-class WXDLLEXPORT wxMessageOutputStderr : public wxMessageOutput
+// ----------------------------------------------------------------------------
+// implementation which sends output to stderr
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE 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
+class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput
 {
 public:
-    wxMessageOutputMessageBox() {};
+    wxMessageOutputMessageBox() { }
 
     virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
 };
 
 #endif // wxUSE_GUI
 
-class WXDLLEXPORT wxMessageOutputLog : public wxMessageOutput
+// ----------------------------------------------------------------------------
+// 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)
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxMessageOutputLog : public wxMessageOutput
 {
 public:
-    wxMessageOutputLog() {};
+    wxMessageOutputLog() { }
 
     virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
 };