X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..3f434666bf9476e7fc6c27de94075211db5f1417:/include/wx/msgout.h

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
old mode 100755
new mode 100644
index 8f5b19a7f3..b670f2b653
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -17,20 +17,64 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"
-#include "wx/wxchar.h"
+#include "wx/chartype.h"
+#include "wx/strvararg.h"
 
 // ----------------------------------------------------------------------------
 // wxMessageOutput is a class abstracting formatted output target, i.e.
 // something you can printf() to
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxMessageOutput
+// NB: VC6 has a bug that causes linker errors if you have template methods
+//     in a class using __declspec(dllimport). The solution is to split such
+//     class into two classes, one that contains the template methods and does
+//     *not* use WXDLLIMPEXP_BASE and another class that contains the rest
+//     (with DLL linkage).
+class wxMessageOutputBase
 {
 public:
-    virtual ~wxMessageOutput() { }
+    virtual ~wxMessageOutputBase() { }
 
     // show a message to the user
-    virtual void Printf(const wxChar* format, ...)  ATTRIBUTE_PRINTF_2 = 0;
+    // void Printf(const wxString& format, ...) = 0;
+    WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const wxFormatString&),
+                               DoPrintfWchar, DoPrintfUtf8)
+#ifdef __WATCOMC__
+    // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
+    WX_VARARG_WATCOM_WORKAROUND(void, Printf, 1, (const wxString&),
+                                (wxFormatString(f1)));
+    WX_VARARG_WATCOM_WORKAROUND(void, Printf, 1, (const wxCStrData&),
+                                (wxFormatString(f1)));
+    WX_VARARG_WATCOM_WORKAROUND(void, Printf, 1, (const char*),
+                                (wxFormatString(f1)));
+    WX_VARARG_WATCOM_WORKAROUND(void, Printf, 1, (const wchar_t*),
+                                (wxFormatString(f1)));
+#endif
+
+protected:
+    // NB: this is pure virtual so that it can be implemented in dllexported
+    //     wxMessagOutput class
+#if !wxUSE_UTF8_LOCALE_ONLY
+    virtual void DoPrintfWchar(const wxChar *format, ...) = 0;
+#endif
+#if wxUSE_UNICODE_UTF8
+    virtual void DoPrintfUtf8(const char *format, ...) = 0;
+#endif
+
+    // called by DoPrintf() to output formatted string
+    virtual void Output(const wxString& str) = 0;
+};
+
+#ifdef __VISUALC__
+    // "non dll-interface class 'wxStringPrintfMixin' used as base interface
+    // for dll-interface class 'wxString'" -- this is OK in our case
+    #pragma warning (disable:4275)
+#endif
+
+class WXDLLIMPEXP_BASE wxMessageOutput : public wxMessageOutputBase
+{
+public:
+    virtual ~wxMessageOutput() { }
 
     // gets the current wxMessageOutput object (may be NULL during
     // initialization or shutdown)
@@ -39,28 +83,38 @@ public:
     // sets the global wxMessageOutput instance; returns the previous one
     static wxMessageOutput* Set(wxMessageOutput* msgout);
 
+protected:
+#if !wxUSE_UTF8_LOCALE_ONLY
+    virtual void DoPrintfWchar(const wxChar *format, ...);
+#endif
+#if wxUSE_UNICODE_UTF8
+    virtual void DoPrintfUtf8(const char *format, ...);
+#endif
+    virtual void Output(const wxString& str) = 0;
+
 private:
     static wxMessageOutput* ms_msgOut;
 };
 
+#ifdef __VISUALC__
+    #pragma warning (default:4275)
+#endif
+
 // ----------------------------------------------------------------------------
 // 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
 // ----------------------------------------------------------------------------
 
-#if wxABI_VERSION > 20601
-
 class WXDLLIMPEXP_BASE wxMessageOutputBest : public wxMessageOutput
 {
 public:
     wxMessageOutputBest() { }
 
-    virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+protected:
+    virtual void Output(const wxString& str);
 };
 
-#endif // wxABI_VERSION
-
 // ----------------------------------------------------------------------------
 // implementation which sends output to stderr
 // ----------------------------------------------------------------------------
@@ -70,24 +124,26 @@ class WXDLLIMPEXP_BASE wxMessageOutputStderr : public wxMessageOutput
 public:
     wxMessageOutputStderr() { }
 
-    virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+protected:
+    virtual void Output(const wxString& str);
 };
 
 // ----------------------------------------------------------------------------
 // implementation which shows output in a message box
 // ----------------------------------------------------------------------------
 
-#if wxUSE_GUI
+#if wxUSE_GUI && wxUSE_MSGDLG
 
 class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput
 {
 public:
     wxMessageOutputMessageBox() { }
 
-    virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+protected:
+    virtual void Output(const wxString& str);
 };
 
-#endif // wxUSE_GUI
+#endif // wxUSE_GUI && wxUSE_MSGDLG
 
 // ----------------------------------------------------------------------------
 // implementation using the native way of outputting debug messages
@@ -98,7 +154,8 @@ class WXDLLIMPEXP_BASE wxMessageOutputDebug : public wxMessageOutput
 public:
     wxMessageOutputDebug() { }
 
-    virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+protected:
+    virtual void Output(const wxString& str);
 };
 
 // ----------------------------------------------------------------------------
@@ -110,7 +167,8 @@ class WXDLLIMPEXP_BASE wxMessageOutputLog : public wxMessageOutput
 public:
     wxMessageOutputLog() { }
 
-    virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+protected:
+    virtual void Output(const wxString& str);
 };
 
 #endif