FIXED more uses of functions deprecated in GTK+ 2.24

ksterker · Apr 30, 2011 · e72bc48 · e72bc48
1 parent f565eb7
commit e72bc48
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/src/backend/gtk/screen_gtk.h b/src/backend/gtk/screen_gtk.h
@@ -68,22 +68,29 @@ class screen_surface_gtk : public gfx::surface_gtk
     void set_drawable (GdkDrawable *drawable) 
     { 
         clear ();
-
-        if (GDK_IS_DRAWABLE (drawable))
-        {
-            int l, h;
-            gdk_drawable_get_size (drawable, &l, &h);
-            set_length (l);
-            set_height (h);
 
-            g_object_ref (drawable);
-            Drawable = drawable;
+        gint l, h;
+        if (GDK_IS_WINDOW (drawable))
+        {
+            l = gdk_window_get_width (GDK_WINDOW (drawable));
+            h = gdk_window_get_height (GDK_WINDOW (drawable));
+        }
+        else if (GDK_IS_PIXMAP (drawable))
+        {
+            gdk_pixmap_get_size (GDK_PIXMAP (drawable), &l, &h);
         }
         else
         {
             fprintf (stderr, "*** screen::set_drawable: Invalid drawable: %s!\n",
                     drawable ? G_OBJECT_TYPE_NAME(drawable) : "<null>");
+            return;
         }
+
+        set_length(l);
+        set_height(h);
+
+        g_object_ref (drawable);
+        Drawable = drawable;
     }
 
 protected:

diff --git a/src/mapedit/gui_entity_dialog.cc b/src/mapedit/gui_entity_dialog.cc
@@ -356,7 +356,7 @@ void GuiEntityDialog::applyChanges()
     if (EntityType == 'S' || EntityType == 'U')
     {
         GObject *widget = gtk_builder_get_object (Ui, "entity_id");
-        id = gtk_combo_box_get_active_text (GTK_COMBO_BOX (widget));
+        id = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (widget));
     }
 
     bool result; 
@@ -516,7 +516,7 @@ void GuiEntityDialog::set_page_active (const int & page, const bool & active)
     }
     else
     {
-        gtk_widget_hide_all (child);
+        gtk_widget_hide (child);
     }
 }
 

diff --git a/src/mapedit/gui_renderheight.cc b/src/mapedit/gui_renderheight.cc
@@ -33,7 +33,7 @@ GuiRenderHeight::GuiRenderHeight()
     gtk_scale_set_digits (GTK_SCALE(Range), 0);
     gtk_scale_set_draw_value (GTK_SCALE(Range), TRUE);
     gtk_scale_set_value_pos (GTK_SCALE(Range), GTK_POS_TOP);
-    gtk_range_set_update_policy (GTK_RANGE(Range), GTK_UPDATE_DELAYED);
+    // gtk_range_set_update_policy (GTK_RANGE(Range), GTK_UPDATE_DELAYED);
     gtk_range_set_inverted (GTK_RANGE(Range), TRUE);
     gtk_range_set_value (GTK_RANGE(Range), 100);
     gtk_widget_show (Range);