cleanup - added whitespace around operators, some blank lines, fixed comment typos...

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

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 171642b154d58524a06e26a0c6be0314860965e4..95db8a5c8cc6e8cee682e77490d4bd332cb24629 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) wxWidgets team
+// Copyright:   (c) Mattia Barbon

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


@@ -16,17 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#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"
 
 #include "wx/defs.h"
 #include "wx/wxchar.h"
 


@@ -43,7 +32,8 @@ public:
     // 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
+    // gets the current wxMessageOutput object (may be NULL during
+    // initialization or shutdown)

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


@@ -53,6 +43,20 @@ private:
     static wxMessageOutput* ms_msgOut;
 };
 
     static wxMessageOutput* ms_msgOut;
 };
 

+// ----------------------------------------------------------------------------
+// implementation showing the message to the user in "best" possible way: uses
+// native message box if available (currently only under Windows) and stderr
+// otherwise; unlike wxMessageOutputMessageBox this class is always safe to use
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxMessageOutputBest : public wxMessageOutput
+{
+public:
+    wxMessageOutputBest() { }
+
+    virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+};
+

 // ----------------------------------------------------------------------------
 // implementation which sends output to stderr
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // implementation which sends output to stderr
 // ----------------------------------------------------------------------------