Get rid of remaining GtkObject usage

Fixed bugs:
  - https://launchpad.net/bugs/813212

(bzr r11473)

4 files changed, 87 insertions, 52 deletions

diff --git a/src/widgets/sp-xmlview-attr-list.cpp b/src/widgets/sp-xmlview-attr-list.cpp
index 0b4dcce32..8e7c94572 100644
--- a/src/widgets/sp-xmlview-attr-list.cpp
+++ b/src/widgets/sp-xmlview-attr-list.cpp
@@ -22,7 +22,12 @@
 
 static void sp_xmlview_attr_list_class_init (SPXMLViewAttrListClass * klass);
 static void sp_xmlview_attr_list_init (SPXMLViewAttrList * list);
-static void sp_xmlview_attr_list_destroy (GtkObject * object);
+
+#if GTK_CHECK_VERSION(3,0,0)
+static void sp_xmlview_attr_list_destroy(GtkWidget * object);
+#else
+static void sp_xmlview_attr_list_destroy(GtkObject * object);
+#endif
 
 static void event_attr_changed (Inkscape::XML::Node * repr, const gchar * name, const gchar * old_value, const gchar * new_value, bool is_interactive, gpointer data);
 
@@ -109,24 +114,26 @@ GType sp_xmlview_attr_list_get_type(void)
     return type;
 }
 
-void
-sp_xmlview_attr_list_class_init (SPXMLViewAttrListClass * klass)
+void sp_xmlview_attr_list_class_init (SPXMLViewAttrListClass * klass)
 {
-	GtkObjectClass * object_class;
-
-	object_class = (GtkObjectClass *) klass;
+#if GTK_CHECK_VERSION(3,0,0)
+	GtkWidgetClass * widget_class = (GtkWidgetClass *) klass;
+	widget_class->destroy = sp_xmlview_attr_list_destroy;
+#else
+	GtkObjectClass * object_class = (GtkObjectClass *) klass;
 	object_class->destroy = sp_xmlview_attr_list_destroy;
+#endif
 
 	parent_class = (GtkTreeViewClass*)g_type_class_peek_parent (klass);
 
-    g_signal_new (  "row-value-changed",
-        G_TYPE_FROM_CLASS(klass),
-        G_SIGNAL_RUN_FIRST,
-        G_STRUCT_OFFSET (SPXMLViewAttrListClass, row_changed),
-        NULL, NULL,
-        g_cclosure_marshal_VOID__STRING,
-        G_TYPE_NONE, 1,
-        G_TYPE_STRING);
+        g_signal_new("row-value-changed",
+                      G_TYPE_FROM_CLASS(klass),
+                      G_SIGNAL_RUN_FIRST,
+                      G_STRUCT_OFFSET (SPXMLViewAttrListClass, row_changed),
+                      NULL, NULL,
+                      g_cclosure_marshal_VOID__STRING,
+                      G_TYPE_NONE, 1,
+                      G_TYPE_STRING);
 }
 
 void
@@ -136,8 +143,11 @@ sp_xmlview_attr_list_init (SPXMLViewAttrList * list)
 	list->repr = NULL;
 }
 
-void
-sp_xmlview_attr_list_destroy (GtkObject * object)
+#if GTK_CHECK_VERSION(3,0,0)
+void sp_xmlview_attr_list_destroy(GtkWidget * object)
+#else
+void sp_xmlview_attr_list_destroy(GtkObject * object)
+#endif
 {
 	SPXMLViewAttrList * list;
 
@@ -146,7 +156,11 @@ sp_xmlview_attr_list_destroy (GtkObject * object)
 	g_object_unref(list->store);
 	sp_xmlview_attr_list_set_repr (list, NULL);
 
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
+#if GTK_CHECK_VERSION(3,0,0)
+	GTK_WIDGET_CLASS(parent_class)->destroy (object);
+#else
+	GTK_OBJECT_CLASS(parent_class)->destroy (object);
+#endif
 }
 
 void sp_xmlview_attr_list_select_row_by_key(SPXMLViewAttrList * list, const gchar *name)
diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp
index d30f0bbe6..bf740baa0 100644
--- a/src/widgets/sp-xmlview-content.cpp
+++ b/src/widgets/sp-xmlview-content.cpp
@@ -25,7 +25,12 @@ using Inkscape::DocumentUndo;
 
 static void sp_xmlview_content_class_init (SPXMLViewContentClass * klass);
 static void sp_xmlview_content_init (SPXMLViewContent * text);
-static void sp_xmlview_content_destroy (GtkObject * object);
+
+#if GTK_CHECK_VERSION(3,0,0)
+static void sp_xmlview_content_destroy(GtkWidget * object);
+#else
+static void sp_xmlview_content_destroy(GtkObject * object);
+#endif
 
 void sp_xmlview_content_changed (GtkTextBuffer *tb, SPXMLViewContent *text);
 
@@ -103,16 +108,17 @@ GType sp_xmlview_content_get_type(void)
     return type;
 }
 
-void
-sp_xmlview_content_class_init (SPXMLViewContentClass * klass)
+void sp_xmlview_content_class_init(SPXMLViewContentClass * klass)
 {
-    GtkObjectClass * object_class;
-
-    object_class = (GtkObjectClass *) klass;
+#if GTK_CHECK_VERSION(3,0,0)
+    GtkWidgetClass * widget_class = (GtkWidgetClass *) klass;
+    widget_class->destroy = sp_xmlview_content_destroy;
+#else
+    GtkObjectClass * object_class = (GtkObjectClass *) klass;
+    object_class->destroy = sp_xmlview_content_destroy;
+#endif
 
     parent_class = (GtkTextViewClass*)g_type_class_peek_parent (klass);
-
-    object_class->destroy = sp_xmlview_content_destroy;
 }
 
 void
@@ -122,16 +128,21 @@ sp_xmlview_content_init (SPXMLViewContent *text)
     text->blocked = FALSE;
 }
 
-void
-sp_xmlview_content_destroy (GtkObject * object)
+#if GTK_CHECK_VERSION(3,0,0)
+void sp_xmlview_content_destroy(GtkWidget * object)
+#else
+void sp_xmlview_content_destroy(GtkObject * object)
+#endif
 {
-    SPXMLViewContent * text;
-
-    text = SP_XMLVIEW_CONTENT (object);
+    SPXMLViewContent * text = SP_XMLVIEW_CONTENT (object);
 
     sp_xmlview_content_set_repr (text, NULL);
 
+#if GTK_CHECK_VERSION(3,0,0)
+    GTK_WIDGET_CLASS (parent_class)->destroy (object);
+#else
     GTK_OBJECT_CLASS (parent_class)->destroy (object);
+#endif
 }
 
 void
diff --git a/src/widgets/sp-xmlview-tree.cpp b/src/widgets/sp-xmlview-tree.cpp
index aafd4ab79..dda72cbe1 100644
--- a/src/widgets/sp-xmlview-tree.cpp
+++ b/src/widgets/sp-xmlview-tree.cpp
@@ -27,7 +27,12 @@ enum { STORE_TEXT_COL = 0, STORE_DATA_COL, STORE_REPR_COL, STORE_N_COLS };
 
 static void sp_xmlview_tree_class_init (SPXMLViewTreeClass * klass);
 static void sp_xmlview_tree_init (SPXMLViewTree * tree);
-static void sp_xmlview_tree_destroy (GtkObject * object);
+
+#if GTK_CHECK_VERSION(3,0,0)
+static void sp_xmlview_tree_destroy(GtkWidget * object);
+#else
+static void sp_xmlview_tree_destroy(GtkObject * object);
+#endif
 
 static NodeData * node_data_new (SPXMLViewTree * tree, GtkTreeIter * node, GtkTreeRowReference  *rowref, Inkscape::XML::Node * repr);
 static void node_data_free (gpointer data);
@@ -143,13 +148,17 @@ sp_xmlview_tree_get_type (void)
 	return type;
 }
 
-void
-sp_xmlview_tree_class_init (SPXMLViewTreeClass * klass)
+void sp_xmlview_tree_class_init(SPXMLViewTreeClass * klass)
 {
-	GtkObjectClass * object_class;
-
-	object_class = (GtkObjectClass *) klass;
-	parent_class = (GtkTreeViewClass *) g_type_class_peek_parent (klass);
+#if GTK_CHECK_VERSION(3,0,0)
+    GtkWidgetClass * widget_class = (GtkWidgetClass *) klass;
+    widget_class->destroy = sp_xmlview_tree_destroy;
+#else
+    GtkObjectClass * object_class = (GtkObjectClass *) klass;
+    object_class->destroy = sp_xmlview_tree_destroy;
+#endif
+    
+    parent_class = (GtkTreeViewClass *) g_type_class_peek_parent (klass);
 
     // Signal for when a tree drag and drop has completed
     g_signal_new (  "tree_move",
@@ -160,8 +169,6 @@ sp_xmlview_tree_class_init (SPXMLViewTreeClass * klass)
         g_cclosure_marshal_VOID__UINT,
         G_TYPE_NONE, 1,
         G_TYPE_UINT);
-
-	object_class->destroy = sp_xmlview_tree_destroy;
 }
 
 void
@@ -172,16 +179,22 @@ sp_xmlview_tree_init (SPXMLViewTree * tree)
 	tree->dndactive = FALSE;
 }
 
-void
-sp_xmlview_tree_destroy (GtkObject * object)
-{
-	SPXMLViewTree * tree;
 
-	tree = SP_XMLVIEW_TREE (object);
+#if GTK_CHECK_VERSION(3,0,0)
+void sp_xmlview_tree_destroy(GtkWidget * object)
+#else
+void sp_xmlview_tree_destroy(GtkObject * object)
+#endif
+{
+	SPXMLViewTree * tree = SP_XMLVIEW_TREE (object);
 
 	sp_xmlview_tree_set_repr (tree, NULL);
 
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
+#if GTK_CHECK_VERSION(3,0,0)
+	GTK_WIDGET_CLASS(parent_class)->destroy (object);
+#else
+	GTK_OBJECT_CLASS(parent_class)->destroy (object);
+#endif
 }
 
 /*
diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp
index f9c94dc47..dfbf0c003 100644
--- a/src/widgets/spw-utilities.cpp
+++ b/src/widgets/spw-utilities.cpp
@@ -168,22 +168,19 @@ spw_unit_selector(GtkWidget * dialog, GtkWidget * table,
 		  const gchar * label_text, gchar * key, int row,
 		GtkWidget * us, GCallback cb, bool can_be_negative)
 {
-  GtkWidget * sb;
-  GtkObject * a;
-
   g_assert(dialog != NULL);
   g_assert(table  != NULL);
   g_assert(us     != NULL);
 
   spw_label_old(table, label_text, 0, row);
 
-  a = gtk_adjustment_new (0.0, can_be_negative?-1e6:0, 1e6, 1.0, 10.0, 10.0);
+  GtkAdjustment * a = gtk_adjustment_new (0.0, can_be_negative?-1e6:0, 1e6, 1.0, 10.0, 10.0);
   g_assert(a != NULL);
   g_object_set_data (G_OBJECT (a), "key", key);
   g_object_set_data (G_OBJECT (a), "unit_selector", us);
   g_object_set_data (G_OBJECT (dialog), key, a);
   sp_unit_selector_add_adjustment (SP_UNIT_SELECTOR (us), GTK_ADJUSTMENT (a));
-  sb = gtk_spin_button_new (GTK_ADJUSTMENT (a), 1.0, 4);
+  GtkWidget * sb = gtk_spin_button_new (GTK_ADJUSTMENT (a), 1.0, 4);
   g_assert(sb != NULL);
   gtk_widget_show (sb);
   gtk_table_attach (GTK_TABLE (table), sb, 1, 2, row, row+1,
@@ -231,7 +228,7 @@ gpointer sp_search_by_data_recursive(GtkWidget *w, gpointer key)
 {
 	gpointer r = NULL;
 
-	if (w && GTK_IS_OBJECT(w)) {
+	if (w && G_IS_OBJECT(w)) {
 		r = g_object_get_data(G_OBJECT(w), (gchar *) key);
 	}
 	if (r) return r;
@@ -255,7 +252,7 @@ GtkWidget *sp_search_by_value_recursive(GtkWidget *w, gchar *key, gchar *value)
 	gchar *r = NULL;
 	GtkWidget *child;
 
-	if (w && GTK_IS_OBJECT(w)) {
+	if (w && G_IS_OBJECT(w)) {
 		r = (gchar *) g_object_get_data(G_OBJECT(w), key);
 	}
 	if (r && !strcmp (r, value)) return w;