Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxGTK_CONV_FONT/ENC

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-04-14 17:32:25 +00:00
parent 63916e4494
commit 1a6c768b17
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/gtk/private.h
View File

@@ -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