GTK+ 3 fixes for colour selector widgets

(bzr r11384)

8 files changed, 67 insertions, 86 deletions

diff --git a/src/widgets/shrink-wrap-button.cpp b/src/widgets/shrink-wrap-button.cpp
index 8d5bad21c..781e3ede3 100644
--- a/src/widgets/shrink-wrap-button.cpp
+++ b/src/widgets/shrink-wrap-button.cpp
@@ -31,8 +31,10 @@ void minimum_size(GtkWidget *widget, GtkRequisition *requisition, void *) {
         requisition->height = 0;
     }
 
-    requisition->width += 2 + 2 * std::max(2, widget->style->xthickness);
-    requisition->height += 2 + 2 * std::max(2, widget->style->ythickness);
+    GtkStyle* style = gtk_widget_get_style(widget);
+
+    requisition->width += 2 + 2 * std::max(2, style->xthickness);
+    requisition->height += 2 + 2 * std::max(2, style->ythickness);
 }
 
 }
diff --git a/src/widgets/sp-color-gtkselector.cpp b/src/widgets/sp-color-gtkselector.cpp
index c3a92ddf2..2e00aca71 100644
--- a/src/widgets/sp-color-gtkselector.cpp
+++ b/src/widgets/sp-color-gtkselector.cpp
@@ -10,7 +10,7 @@ static void sp_color_gtkselector_init (SPColorGtkselector *csel);
 static void sp_color_gtkselector_dispose(GObject *object);
 
 static void sp_color_gtkselector_show_all (GtkWidget *widget);
-static void sp_color_gtkselector_hide_all (GtkWidget *widget);
+static void sp_color_gtkselector_hide(GtkWidget *widget);
 
 
 static SPColorSelectorClass *parent_class;
@@ -63,7 +63,7 @@ sp_color_gtkselector_class_init (SPColorGtkselectorClass *klass)
 	object_class->dispose = sp_color_gtkselector_dispose;
 
 	widget_class->show_all = sp_color_gtkselector_show_all;
-	widget_class->hide_all = sp_color_gtkselector_hide_all;
+	widget_class->hide = sp_color_gtkselector_hide;
 }
 
 void sp_color_gtkselector_init (SPColorGtkselector *csel)
@@ -98,10 +98,9 @@ sp_color_gtkselector_show_all (GtkWidget *widget)
 	gtk_widget_show (widget);
 }
 
-static void
-sp_color_gtkselector_hide_all (GtkWidget *widget)
+static void sp_color_gtkselector_hide(GtkWidget *widget)
 {
-	gtk_widget_hide (widget);
+	gtk_widget_hide(widget);
 }
 
 GtkWidget *
diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index 0c40eff66..8d71fc410 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -61,10 +61,10 @@ G_BEGIN_DECLS
 
 static void sp_color_icc_selector_class_init (SPColorICCSelectorClass *klass);
 static void sp_color_icc_selector_init (SPColorICCSelector *cs);
-static void sp_color_icc_selector_destroy (GtkObject *object);
+static void sp_color_icc_selector_dispose(GObject *object);
 
 static void sp_color_icc_selector_show_all (GtkWidget *widget);
-static void sp_color_icc_selector_hide_all (GtkWidget *widget);
+static void sp_color_icc_selector_hide(GtkWidget *widget);
 
 
 G_END_DECLS
@@ -100,15 +100,13 @@ sp_color_icc_selector_get_type (void)
     return type;
 }
 
-static void
-sp_color_icc_selector_class_init (SPColorICCSelectorClass *klass)
+static void sp_color_icc_selector_class_init(SPColorICCSelectorClass *klass)
 {
     static const gchar* nameset[] = {N_("CMS"), 0};
-    GtkObjectClass *object_class;
+    GObjectClass *object_class = (GObjectClass *) klass;
     GtkWidgetClass *widget_class;
     SPColorSelectorClass *selector_class;
 
-    object_class = (GtkObjectClass *) klass;
     widget_class = (GtkWidgetClass *) klass;
     selector_class = SP_COLOR_SELECTOR_CLASS (klass);
 
@@ -117,10 +115,10 @@ sp_color_icc_selector_class_init (SPColorICCSelectorClass *klass)
     selector_class->name = nameset;
     selector_class->submode_count = 1;
 
-    object_class->destroy = sp_color_icc_selector_destroy;
+    object_class->dispose = sp_color_icc_selector_dispose;
 
     widget_class->show_all = sp_color_icc_selector_show_all;
-    widget_class->hide_all = sp_color_icc_selector_hide_all;
+    widget_class->hide = sp_color_icc_selector_hide;
 }
 
 
@@ -423,11 +421,10 @@ void ColorICCSelector::init()
                         G_CALLBACK (_sliderChanged), _csel);
 }
 
-static void
-sp_color_icc_selector_destroy (GtkObject *object)
+static void sp_color_icc_selector_dispose(GObject *object)
 {
-    if (((GtkObjectClass *) (parent_class))->destroy)
-        (* ((GtkObjectClass *) (parent_class))->destroy) (object);
+    if (((GObjectClass *) (parent_class))->dispose)
+        (* ((GObjectClass *) (parent_class))->dispose)(object);
 }
 
 static void
@@ -436,10 +433,9 @@ sp_color_icc_selector_show_all (GtkWidget *widget)
     gtk_widget_show (widget);
 }
 
-static void
-sp_color_icc_selector_hide_all (GtkWidget *widget)
+static void sp_color_icc_selector_hide(GtkWidget *widget)
 {
-    gtk_widget_hide (widget);
+    gtk_widget_hide(widget);
 }
 
 GtkWidget *
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index 863e8b762..401693551 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -52,10 +52,10 @@ struct SPColorNotebookTracker {
 
 static void sp_color_notebook_class_init (SPColorNotebookClass *klass);
 static void sp_color_notebook_init (SPColorNotebook *colorbook);
-static void sp_color_notebook_destroy (GtkObject *object);
+static void sp_color_notebook_dispose(GObject *object);
 
 static void sp_color_notebook_show_all (GtkWidget *widget);
-static void sp_color_notebook_hide_all (GtkWidget *widget);
+static void sp_color_notebook_hide(GtkWidget *widget);
 
 static SPColorSelectorClass *parent_class;
 
@@ -85,15 +85,15 @@ GType sp_color_notebook_get_type(void)
 
 static void sp_color_notebook_class_init(SPColorNotebookClass *klass)
 {
-    GtkObjectClass *object_class = reinterpret_cast<GtkObjectClass *>(klass);
+    GObjectClass *object_class = reinterpret_cast<GObjectClass *>(klass);
     GtkWidgetClass *widget_class = reinterpret_cast<GtkWidgetClass *>(klass);
 
     parent_class = SP_COLOR_SELECTOR_CLASS(g_type_class_peek_parent(klass));
 
-    object_class->destroy = sp_color_notebook_destroy;
+    object_class->dispose = sp_color_notebook_dispose;
 
     widget_class->show_all = sp_color_notebook_show_all;
-    widget_class->hide_all = sp_color_notebook_hide_all;
+    widget_class->hide = sp_color_notebook_hide;
 }
 
 static void
@@ -390,11 +390,10 @@ void ColorNotebook::init()
     _entryId = g_signal_connect (G_OBJECT (_rgbae), "changed", G_CALLBACK (ColorNotebook::_rgbaEntryChangedHook), _csel);
 }
 
-static void
-sp_color_notebook_destroy (GtkObject *object)
+static void sp_color_notebook_dispose(GObject *object)
 {
-    if (((GtkObjectClass *) (parent_class))->destroy)
-        (* ((GtkObjectClass *) (parent_class))->destroy) (object);
+    if (((GObjectClass *) (parent_class))->dispose)
+        (* ((GObjectClass *) (parent_class))->dispose) (object);
 }
 
 ColorNotebook::~ColorNotebook()
@@ -421,10 +420,9 @@ sp_color_notebook_show_all (GtkWidget *widget)
     gtk_widget_show (widget);
 }
 
-static void
-sp_color_notebook_hide_all (GtkWidget *widget)
+static void sp_color_notebook_hide(GtkWidget *widget)
 {
-    gtk_widget_hide (widget);
+    gtk_widget_hide(widget);
 }
 
 GtkWidget *
diff --git a/src/widgets/sp-color-scales.cpp b/src/widgets/sp-color-scales.cpp
index 60d616e6f..1af5a1068 100644
--- a/src/widgets/sp-color-scales.cpp
+++ b/src/widgets/sp-color-scales.cpp
@@ -32,10 +32,10 @@ G_BEGIN_DECLS
 
 static void sp_color_scales_class_init (SPColorScalesClass *klass);
 static void sp_color_scales_init (SPColorScales *cs);
-static void sp_color_scales_destroy (GtkObject *object);
+static void sp_color_scales_dispose(GObject *object);
 
 static void sp_color_scales_show_all (GtkWidget *widget);
-static void sp_color_scales_hide_all (GtkWidget *widget);
+static void sp_color_scales_hide(GtkWidget *widget);
 
 static const gchar *sp_color_scales_hue_map (void);
 
@@ -78,11 +78,10 @@ static void
 sp_color_scales_class_init (SPColorScalesClass *klass)
 {
 	static const gchar* nameset[] = {N_("RGB"), N_("HSL"), N_("CMYK"), 0};
-	GtkObjectClass *object_class;
+	GObjectClass *object_class = (GObjectClass *) klass;
 	GtkWidgetClass *widget_class;
 	SPColorSelectorClass *selector_class;
 
-	object_class = (GtkObjectClass *) klass;
 	widget_class = (GtkWidgetClass *) klass;
 	selector_class = SP_COLOR_SELECTOR_CLASS (klass);
 
@@ -91,10 +90,10 @@ sp_color_scales_class_init (SPColorScalesClass *klass)
 	selector_class->name = nameset;
 	selector_class->submode_count = 3;
 
-	object_class->destroy = sp_color_scales_destroy;
+	object_class->dispose = sp_color_scales_dispose;
 
 	widget_class->show_all = sp_color_scales_show_all;
-	widget_class->hide_all = sp_color_scales_hide_all;
+	widget_class->hide = sp_color_scales_hide;
 }
 
 ColorScales::ColorScales( SPColorSelector* csel )
@@ -182,11 +181,10 @@ void ColorScales::init()
 	setMode(SP_COLOR_SCALES_MODE_RGB);
 }
 
-static void
-sp_color_scales_destroy (GtkObject *object)
+static void sp_color_scales_dispose(GObject *object)
 {
-	if (((GtkObjectClass *) (parent_class))->destroy)
-		(* ((GtkObjectClass *) (parent_class))->destroy) (object);
+	if (((GObjectClass *) (parent_class))->dispose)
+		(* ((GObjectClass *) (parent_class))->dispose) (object);
 }
 
 static void
@@ -195,10 +193,9 @@ sp_color_scales_show_all (GtkWidget *widget)
 	gtk_widget_show (widget);
 }
 
-static void
-sp_color_scales_hide_all (GtkWidget *widget)
+static void sp_color_scales_hide(GtkWidget *widget)
 {
-	gtk_widget_hide (widget);
+	gtk_widget_hide(widget);
 }
 
 GtkWidget *
diff --git a/src/widgets/sp-color-selector.cpp b/src/widgets/sp-color-selector.cpp
index 96cae3a35..6d62acecd 100644
--- a/src/widgets/sp-color-selector.cpp
+++ b/src/widgets/sp-color-selector.cpp
@@ -24,10 +24,10 @@ enum {
 
 static void sp_color_selector_class_init( SPColorSelectorClass *klass );
 static void sp_color_selector_init( SPColorSelector *csel );
-static void sp_color_selector_destroy( GtkObject *object );
+static void sp_color_selector_dispose(GObject *object);
 
 static void sp_color_selector_show_all( GtkWidget *widget );
-static void sp_color_selector_hide_all( GtkWidget *widget );
+static void sp_color_selector_hide( GtkWidget *widget );
 
 static GtkVBoxClass *parent_class;
 static guint csel_signals[LAST_SIGNAL] = {0};
@@ -62,10 +62,8 @@ GType sp_color_selector_get_type( void )
 void sp_color_selector_class_init( SPColorSelectorClass *klass )
 {
     static const gchar* nameset[] = {N_("Unnamed"), 0};
-    GtkObjectClass *object_class;
+    GObjectClass *object_class = G_OBJECT_CLASS(klass);
     GtkWidgetClass *widget_class;
-
-    object_class = GTK_OBJECT_CLASS(klass);
     widget_class = GTK_WIDGET_CLASS(klass);
 
     parent_class = GTK_VBOX_CLASS( g_type_class_peek_parent(klass) );
@@ -102,10 +100,10 @@ void sp_color_selector_class_init( SPColorSelectorClass *klass )
     klass->name = nameset;
     klass->submode_count = 1;
 
-    object_class->destroy = sp_color_selector_destroy;
+    object_class->dispose = sp_color_selector_dispose;
 
     widget_class->show_all = sp_color_selector_show_all;
-    widget_class->hide_all = sp_color_selector_hide_all;
+    widget_class->hide = sp_color_selector_hide;
 
 }
 
@@ -118,7 +116,7 @@ void sp_color_selector_init( SPColorSelector *csel )
 /*   g_signal_connect(G_OBJECT(csel->rgbae), "changed", G_CALLBACK(sp_color_selector_rgba_entry_changed), csel); */
 }
 
-void sp_color_selector_destroy( GtkObject *object )
+void sp_color_selector_dispose(GObject *object)
 {
     SPColorSelector *csel = SP_COLOR_SELECTOR( object );
     if ( csel->base )
@@ -127,8 +125,8 @@ void sp_color_selector_destroy( GtkObject *object )
             csel->base = 0;
         }
 
-    if ( (GTK_OBJECT_CLASS(parent_class))->destroy ) {
-        (* (GTK_OBJECT_CLASS(parent_class))->destroy)(object);
+    if ( (G_OBJECT_CLASS(parent_class))->dispose ) {
+        (* (G_OBJECT_CLASS(parent_class))->dispose)(object);
     }
 }
 
@@ -137,7 +135,7 @@ void sp_color_selector_show_all( GtkWidget *widget )
     gtk_widget_show( widget );
 }
 
-void sp_color_selector_hide_all( GtkWidget *widget )
+void sp_color_selector_hide(GtkWidget *widget)
 {
     gtk_widget_hide( widget );
 }
diff --git a/src/widgets/sp-color-slider.cpp b/src/widgets/sp-color-slider.cpp
index 3b690afc9..53be42867 100644
--- a/src/widgets/sp-color-slider.cpp
+++ b/src/widgets/sp-color-slider.cpp
@@ -28,7 +28,7 @@ enum {
 
 static void sp_color_slider_class_init (SPColorSliderClass *klass);
 static void sp_color_slider_init (SPColorSlider *slider);
-static void sp_color_slider_destroy (GtkObject *object);
+static void sp_color_slider_dispose(GObject *object);
 
 static void sp_color_slider_realize (GtkWidget *widget);
 static void sp_color_slider_size_request (GtkWidget *widget, GtkRequisition *requisition);
@@ -85,13 +85,11 @@ sp_color_slider_get_type (void)
 	return type;
 }
 
-static void
-sp_color_slider_class_init (SPColorSliderClass *klass)
+static void sp_color_slider_class_init(SPColorSliderClass *klass)
 {
-	GtkObjectClass *object_class;
+	GObjectClass *object_class = (GObjectClass *) klass;
 	GtkWidgetClass *widget_class;
 
-	object_class = (GtkObjectClass *) klass;
 	widget_class = (GtkWidgetClass *) klass;
 
 	parent_class = (GtkWidgetClass*)g_type_class_peek_parent (klass);
@@ -125,7 +123,7 @@ sp_color_slider_class_init (SPColorSliderClass *klass)
 						  g_cclosure_marshal_VOID__VOID,
 						  G_TYPE_NONE, 0);
 
-	object_class->destroy = sp_color_slider_destroy;
+	object_class->dispose = sp_color_slider_dispose;
 
 	widget_class->realize = sp_color_slider_realize;
 #if GTK_CHECK_VERSION(3,0,0)
@@ -178,12 +176,9 @@ sp_color_slider_init (SPColorSlider *slider)
 	slider->map = NULL;
 }
 
-static void
-sp_color_slider_destroy (GtkObject *object)
+static void sp_color_slider_dispose(GObject *object)
 {
-	SPColorSlider *slider;
-
-	slider = SP_COLOR_SLIDER (object);
+	SPColorSlider *slider = SP_COLOR_SLIDER (object);
 
 	if (slider->adjustment) {
 		g_signal_handlers_disconnect_matched (G_OBJECT (slider->adjustment), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, slider);
@@ -191,8 +186,8 @@ sp_color_slider_destroy (GtkObject *object)
 		slider->adjustment = NULL;
 	}
 
-	if (((GtkObjectClass *) (parent_class))->destroy)
-		(* ((GtkObjectClass *) (parent_class))->destroy) (object);
+	if (((GObjectClass *) (parent_class))->dispose)
+		(* ((GObjectClass *) (parent_class))->dispose) (object);
 }
 
 static void
diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp
index 7baafb4b3..4cc9f9e4a 100644
--- a/src/widgets/sp-color-wheel-selector.cpp
+++ b/src/widgets/sp-color-wheel-selector.cpp
@@ -14,10 +14,10 @@ G_BEGIN_DECLS
 
 static void sp_color_wheel_selector_class_init (SPColorWheelSelectorClass *klass);
 static void sp_color_wheel_selector_init (SPColorWheelSelector *cs);
-static void sp_color_wheel_selector_destroy (GtkObject *object);
+static void sp_color_wheel_selector_dispose(GObject *object);
 
 static void sp_color_wheel_selector_show_all (GtkWidget *widget);
-static void sp_color_wheel_selector_hide_all (GtkWidget *widget);
+static void sp_color_wheel_selector_hide(GtkWidget *widget);
 
 
 G_END_DECLS
@@ -53,15 +53,13 @@ sp_color_wheel_selector_get_type (void)
     return type;
 }
 
-static void
-sp_color_wheel_selector_class_init (SPColorWheelSelectorClass *klass)
+static void sp_color_wheel_selector_class_init(SPColorWheelSelectorClass *klass)
 {
     static const gchar* nameset[] = {N_("Wheel"), 0};
-    GtkObjectClass *object_class;
+    GObjectClass *object_class = (GObjectClass *) klass;
     GtkWidgetClass *widget_class;
     SPColorSelectorClass *selector_class;
 
-    object_class = (GtkObjectClass *) klass;
     widget_class = (GtkWidgetClass *) klass;
     selector_class = SP_COLOR_SELECTOR_CLASS (klass);
 
@@ -70,10 +68,10 @@ sp_color_wheel_selector_class_init (SPColorWheelSelectorClass *klass)
     selector_class->name = nameset;
     selector_class->submode_count = 1;
 
-    object_class->destroy = sp_color_wheel_selector_destroy;
+    object_class->dispose = sp_color_wheel_selector_dispose;
 
     widget_class->show_all = sp_color_wheel_selector_show_all;
-    widget_class->hide_all = sp_color_wheel_selector_hide_all;
+    widget_class->hide = sp_color_wheel_selector_hide;
 }
 
 ColorWheelSelector::ColorWheelSelector( SPColorSelector* csel )
@@ -218,11 +216,10 @@ void ColorWheelSelector::init()
                         G_CALLBACK (handleWheelStyleSet), _csel );
 }
 
-static void
-sp_color_wheel_selector_destroy (GtkObject *object)
+static void sp_color_wheel_selector_dispose(GObject *object)
 {
-    if (((GtkObjectClass *) (parent_class))->destroy)
-        (* ((GtkObjectClass *) (parent_class))->destroy) (object);
+    if (((GObjectClass *) (parent_class))->dispose)
+        (* ((GObjectClass *) (parent_class))->dispose) (object);
 }
 
 static void
@@ -231,10 +228,9 @@ sp_color_wheel_selector_show_all (GtkWidget *widget)
     gtk_widget_show (widget);
 }
 
-static void
-sp_color_wheel_selector_hide_all (GtkWidget *widget)
+static void sp_color_wheel_selector_hide(GtkWidget *widget)
 {
-    gtk_widget_hide (widget);
+    gtk_widget_hide(widget);
 }
 
 GtkWidget *