Bug #1040683: Remove assert when deleting menu entry.

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

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 7a43ada630f47cded8cd56e431f1c352383f092e..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,7 +16,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#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
 
     #pragma interface "msgout.h"
 #endif
 


@@ -28,7 +35,7 @@
 // something you can printf() to
 // ----------------------------------------------------------------------------
 
 // something you can printf() to
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMessageOutput
+class WXDLLIMPEXP_BASE wxMessageOutput

 {
 public:
     virtual ~wxMessageOutput() { }
 {
 public:
     virtual ~wxMessageOutput() { }


@@ -50,7 +57,7 @@ private:
 // implementation which sends output to stderr
 // ----------------------------------------------------------------------------
 
 // implementation which sends output to stderr
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMessageOutputStderr : public wxMessageOutput
+class WXDLLIMPEXP_BASE wxMessageOutputStderr : public wxMessageOutput

 {
 public:
     wxMessageOutputStderr() { }
 {
 public:
     wxMessageOutputStderr() { }


@@ -64,7 +71,7 @@ public:
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-class WXDLLEXPORT wxMessageOutputMessageBox : public wxMessageOutput
+class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput

 {
 public:
     wxMessageOutputMessageBox() { }
 {
 public:
     wxMessageOutputMessageBox() { }


@@ -74,11 +81,23 @@ public:
 
 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI
 

+// ----------------------------------------------------------------------------
+// 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)
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // implementation using wxLog (mainly for backwards compatibility)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMessageOutputLog : public wxMessageOutput
+class WXDLLIMPEXP_BASE wxMessageOutputLog : public wxMessageOutput

 {
 public:
     wxMessageOutputLog() { }
 {
 public:
     wxMessageOutputLog() { }