Beginning to make wxDC code compile both before

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

diff --git a/include/wx/string.h b/include/wx/string.h
index 6a47d751a09d423ca50dbe2ccd57fa291b8637fa..dac27573fa722cdd517a24d943101786b4fc0716 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -1154,7 +1154,11 @@ public:
     static wxString FromUTF8(const char *utf8)
       { return wxString(wxConvUTF8.cMB2WC(utf8)); }
     static wxString FromUTF8(const char *utf8, size_t len)
     static wxString FromUTF8(const char *utf8)
       { return wxString(wxConvUTF8.cMB2WC(utf8)); }
     static wxString FromUTF8(const char *utf8, size_t len)

-      { return wxString(wxConvUTF8.cMB2WC(utf8, len == npos ? wxNO_LEN : len)); }
+    {
+      size_t wlen;
+      wxWCharBuffer buf(wxConvUTF8.cMB2WC(utf8, len == npos ? wxNO_LEN : len, &wlen));
+      return wxString(buf.data(), wlen);
+    }

     const wxCharBuffer utf8_str() const { return wxConvUTF8.cWC2MB(wc_str()); }
     const wxCharBuffer ToUTF8() const { return utf8_str(); }
 #endif
     const wxCharBuffer utf8_str() const { return wxConvUTF8.cWC2MB(wc_str()); }
     const wxCharBuffer ToUTF8() const { return utf8_str(); }
 #endif


@@ -1575,12 +1579,15 @@ public:
   WX_DEFINE_VARARG_FUNC(int, Printf, 1, (const wxFormatString&),
                         DoPrintfWchar, DoPrintfUtf8)
 #ifdef __WATCOMC__
   WX_DEFINE_VARARG_FUNC(int, Printf, 1, (const wxFormatString&),
                         DoPrintfWchar, DoPrintfUtf8)
 #ifdef __WATCOMC__

-  WX_DEFINE_VARARG_FUNC(int, Printf, 1, (const char*),
-                        DoPrintfWchar, DoPrintfUtf8)
-  WX_DEFINE_VARARG_FUNC(int, Printf, 1, (const wchar_t*),
-                        DoPrintfWchar, DoPrintfUtf8)
-  WX_DEFINE_VARARG_FUNC(int, Printf, 1, (const wxCStrData&),
-                        DoPrintfWchar, DoPrintfUtf8)
+  // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
+  WX_VARARG_WATCOM_WORKAROUND(int, Printf, 1, (const wxString&),
+                              (wxFormatString(f1)));
+  WX_VARARG_WATCOM_WORKAROUND(int, Printf, 1, (const wxCStrData&),
+                              (wxFormatString(f1)));
+  WX_VARARG_WATCOM_WORKAROUND(int, Printf, 1, (const char*),
+                              (wxFormatString(f1)));
+  WX_VARARG_WATCOM_WORKAROUND(int, Printf, 1, (const wchar_t*),
+                              (wxFormatString(f1)));

 #endif
 #endif // !wxNEEDS_WXSTRING_PRINTF_MIXIN
     // as vprintf(), returns the number of characters written or < 0 on error
 #endif
 #endif // !wxNEEDS_WXSTRING_PRINTF_MIXIN
     // as vprintf(), returns the number of characters written or < 0 on error


@@ -1593,12 +1600,14 @@ public:
                         DoFormatWchar, DoFormatUtf8)
 #ifdef __WATCOMC__
   // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
                         DoFormatWchar, DoFormatUtf8)
 #ifdef __WATCOMC__
   // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351

-  WX_DEFINE_VARARG_FUNC(static wxString, Format, 1, (const char*),
-                        DoFormatWchar, DoFormatUtf8)
-  WX_DEFINE_VARARG_FUNC(static wxString, Format, 1, (const wchar_t*),
-                        DoFormatWchar, DoFormatUtf8)
-  WX_DEFINE_VARARG_FUNC(static wxString, Format, 1, (const wxCStrData&),
-                        DoFormatWchar, DoFormatUtf8)
+  WX_VARARG_WATCOM_WORKAROUND(static wxString, Format, 1, (const wxString&),
+                              (wxFormatString(f1)));
+  WX_VARARG_WATCOM_WORKAROUND(static wxString, Format, 1, (const wxCStrData&),
+                              (wxFormatString(f1)));
+  WX_VARARG_WATCOM_WORKAROUND(static wxString, Format, 1, (const char*),
+                              (wxFormatString(f1)));
+  WX_VARARG_WATCOM_WORKAROUND(static wxString, Format, 1, (const wchar_t*),
+                              (wxFormatString(f1)));

 #endif
 #endif
     // the same as above, but takes a va_list
 #endif
 #endif
     // the same as above, but takes a va_list


@@ -1640,12 +1649,14 @@ public:
                         DoPrintfWchar, DoPrintfUtf8)
 #ifdef __WATCOMC__
   // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
                         DoPrintfWchar, DoPrintfUtf8)
 #ifdef __WATCOMC__
   // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351

-  WX_DEFINE_VARARG_FUNC(int, sprintf, 1, (const char*),
-                        DoPrintfWchar, DoPrintfUtf8)
-  WX_DEFINE_VARARG_FUNC(int, sprintf, 1, (const wchar_t*),
-                        DoPrintfWchar, DoPrintfUtf8)
-  WX_DEFINE_VARARG_FUNC(int, sprintf, 1, (const wxCStrData&),
-                        DoPrintfWchar, DoPrintfUtf8)
+  WX_VARARG_WATCOM_WORKAROUND(int, sprintf, 1, (const wxString&),
+                              (wxFormatString(f1)));
+  WX_VARARG_WATCOM_WORKAROUND(int, sprintf, 1, (const wxCStrData&),
+                              (wxFormatString(f1)));
+  WX_VARARG_WATCOM_WORKAROUND(int, sprintf, 1, (const char*),
+                              (wxFormatString(f1)));
+  WX_VARARG_WATCOM_WORKAROUND(int, sprintf, 1, (const wchar_t*),
+                              (wxFormatString(f1)));

 #endif
 #endif // wxNEEDS_WXSTRING_PRINTF_MIXIN
 
 #endif
 #endif // wxNEEDS_WXSTRING_PRINTF_MIXIN