X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e691f46b2ec1b5dbbff2e51131e3c532e688a89..dac7d53a83c862235ad8f3dfe5706e9af4c1480a:/include/wx/gtk1/private.h?ds=sidebyside

diff --git a/include/wx/gtk1/private.h b/include/wx/gtk1/private.h
index aa0dd2841e..877dd4b561 100644
--- a/include/wx/gtk1/private.h
+++ b/include/wx/gtk1/private.h
@@ -23,8 +23,22 @@
     #define GTK_CHECK_VERSION(a, b, c) 0
 #endif
 
-// GTK+ 2.0 compatibility define is broken when used from C++ as it casts enum
-// to int implicitly
+#ifdef __WXGTK20__
+#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__
     #undef gtk_signal_disconnect_by_func
     #define gtk_signal_disconnect_by_func(object,func,data) \
@@ -87,12 +101,9 @@
     #define NOTEBOOK_PANEL(nb)  GTK_NOTEBOOK(nb)->panel
 #endif
 
-// VZ: I _think_ that in GTK+ 2.0 the scroll type is passed to the
-//     value_changed callback as a 2nd argument but I'm not at all sure about
-//     it, if this is false all occurences of this macro must be changed!
 #ifdef __WXGTK20__
-    #define SCROLLBAR_CBACK_ARG GtkScrollType scrollType,
-    #define GET_SCROLL_TYPE(w)   scrollType
+    #define SCROLLBAR_CBACK_ARG
+    #define GET_SCROLL_TYPE(w)   GTK_SCROLL_JUMP
 #else
     #define SCROLLBAR_CBACK_ARG
     #define GET_SCROLL_TYPE(w)   GTK_RANGE((w))->scroll_type