wxWinCE fixes.

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

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index b1e2aa118f785f395b9c3ef150e364f2a5194c12..171642b154d58524a06e26a0c6be0314860965e4 100755 (executable)
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     17.07.02
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     17.07.02
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -16,54 +16,91 @@
 // 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
 
 #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;
 };
 
 #endif // wxUSE_GUI
 
 
     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:
 {
 public:

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

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