fixing to trunk

(bzr r12588.1.34)

1 files changed, 20 insertions, 34 deletions

diff --git a/src/widgets/sp-color-scales.cpp b/src/widgets/sp-color-scales.cpp
index c3f9d511c..60ba62ec5 100644
--- a/src/widgets/sp-color-scales.cpp
+++ b/src/widgets/sp-color-scales.cpp
@@ -8,8 +8,9 @@
 #include <math.h>
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
-#include "../dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "sp-color-scales.h"
+#include "sp-color-slider.h"
 #include "svg/svg-icc-color.h"
 
 #define CSC_CHANNEL_R (1 << 0)
@@ -30,8 +31,6 @@
 
 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_dispose(GObject *object);
 
 static void sp_color_scales_show_all (GtkWidget *widget);
@@ -41,38 +40,12 @@ static const gchar *sp_color_scales_hue_map (void);
 
 G_END_DECLS
 
-static SPColorSelectorClass *parent_class;
-
 #define XPAD 4
 #define YPAD 1
 
 #define noDUMP_CHANGE_INFO 1
 
-GType
-sp_color_scales_get_type (void)
-{
-	static GType type = 0;
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (SPColorScalesClass),
-			NULL, /* base_init */
-			NULL, /* base_finalize */
-			(GClassInitFunc) sp_color_scales_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof (SPColorScales),
-			0,	  /* n_preallocs */
-			(GInstanceInitFunc) sp_color_scales_init,
-			NULL
-		};
-
-		type = g_type_register_static (SP_TYPE_COLOR_SELECTOR,
-									   "SPColorScales",
-									   &info,
-									   static_cast< GTypeFlags > (0) );
-	}
-	return type;
-}
+G_DEFINE_TYPE(SPColorScales, sp_color_scales, SP_TYPE_COLOR_SELECTOR);
 
 static void
 sp_color_scales_class_init (SPColorScalesClass *klass)
@@ -82,8 +55,6 @@ sp_color_scales_class_init (SPColorScalesClass *klass)
 	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
 	SPColorSelectorClass *selector_class = SP_COLOR_SELECTOR_CLASS (klass);
 
-	parent_class = SP_COLOR_SELECTOR_CLASS (g_type_class_peek_parent (klass));
-
 	selector_class->name = nameset;
 	selector_class->submode_count = 3;
 
@@ -151,8 +122,13 @@ void ColorScales::init()
 		gtk_widget_show (_l[i]);
 
 #if GTK_CHECK_VERSION(3,0,0)
+  #if GTK_CHECK_VERSION(3,12,0)
+		gtk_widget_set_margin_start(_l[i], XPAD);
+		gtk_widget_set_margin_end(_l[i], XPAD);
+  #else
 		gtk_widget_set_margin_left(_l[i], XPAD);
 		gtk_widget_set_margin_right(_l[i], XPAD);
+  #endif
 		gtk_widget_set_margin_top(_l[i], YPAD);
 		gtk_widget_set_margin_bottom(_l[i], YPAD);
 		gtk_grid_attach(GTK_GRID(t), _l[i], 0, i, 1, 1);
@@ -167,8 +143,13 @@ void ColorScales::init()
 		gtk_widget_show (_s[i]);
 
 #if GTK_CHECK_VERSION(3,0,0)
+  #if GTK_CHECK_VERSION(3,12,0)
+		gtk_widget_set_margin_start(_s[i], XPAD);
+		gtk_widget_set_margin_end(_s[i], XPAD);
+  #else
 		gtk_widget_set_margin_left(_s[i], XPAD);
 		gtk_widget_set_margin_right(_s[i], XPAD);
+  #endif
 		gtk_widget_set_margin_top(_s[i], YPAD);
 		gtk_widget_set_margin_bottom(_s[i], YPAD);
 		gtk_widget_set_hexpand(_s[i], TRUE);
@@ -184,8 +165,13 @@ void ColorScales::init()
 		gtk_widget_show (_b[i]);
 
 #if GTK_CHECK_VERSION(3,0,0)
+  #if GTK_CHECK_VERSION(3,12,0)
+		gtk_widget_set_margin_start(_b[i], XPAD);
+		gtk_widget_set_margin_end(_b[i], XPAD);
+  #else
 		gtk_widget_set_margin_left(_b[i], XPAD);
 		gtk_widget_set_margin_right(_b[i], XPAD);
+  #endif
 		gtk_widget_set_margin_top(_b[i], YPAD);
 		gtk_widget_set_margin_bottom(_b[i], YPAD);
 		gtk_widget_set_halign(_b[i], GTK_ALIGN_CENTER);
@@ -214,8 +200,8 @@ void ColorScales::init()
 
 static void sp_color_scales_dispose(GObject *object)
 {
-	if ((G_OBJECT_CLASS(parent_class))->dispose)
-		(* (G_OBJECT_CLASS(parent_class))->dispose) (object);
+	if (G_OBJECT_CLASS(sp_color_scales_parent_class)->dispose)
+            G_OBJECT_CLASS(sp_color_scales_parent_class)->dispose(object);
 }
 
 static void