Applied patch [ 670782 ] Combobox uses popup window width

[wxWidgets.git] / include / wx / gtk / private.h

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index aa0dd2841e8a1d66666dcefc1b98d2be08831dd8..621852a75d17c7e565d924119585efefa2ea6b76 100644 (file)
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -23,8 +23,22 @@
     #define GTK_CHECK_VERSION(a, b, c) 0
 #endif
 
     #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) \
 #ifdef __WXGTK20__
     #undef gtk_signal_disconnect_by_func
     #define gtk_signal_disconnect_by_func(object,func,data) \


@@ -47,20 +61,6 @@
     #define TOGGLE_BUTTON_EVENT_WIN(w) GTK_TOGGLE_BUTTON((w))->event_window
 #endif
 
     #define TOGGLE_BUTTON_EVENT_WIN(w) GTK_TOGGLE_BUTTON((w))->event_window
 #endif
 

-// get the font from a style
-//
-// TODO: GdkFont has been replaced by PangoFontDescription in GTK+ 2.0
-//       and we really should use it instead of GdkFont (see also dclient.cpp)
-#ifdef __WXGTK20__
-    #define GET_STYLE_FONT(style) gtk_style_get_font(style)
-    #define SET_STYLE_FONT(style, font) gtk_style_set_font(style, font)
-#else
-    #define GET_STYLE_FONT(style) ((style)->font)
-    #define SET_STYLE_FONT(style, fnt) \
-        gdk_font_unref( style->font );  \
-        style->font = gdk_font_ref( fnt )
-#endif
-

 // gtk_editable_{copy|cut|paste}_clipboard() had an extra argument under
 // previous GTK+ versions but no more
 #if defined(__WXGTK20__) || (GTK_MINOR_VERSION > 0)
 // gtk_editable_{copy|cut|paste}_clipboard() had an extra argument under
 // previous GTK+ versions but no more
 #if defined(__WXGTK20__) || (GTK_MINOR_VERSION > 0)


@@ -87,12 +87,9 @@
     #define NOTEBOOK_PANEL(nb)  GTK_NOTEBOOK(nb)->panel
 #endif
 
     #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__
 #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
 #else
     #define SCROLLBAR_CBACK_ARG
     #define GET_SCROLL_TYPE(w)   GTK_RANGE((w))->scroll_type