diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp index e5fc5a45e9..07d8f4cf4c 100644 --- a/src/gtk/artgtk.cpp +++ b/src/gtk/artgtk.cpp @@ -28,8 +28,11 @@ #include "wx/module.h" #endif -#include "wx/gtk/private.h" - +#include +#if GTK_CHECK_VERSION(2, 9, 0) + // gtk_object_sink + #undef GTK_DISABLE_DEPRECATED +#endif #include // compatibility with older GTK+ versions: @@ -211,7 +214,7 @@ static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size) gs_gtkStyle = gtk_rc_get_style(widget); wxASSERT( gs_gtkStyle != NULL ); g_object_ref(gs_gtkStyle); - gtk_widget_destroy(widget); + gtk_object_sink((GtkObject*)widget); } GtkIconSet *iconset = gtk_style_lookup_icon_set(gs_gtkStyle, stockid); diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index ff3abce216..6aefef6e3b 100644 --- a/src/gtk/settings.cpp +++ b/src/gtk/settings.cpp @@ -126,7 +126,7 @@ static bool GetColourFromGTKWidget(GdkColor& gdkColor, } } - gtk_widget_destroy( widget ); + gtk_object_sink((GtkObject*)widget); return ok; } @@ -140,14 +140,7 @@ static void GetTooltipColors() gs_objects.m_colTooltip = wxColor(c); c = tooltips->tip_window->style->fg[GTK_STATE_NORMAL]; gs_objects.m_colTooltipText = wxColor(c); -#if GTK_CHECK_VERSION(2, 9, 0) - if (gtk_check_version(2, 9, 0) == NULL) - g_object_ref_sink(tooltips); - else -#endif - { - gtk_object_sink((GtkObject*)tooltips); - } + gtk_object_sink((GtkObject*)tooltips); } wxColour wxSystemSettingsNative::GetColour( wxSystemColour index ) @@ -355,7 +348,7 @@ wxFont wxSystemSettingsNative::GetFont( wxSystemFont index ) gs_objects.m_fontSystem = wxFont(wxString::FromAscii(font_name)); g_free (font_name); } - gtk_widget_destroy( widget ); + gtk_object_sink((GtkObject*)widget); } font = gs_objects.m_fontSystem; break;