Upport scrolling changes and mouse wheel changes.

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

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index f48232752a26c89a84594b49184e41d9e4faba4a..56b11a6244e3136b2e822200b74f19b10297969f 100755 (executable)
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -37,18 +37,29 @@ public:
 
     // show a message to the user
     // void Printf(const wxString& format, ...) = 0;
 
     // show a message to the user
     // void Printf(const wxString& format, ...) = 0;

-    WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const wxString&), DoPrintf)
+    WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const wxFormatString&),
+                               DoPrintfWchar, DoPrintfUtf8)

 #ifdef __WATCOMC__
     // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
 #ifdef __WATCOMC__
     // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351

-    WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const char*), DoPrintf)
-    WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const wchar_t*), DoPrintf)
-    WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const wxCStrData&), DoPrintf)
+    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
 #endif
 
 protected:
     // NB: this is pure virtual so that it can be implemented in dllexported
     //     wxMessagOutput class

-    virtual void DoPrintf(const wxString& format, ...) = 0;
+#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;
 
     // called by DoPrintf() to output formatted string
     virtual void Output(const wxString& str) = 0;


@@ -73,7 +84,12 @@ public:
     static wxMessageOutput* Set(wxMessageOutput* msgout);
 
 protected:
     static wxMessageOutput* Set(wxMessageOutput* msgout);
 
 protected:

-    virtual void DoPrintf(const wxString& format, ...);
+#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:
     virtual void Output(const wxString& str) = 0;
 
 private: