More GtkObject fixes

(bzr r11382)

3 files changed, 18 insertions, 17 deletions

diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index a9ad5da44..74450adb6 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -94,7 +94,11 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
     Geom::Point const event_win(wx, wy);
 
     gint width, height;
+#if GTK_CHECK_VERSION(3,0,0)
+    gdk_window_get_geometry(window, NULL /*x*/, NULL /*y*/, &width, &height);
+#else
     gdk_window_get_geometry(window, NULL /*x*/, NULL /*y*/, &width, &height, NULL/*depth*/);
+#endif
 
     switch (event->type) {
     case GDK_BUTTON_PRESS:
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index affc6bed9..6b860041e 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -71,7 +71,7 @@ enum {
 
 static void sp_font_selector_class_init         (SPFontSelectorClass    *c);
 static void sp_font_selector_init               (SPFontSelector         *fsel);
-static void sp_font_selector_destroy            (GtkObject              *object);
+static void sp_font_selector_dispose            (GObject              *object);
 
 static void sp_font_selector_family_select_row  (GtkTreeSelection       *selection,
                                                  SPFontSelector         *fsel);
@@ -119,7 +119,7 @@ GType sp_font_selector_get_type()
 
 static void sp_font_selector_class_init(SPFontSelectorClass *c)
 {
-    GtkObjectClass *object_class = (GtkObjectClass *) c;
+    GObjectClass *object_class = (GObjectClass *) c;
 
     fs_parent_class = (GtkHBoxClass* )g_type_class_peek_parent (c);
 
@@ -132,7 +132,7 @@ static void sp_font_selector_class_init(SPFontSelectorClass *c)
                                            G_TYPE_NONE,
                                            1, G_TYPE_POINTER);
 
-    object_class->destroy = sp_font_selector_destroy;
+    object_class->dispose = sp_font_selector_dispose;
 }
 
 static void sp_font_selector_init(SPFontSelector *fsel)
@@ -253,7 +253,7 @@ This conditional and its #else block can be deleted in the future.
         fsel->font = NULL;
 }
 
-static void sp_font_selector_destroy(GtkObject *object)
+static void sp_font_selector_dispose(GObject *object)
 {
     SPFontSelector *fsel = SP_FONT_SELECTOR (object);
 
@@ -272,8 +272,8 @@ static void sp_font_selector_destroy(GtkObject *object)
         fsel->styles.length = 0;
     }
 
-    if (GTK_OBJECT_CLASS(fs_parent_class)->destroy) {
-        GTK_OBJECT_CLASS(fs_parent_class)->destroy(object);
+    if (G_OBJECT_CLASS(fs_parent_class)->dispose) {
+        G_OBJECT_CLASS(fs_parent_class)->dispose(object);
     }
 }
 
@@ -404,7 +404,7 @@ static void sp_font_selector_emit_set (SPFontSelector *fsel)
             fsel->font->Unref();
         }
         fsel->font = font;
-        g_signal_emit(GTK_OBJECT(fsel), fs_signals[FONT_SET], 0, fsel->font);
+        g_signal_emit(fsel, fs_signals[FONT_SET], 0, fsel->font);
     }
     fsel->fontsize_dirty = false;
     if (font) {
diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp
index e820beac6..3a8caa28c 100644
--- a/src/widgets/gradient-selector.cpp
+++ b/src/widgets/gradient-selector.cpp
@@ -39,7 +39,7 @@ enum {
 
 static void sp_gradient_selector_class_init (SPGradientSelectorClass *klass);
 static void sp_gradient_selector_init (SPGradientSelector *selector);
-static void sp_gradient_selector_destroy (GtkObject *object);
+static void sp_gradient_selector_dispose(GObject *object);
 
 /* Signal handlers */
 static void sp_gradient_selector_vector_set (SPGradientVectorSelector *gvs, SPGradient *gr, SPGradientSelector *sel);
@@ -75,12 +75,9 @@ GType sp_gradient_selector_get_type(void)
     return type;
 }
 
-static void
-sp_gradient_selector_class_init (SPGradientSelectorClass *klass)
+static void sp_gradient_selector_class_init(SPGradientSelectorClass *klass)
 {
-    GtkObjectClass *object_class;
-
-    object_class = (GtkObjectClass *) klass;
+    GObjectClass *object_class = (GObjectClass *) klass;
 
     parent_class = (GtkVBoxClass*)g_type_class_peek_parent (klass);
 
@@ -113,7 +110,7 @@ sp_gradient_selector_class_init (SPGradientSelectorClass *klass)
                                         g_cclosure_marshal_VOID__VOID,
                                         G_TYPE_NONE, 0);
 
-    object_class->destroy = sp_gradient_selector_destroy;
+    object_class->dispose = sp_gradient_selector_dispose;
 }
 
 static void sp_gradient_selector_init(SPGradientSelector *sel)
@@ -202,7 +199,7 @@ static void sp_gradient_selector_init(SPGradientSelector *sel)
     gtk_box_pack_end( GTK_BOX(hb), sel->spreadLbl, FALSE, FALSE, 4 );
 }
 
-static void sp_gradient_selector_destroy(GtkObject *object)
+static void sp_gradient_selector_dispose(GObject *object)
 {
     SPGradientSelector *sel = SP_GRADIENT_SELECTOR( object );
 
@@ -212,8 +209,8 @@ static void sp_gradient_selector_destroy(GtkObject *object)
         sel->nonsolid.~vector<GtkWidget*>();
     }
 
-    if (((GtkObjectClass *) (parent_class))->destroy) {
-        (* ((GtkObjectClass *) (parent_class))->destroy) (object);
+    if (((GObjectClass *) (parent_class))->dispose) {
+        (* ((GObjectClass *) (parent_class))->dispose) (object);
     }
 }