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

Added various MACROS for converting strings

Browse Source 
back and forth in the different ansi/unicode/gtk
    mode/versions.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-08-05 17:57:53 +00:00
parent 54afeafe9b
commit dd398cd02c
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,8 +23,22 @@
#define GTK_CHECK_VERSION(a, b, c) 0 #define GTK_CHECK_VERSION(a, b, c) 0
#endif #endif
// GTK+ 2.0 compatibility define is broken when used from C++ as it casts enum #ifdef __WXGTK20__
// to int implicitly #if wxUSE_UNICODE
#define wxGTK_CONV(s) wxConvUTF8.cWX2MB(s)
#define wxGTK_CONV_BACK(s) wxConvUTF8.cMB2WX(s)
#else
#define wxGTK_CONV(s) wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC(s) )
#define wxGTK_CONV_BACK(s) wxConvLocal.cWC2WX( (wxConvUTF8.cMB2WC( s ) ) )
#endif
#else
#define wxGTK_CONV(s) s.c_str()
#define wxGTK_CONV_BACK(s) s
#endif
// GTK+ 2.0 compatibility define is broken when used from C++ as it
// casts enum to int implicitly
#ifdef __WXGTK20__ #ifdef __WXGTK20__
#undef gtk_signal_disconnect_by_func #undef gtk_signal_disconnect_by_func
#define gtk_signal_disconnect_by_func(object,func,data) \ #define gtk_signal_disconnect_by_func(object,func,data) \

18
include/wx/gtk1/private.h
View File

@@ -23,8 +23,22 @@
#define GTK_CHECK_VERSION(a, b, c) 0 #define GTK_CHECK_VERSION(a, b, c) 0
#endif #endif
// GTK+ 2.0 compatibility define is broken when used from C++ as it casts enum #ifdef __WXGTK20__
// to int implicitly #if wxUSE_UNICODE
#define wxGTK_CONV(s) wxConvUTF8.cWX2MB(s)
#define wxGTK_CONV_BACK(s) wxConvUTF8.cMB2WX(s)
#else
#define wxGTK_CONV(s) wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC(s) )
#define wxGTK_CONV_BACK(s) wxConvLocal.cWC2WX( (wxConvUTF8.cMB2WC( s ) ) )
#endif
#else
#define wxGTK_CONV(s) s.c_str()
#define wxGTK_CONV_BACK(s) s
#endif
// GTK+ 2.0 compatibility define is broken when used from C++ as it
// casts enum to int implicitly
#ifdef __WXGTK20__ #ifdef __WXGTK20__
#undef gtk_signal_disconnect_by_func #undef gtk_signal_disconnect_by_func
#define gtk_signal_disconnect_by_func(object,func,data) \ #define gtk_signal_disconnect_by_func(object,func,data) \