// ----------------------------------------------------------------------------
#include "wx/defs.h"
-#include "wx/wxchar.h"
+#include "wx/chartype.h"
#include "wx/strvararg.h"
// ----------------------------------------------------------------------------
virtual ~wxMessageOutputBase() { }
// show a message to the user
- // void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2 = 0;
- WX_DEFINE_VARARG_FUNC_VOID(Printf, DoPrintf)
+ // 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:
- virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2 = 0;
+ // 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__
// 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;
};
wxMessageOutputBest() { }
protected:
- virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+ virtual void Output(const wxString& str);
};
// ----------------------------------------------------------------------------
wxMessageOutputStderr() { }
protected:
- virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+ virtual void Output(const wxString& str);
};
// ----------------------------------------------------------------------------
wxMessageOutputMessageBox() { }
protected:
- virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+ virtual void Output(const wxString& str);
};
#endif // wxUSE_GUI
wxMessageOutputDebug() { }
protected:
- virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+ virtual void Output(const wxString& str);
};
// ----------------------------------------------------------------------------
wxMessageOutputLog() { }
protected:
- virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+ virtual void Output(const wxString& str);
};
#endif