X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1abca322fd7a9a7abe6cc0b144987786faa0f05..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk/private.h diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h index f21f5e98dd..fa140d1cd3 100644 --- a/include/wx/gtk/private.h +++ b/include/wx/gtk/private.h @@ -23,13 +23,23 @@ #define GTK_CHECK_VERSION(a, b, c) 0 #endif +// pango_version_check symbol is quite recent ATM (4/2007)... so we +// use our own wrapper which implements a smart trick. +// Use this function as you'd use pango_version_check: +// +// if (!wx_pango_version_check(1,18,0)) +// ... call to a function available only in pango >= 1.18 ... +// +// and use it only to test for pango versions >= 1.16.0 +extern const gchar *wx_pango_version_check(int major, int minor, int micro); + #if wxUSE_UNICODE - #define wxGTK_CONV(s) wxConvUTF8.cWX2MB((s)) + #define wxGTK_CONV(s) s.utf8_str() #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)) + #define wxGTK_CONV_BACK(s) wxString::FromUTF8(s) #define wxGTK_CONV_BACK_ENC(s, enc) wxGTK_CONV_BACK(s) #define wxGTK_CONV_BACK_FONT(s, font) wxGTK_CONV_BACK(s) #define wxGTK_CONV_BACK_SYS(s) wxGTK_CONV_BACK(s) @@ -37,11 +47,11 @@ #include "wx/font.h" // convert the text between the given encoding and UTF-8 used by wxGTK - extern wxCharBuffer + extern WXDLLIMPEXP_CORE wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc = wxFONTENCODING_SYSTEM); - extern wxCharBuffer + extern WXDLLIMPEXP_CORE wxCharBuffer wxConvertFromGTK(const wxString& s, wxFontEncoding enc = wxFONTENCODING_SYSTEM);