set eol-style

[wxWidgets.git] / include / wx / generic / dcpsg.h

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index d8e44192df2773e858d8e2aad12ebeb1ce63ca26..9e0af45f895a8db9a91b39d48bbf4929c0f810c3 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -95,14 +95,18 @@ public:
     static void SetResolution(int ppi);
     static int GetResolution();
 
     static void SetResolution(int ppi);
     static int GetResolution();
 

-    WX_DEFINE_VARARG_FUNC_VOID(PsPrintf, 1, (const wxString&),
+    WX_DEFINE_VARARG_FUNC_VOID(PsPrintf, 1, (const wxFormatString&),

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

-    WX_DEFINE_VARARG_FUNC_VOID(PsPrintf, 1, (const char*),
-                               DoPsPrintfFormatWchar, DoPsPrintfFormatUtf8)
-    WX_DEFINE_VARARG_FUNC_VOID(PsPrintf, 1, (const wchar_t*),
-                               DoPsPrintfFormatWchar, DoPsPrintfFormatUtf8)
+    WX_VARARG_WATCOM_WORKAROUND(void, PsPrintf, 1, (const wxString&),
+                                (wxFormatString(f1)));
+    WX_VARARG_WATCOM_WORKAROUND(void, PsPrintf, 1, (const wxCStrData&),
+                                (wxFormatString(f1)));
+    WX_VARARG_WATCOM_WORKAROUND(void, PsPrintf, 1, (const char*),
+                                (wxFormatString(f1)));
+    WX_VARARG_WATCOM_WORKAROUND(void, PsPrintf, 1, (const wchar_t*),
+                                (wxFormatString(f1)));

 #endif
 
     void PsPrint( const wxString& psdata );
 #endif
 
     void PsPrint( const wxString& psdata );