don't give an error when editing of the items label is cancelled (patch 1482176)

[wxWidgets.git] / src / gtk / minifram.cpp

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index f209407663b76c0b1ee58fed9dddcad40490ad8a..2e55af6f5357df2b298c8e53366aba97f2b83ed2 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -46,12 +46,12 @@ static void DrawFrame( GtkWidget *widget, int x, int y, int w, int h )
     x += org_x;
     y += org_y;
 
-    GdkGC *gc = gdk_gc_new( GDK_ROOT_PARENT() );
+    GdkGC *gc = gdk_gc_new( gdk_get_default_root_window() );
     gdk_gc_set_subwindow( gc, GDK_INCLUDE_INFERIORS );
     gdk_gc_set_function( gc, GDK_INVERT );
 
-    gdk_draw_rectangle( GDK_ROOT_PARENT(), gc, FALSE, x, y, w, h );
-    gdk_gc_unref( gc );
+    gdk_draw_rectangle( gdk_get_default_root_window(), gc, FALSE, x, y, w, h );
+    g_object_unref (G_OBJECT (gc));
 }
 
 //-----------------------------------------------------------------------------
@@ -92,7 +92,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
                             3,
                             win->m_width - 7,
                             height+1 );
-        gdk_gc_unref( gc );
+        g_object_unref (G_OBJECT (gc));
 
         // Hack alert
         dc.m_window = pizza->bin_window;
@@ -290,8 +290,8 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
                             );
 
         GtkWidget *pw = gtk_pixmap_new( pixmap, mask );
-        gdk_bitmap_unref( mask );
-        gdk_pixmap_unref( pixmap );
+        g_object_unref (G_OBJECT (mask));
+        g_object_unref (G_OBJECT (pixmap));
         gtk_widget_show( pw );
 
         GtkWidget *close_button = gtk_button_new();