gradient-vector: Clean up GObject boilerplate & fix deprecation

(bzr r13341.1.153)

1 files changed, 13 insertions, 33 deletions

diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 17ac887c4..68f40f80c 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -61,9 +61,6 @@ enum {
     LAST_SIGNAL
 };
 
-static void sp_gradient_vector_selector_class_init(SPGradientVectorSelectorClass *klass);
-static void sp_gradient_vector_selector_init(SPGradientVectorSelector *gvs);
-
 #if GTK_CHECK_VERSION(3,0,0)
 static void sp_gradient_vector_selector_destroy(GtkWidget *object);
 #else
@@ -79,7 +76,6 @@ static SPStop *get_selected_stop( GtkWidget *vb);
 void gr_get_usage_counts(SPDocument *doc, std::map<SPGradient *, gint> *mapUsageCount );
 unsigned long sp_gradient_to_hhssll(SPGradient *gr);
 
-static GtkVBoxClass *parent_class;
 static guint signals[LAST_SIGNAL] = {0};
 
 // TODO FIXME kill these globals!!!
@@ -88,35 +84,15 @@ static win_data wd;
 static gint x = -1000, y = -1000, w = 0, h = 0; // impossible original values to make sure they are read from prefs
 static Glib::ustring const prefs_path = "/dialogs/gradienteditor/";
 
-GType sp_gradient_vector_selector_get_type(void)
-{
-    static GType type = 0;
-    if (!type) {
-        static const GTypeInfo info = {
-            sizeof(SPGradientVectorSelectorClass),
-            NULL, /* base_init */
-            NULL, /* base_finalize */
-            reinterpret_cast<GClassInitFunc>(sp_gradient_vector_selector_class_init),
-            NULL, /* class_finalize */
-            NULL, /* class_data */
-            sizeof(SPGradientVectorSelector),
-            0,    /* n_preallocs */
-            reinterpret_cast<GInstanceInitFunc>(sp_gradient_vector_selector_init),
-            0,    /* value_table */
-        };
-
-        type = g_type_register_static( GTK_TYPE_VBOX,
-                                       "SPGradientVectorSelector",
-                                       &info,
-                                       static_cast< GTypeFlags >(0) );
-    }
-    return type;
-}
+#if GTK_CHECK_VERSION(3,0,0)
+G_DEFINE_TYPE(SPGradientVectorSelector, sp_gradient_vector_selector, GTK_TYPE_BOX);
+#else
+G_DEFINE_TYPE(SPGradientVectorSelector, sp_gradient_vector_selector, GTK_TYPE_VBOX);
+#endif
 
 static void sp_gradient_vector_selector_class_init(SPGradientVectorSelectorClass *klass)
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
-    parent_class = static_cast<GtkVBoxClass*>(g_type_class_peek_parent(klass));
 
     signals[VECTOR_SET] = g_signal_new( "vector_set",
                                         G_TYPE_FROM_CLASS(gobject_class),
@@ -138,6 +114,10 @@ static void sp_gradient_vector_selector_class_init(SPGradientVectorSelectorClass
 
 static void sp_gradient_vector_selector_init(SPGradientVectorSelector *gvs)
 {
+#if GTK_CHECK_VERSION(3,0,0)
+    gtk_orientable_set_orientation(GTK_ORIENTABLE(gvs), GTK_ORIENTATION_VERTICAL);
+#endif
+
     gvs->idlabel = TRUE;
 
     gvs->swatched = false;
@@ -181,12 +161,12 @@ static void sp_gradient_vector_selector_destroy(GtkObject *object)
     gvs->tree_select_connection.~connection();
 
 #if GTK_CHECK_VERSION(3,0,0)
-    if ((reinterpret_cast<GtkWidgetClass *>(parent_class))->destroy) {
-        (* (reinterpret_cast<GtkWidgetClass *>(parent_class))->destroy) (object);
+    if ((GTK_WIDGET_CLASS(sp_gradient_vector_selector_parent_class))->destroy) {
+        (GTK_WIDGET_CLASS(sp_gradient_vector_selector_parent_class))->destroy(object);
     }
 #else
-    if ((reinterpret_cast<GtkObjectClass *>(parent_class))->destroy) {
-        (* (reinterpret_cast<GtkObjectClass *>(parent_class))->destroy) (object);
+    if ((GTK_OBJECT_CLASS(sp_gradient_vector_selector_parent_class))->destroy) {
+        (GTK_OBJECT_CLASS(sp_gradient_vector_selector_parent_class))->destroy(object);
     }
 #endif
 }