From 1a6c768b178557a8546e02b72f1e46c747f4f6c7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 14 Apr 2006 17:32:25 +0000 Subject: [PATCH] added wxGTK_CONV_FONT/ENC git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/private.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h index 05699a287a..52b5643d29 100644 --- a/include/wx/gtk/private.h +++ b/include/wx/gtk/private.h @@ -23,9 +23,11 @@ #endif #if wxUSE_UNICODE - #define wxGTK_CONV(s) wxConvUTF8.cWX2MB(s) - #define wxGTK_CONV_SYS(s) wxGTK_CONV(s) - #define wxGTK_CONV_BACK(s) wxConvUTF8.cMB2WX(s) + #define wxGTK_CONV(s) wxConvUTF8.cWX2MB((s)) + #define wxGTK_CONV_ENC(s, enc) wxGTK_CONV((s)) + #define wxGTK_CONV_FONT(s, font) wxGTK_CONV((s)) + #define wxGTK_CONV_SYS(s) wxGTK_CONV((s)) + #define wxGTK_CONV_BACK(s) wxConvUTF8.cMB2WX((s)) #else #include "wx/font.h" @@ -41,9 +43,11 @@ : wxFONTENCODING_SYSTEM); } - #define wxGTK_CONV(s) wxConvertToGTK((s), m_font) - #define wxGTK_CONV_SYS(s) wxConvertToGTK(s) - #define wxGTK_CONV_BACK(s) wxConvLocal.cWC2WX( wxConvUTF8.cMB2WC((s)) ) + #define wxGTK_CONV_ENC(s, enc) wxConvertToGTK((s), (enc)) + #define wxGTK_CONV_FONT(s, font) wxConvertToGTK((s), (font)) + #define wxGTK_CONV(s) wxGTK_CONV_FONT((s), m_font) + #define wxGTK_CONV_SYS(s) wxConvertToGTK((s)) + #define wxGTK_CONV_BACK(s) wxConvLocal.cWC2WX(wxConvUTF8.cMB2WC((s))) #endif // Some deprecated GTK+ prototypes we still use often -- 2.45.2