ColorNotebook is Gtk::Widget and uses ColorSelector

(bzr r13341.6.52)

7 files changed, 134 insertions, 313 deletions

diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp
index 6748c8f5f..ef3887a12 100644
--- a/src/extension/param/color.cpp
+++ b/src/extension/param/color.cpp
@@ -32,7 +32,6 @@
 #include "ui/widget/color-notebook.h"
 #include "preferences.h"
 
-
 namespace Inkscape {
 namespace Extension {
 
@@ -88,6 +87,8 @@ void ParamColor::string(std::string &string) const
 
 Gtk::Widget *ParamColor::get_widget( SPDocument * /*doc*/, Inkscape::XML::Node * /*node*/, sigc::signal<void> * changeSignal )
 {
+    using Inkscape::UI::Widget::ColorNotebook;
+
 	if (_gui_hidden) return NULL;
 
     _changeSignal = new sigc::signal<void>(*changeSignal);
@@ -99,7 +100,7 @@ Gtk::Widget *ParamColor::get_widget( SPDocument * /*doc*/, Inkscape::XML::Node *
     }
 
     Gtk::HBox *hbox = Gtk::manage(new Gtk::HBox(false, 4));
-    Gtk::Widget *selector = Gtk::manage(ColorNotebook::create(_color));
+    Gtk::Widget *selector = Gtk::manage(new ColorNotebook(_color));
     hbox->pack_start (*selector, true, true, 0);
     selector->show();
     hbox->show();
diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index 2b592e620..32a141e08 100644
--- a/src/ui/widget/color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -1,11 +1,13 @@
-/*
- * A notebook with RGB, CMYK, CMS, HSL, and Wheel pages
- *
- * Author:
+/**
+ * @file
+ * A notebook with RGB, CMYK, CMS, HSL, and Wheel pages - implementation
+ */
+/* Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   bulia byak <buliabyak@users.sf.net>
+ *   Tomasz Boczkowski <penginsbacon@gmail.com> (c++-sification)
  *
- * Copyright (C) 2001-2002 Lauris Kaplinski
+ * Copyright (C) 2001-2014 Authors
  *
  * This code is in public domain
  */
@@ -25,6 +27,7 @@
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 #include <gtkmm/label.h>
+#include <gtkmm/notebook.h>
 
 #include "dialogs/dialog-events.h"
 #include "preferences.h"
@@ -45,103 +48,70 @@
 
 using Inkscape::CMSSystem;
 
-using namespace Inkscape::UI;
-using namespace Inkscape::UI::Widget;
-
-struct SPColorNotebookTracker {
-    const gchar* name;
-    const gchar* className;
-    GType type;
-    guint submode;
-    gboolean enabledFull;
-    gboolean enabledBrief;
-    SPColorNotebook *backPointer;
-};
-
-
-static void sp_color_notebook_class_init (SPColorNotebookClass *klass);
-static void sp_color_notebook_init (SPColorNotebook *colorbook);
-static void sp_color_notebook_dispose(GObject *object);
-
-static void sp_color_notebook_show_all (GtkWidget *widget);
-static void sp_color_notebook_hide(GtkWidget *widget);
-
-static SPColorSelectorClass *parent_class;
-
 #define XPAD 4
 #define YPAD 1
 
-GType sp_color_notebook_get_type(void)
-{
-    static GType type = 0;
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPColorNotebookClass),
-            0, // base_init
-            0, // base_finalize
-            (GClassInitFunc)sp_color_notebook_class_init,
-            0, // class_finalize
-            0, // class_data
-            sizeof(SPColorNotebook),
-            0, // n_preallocs
-            (GInstanceInitFunc)sp_color_notebook_init,
-            0 // value_table
-        };
-        type = g_type_register_static(SP_TYPE_COLOR_SELECTOR, "SPColorNotebook", &info, static_cast<GTypeFlags>(0));
-    }
-    return type;
-}
+namespace Inkscape {
+namespace UI {
+namespace Widget {
+
+
+ColorNotebook::ColorNotebook(SelectedColor &color)
+#if GTK_CHECK_VERSION(3,0,0)
+    : Gtk::Grid()
+#else
+    : Gtk::Table(2, 3, false)
+#endif
+    , _selected_color(color)
 
-static void sp_color_notebook_class_init(SPColorNotebookClass *klass)
 {
-    GObjectClass *object_class = reinterpret_cast<GObjectClass *>(klass);
-    GtkWidgetClass *widget_class = reinterpret_cast<GtkWidgetClass *>(klass);
+    Page *page;
 
-    parent_class = SP_COLOR_SELECTOR_CLASS(g_type_class_peek_parent(klass));
+    page = new Page(new ColorScalesFactory(SP_COLOR_SCALES_MODE_RGB), true);
+    _available_pages.push_back(page);
+    page = new Page(new ColorScalesFactory(SP_COLOR_SCALES_MODE_HSV), true);
+    _available_pages.push_back(page);
+    page = new Page(new ColorScalesFactory(SP_COLOR_SCALES_MODE_CMYK), true);
+    _available_pages.push_back(page);
+    page = new Page(new ColorWheelSelectorFactory, true);
+    _available_pages.push_back(page);
+#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
+    page = new Page(new ColorICCSelectorFactory, true);
+    _available_pages.push_back(page);
+#endif
 
-    object_class->dispose = sp_color_notebook_dispose;
+    _initUI();
 
-    widget_class->show_all = sp_color_notebook_show_all;
-    widget_class->hide = sp_color_notebook_hide;
+    _selected_color.signal_changed.connect(sigc::mem_fun(this, &ColorNotebook::_onSelectedColorChanged));
+    _selected_color.signal_dragged.connect(sigc::mem_fun(this, &ColorNotebook::_onSelectedColorChanged));
 }
 
-static void
-sp_color_notebook_switch_page(GtkNotebook *notebook,
-                              GtkWidget   *page,
-                              guint page_num,
-                              SPColorNotebook *colorbook)
+ColorNotebook::~ColorNotebook()
 {
-    if ( colorbook )
+    if ( _buttons )
     {
-        // remember the page we switched to
-        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        prefs->setInt("/colorselector/page", page_num);
+        delete [] _buttons;
+        _buttons = 0;
     }
+
 }
 
-static void
-sp_color_notebook_init (SPColorNotebook *colorbook)
+ColorNotebook::Page::Page(Inkscape::UI::ColorSelectorFactory *selector_factory, bool enabled_full)
+    : selector_factory(selector_factory)
+    , enabled_full(enabled_full)
 {
-    SP_COLOR_SELECTOR(colorbook)->base = new ColorNotebook( SP_COLOR_SELECTOR(colorbook) );
-
-    if ( SP_COLOR_SELECTOR(colorbook)->base )
-    {
-        SP_COLOR_SELECTOR(colorbook)->base->init();
-    }
 }
 
-void ColorNotebook::init()
+
+void ColorNotebook::_initUI()
 {
     guint row = 0;
 
-    _updating = false;
-
-    _book = gtk_notebook_new ();
-    gtk_widget_show (_book);
-
-    // Dont show the notebook tabs, use radiobuttons instead
-    gtk_notebook_set_show_border (GTK_NOTEBOOK (_book), false);
-    gtk_notebook_set_show_tabs (GTK_NOTEBOOK (_book), false);
+    Gtk::Notebook *notebook = Gtk::manage(new Gtk::Notebook);
+    notebook->show();
+    notebook->set_show_border(false);
+    notebook->set_show_tabs(false);
+    _book = GTK_WIDGET(notebook->gobj());
 
 #if GTK_CHECK_VERSION(3,0,0)
     _buttonbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
@@ -158,16 +128,6 @@ void ColorNotebook::init()
         _addPage(_available_pages[i]);
     }
 
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkWidget* table = gtk_grid_new();
-#else
-    GtkWidget* table = gtk_table_new(2, 3, FALSE);
-#endif
-
-    gtk_widget_show (table);
-
-    gtk_box_pack_start (GTK_BOX (_csel), table, TRUE, TRUE, 0);
-
     sp_set_font_size_smaller (_buttonbox);
 
 #if GTK_CHECK_VERSION(3,0,0)
@@ -177,12 +137,9 @@ void ColorNotebook::init()
     gtk_widget_set_margin_bottom(_buttonbox, YPAD);
     gtk_widget_set_hexpand(_buttonbox, TRUE);
     gtk_widget_set_valign(_buttonbox, GTK_ALIGN_CENTER);
-    gtk_grid_attach(GTK_GRID(table), _buttonbox, 0, row, 2, 1);
+    attach(*Glib::wrap(_buttonbox), 0, row, 2, 1);
 #else
-    gtk_table_attach (GTK_TABLE (table), _buttonbox, 0, 2, row, row + 1,
-                      static_cast<GtkAttachOptions>(GTK_EXPAND|GTK_FILL),
-                      static_cast<GtkAttachOptions>(0),
-                      XPAD, YPAD);
+    attach(*Glib::wrap(_buttonbox), 0, 2, row, row+1, Gtk::EXPAND | Gtk::FILL, static_cast<Gtk::AttachOptions>(0), XPAD, YPAD);
 #endif
 
     row++;
@@ -194,12 +151,9 @@ void ColorNotebook::init()
     gtk_widget_set_margin_bottom(_book, YPAD);
     gtk_widget_set_hexpand(_book, TRUE);
     gtk_widget_set_vexpand(_book, TRUE);
-    gtk_grid_attach(GTK_GRID(table), _book, 0, row, 2, 1);
+    attach(*notebook, 0, row, 2, 1);
 #else
-    gtk_table_attach (GTK_TABLE (table), _book, 0, 2, row, row + 1,
-                      static_cast<GtkAttachOptions>(GTK_EXPAND|GTK_FILL),
-                      static_cast<GtkAttachOptions>(GTK_EXPAND|GTK_FILL),
-                      XPAD*2, YPAD);
+    attach(*notebook, 0, 2, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::EXPAND | Gtk::FILL, XPAD * 2, YPAD);
 #endif
 
     // restore the last active page
@@ -294,7 +248,7 @@ void ColorNotebook::init()
     gtk_container_add (GTK_CONTAINER (_btn_picker), picker);
     gtk_widget_set_tooltip_text (_btn_picker, _("Pick colors from image"));
     gtk_box_pack_start(GTK_BOX(rgbabox), _btn_picker, FALSE, FALSE, 2);
-    g_signal_connect(G_OBJECT(_btn_picker), "clicked", G_CALLBACK(ColorNotebook::_picker_clicked), _csel);
+    g_signal_connect(G_OBJECT(_btn_picker), "clicked", G_CALLBACK(ColorNotebook::_onPickerClicked), this);
 
     /* Create RGBA entry and color preview */
     _rgbal = gtk_label_new_with_mnemonic (_("RGBA_:"));
@@ -319,118 +273,60 @@ void ColorNotebook::init()
     gtk_widget_set_margin_right(rgbabox, XPAD);
     gtk_widget_set_margin_top(rgbabox, YPAD);
     gtk_widget_set_margin_bottom(rgbabox, YPAD);
+    attach(*Glib::wrap(rgbabox), 0, row, 2, 1);
     gtk_grid_attach(GTK_GRID(table), rgbabox, 0, row, 2, 1);
 #else
-    gtk_table_attach (GTK_TABLE (table), rgbabox, 0, 2, row, row + 1, GTK_FILL, GTK_SHRINK, XPAD, YPAD);
+    attach(*Glib::wrap(rgbabox), 0, 2, row, row + 1, Gtk::FILL, Gtk::SHRINK, XPAD, YPAD);
 #endif
 
 #ifdef SPCS_PREVIEW
     _p = sp_color_preview_new (0xffffffff);
     gtk_widget_show (_p);
-    gtk_table_attach (GTK_TABLE (table), _p, 2, 3, row, row + 1, GTK_FILL, GTK_FILL, XPAD, YPAD);
+    attach(*Glib::wrap(_p), 2, 3, row, row + 1, Gtk::FILL, Gtk::FILL, XPAD, YPAD);
 #endif
 
-    _switchId = g_signal_connect(G_OBJECT (_book), "switch-page",
-                                 G_CALLBACK (sp_color_notebook_switch_page), SP_COLOR_NOTEBOOK(_csel));
-
-    _selected_color.signal_changed.connect(sigc::mem_fun(this, &ColorNotebook::_onSelectedColorChanged));
-    _selected_color.signal_dragged.connect(sigc::mem_fun(this, &ColorNotebook::_onSelectedColorDragged));
-    _selected_color.signal_grabbed.connect(sigc::mem_fun(this, &ColorNotebook::_onSelectedColorGrabbed));
-    _selected_color.signal_released.connect(sigc::mem_fun(this, &ColorNotebook::_onSelectedColorReleased));
+    g_signal_connect(G_OBJECT (_book), "switch-page",
+                                 G_CALLBACK (ColorNotebook::_onPageSwitched), this);
 }
 
-static void sp_color_notebook_dispose(GObject *object)
+void ColorNotebook::_onPickerClicked(GtkWidget * /*widget*/, ColorNotebook * /*colorbook*/)
 {
-    if (((GObjectClass *) (parent_class))->dispose)
-        (* ((GObjectClass *) (parent_class))->dispose) (object);
+    // Set the dropper into a "one click" mode, so it reverts to the previous tool after a click
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    prefs->setBool("/tools/dropper/onetimepick", true);
+    Inkscape::UI::Tools::sp_toggle_dropper(SP_ACTIVE_DESKTOP);
 }
 
-ColorNotebook::~ColorNotebook()
+void ColorNotebook::_onButtonClicked(GtkWidget *widget,  ColorNotebook *nb)
 {
-    if ( _switchId )
-    {
-        if ( _book )
-        {
-            g_signal_handler_disconnect (_book, _switchId);
-            _switchId = 0;
-        }
+    if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget))) {
+        return;
     }
 
-    if ( _buttons )
-    {
-        delete [] _buttons;
-        _buttons = 0;
+    for(gint i = 0; i < gtk_notebook_get_n_pages (GTK_NOTEBOOK (nb->_book)); i++) {
+        if (nb->_buttons[i] == widget) {
+            gtk_notebook_set_current_page (GTK_NOTEBOOK (nb->_book), i);
+        }
     }
-
 }
 
-static void
-sp_color_notebook_show_all (GtkWidget *widget)
-{
-    gtk_widget_show (widget);
-}
-
-static void sp_color_notebook_hide(GtkWidget *widget)
-{
-    gtk_widget_hide(widget);
-}
-
-GtkWidget *sp_color_notebook_new()
-{
-    SPColorNotebook *colorbook = SP_COLOR_NOTEBOOK(g_object_new (SP_TYPE_COLOR_NOTEBOOK, NULL));
-
-    return GTK_WIDGET(colorbook);
-}
-
-ColorNotebook::ColorNotebook( SPColorSelector* csel )
-    : ColorSelector( csel )
-    , _selected_color(_selected_color_tmp)
-{
-    Page *page;
-
-    page = new Page(new ColorScalesFactory(SP_COLOR_SCALES_MODE_RGB), true);
-    _available_pages.push_back(page);
-    page = new Page(new ColorScalesFactory(SP_COLOR_SCALES_MODE_HSV), true);
-    _available_pages.push_back(page);
-    page = new Page(new ColorScalesFactory(SP_COLOR_SCALES_MODE_CMYK), true);
-    _available_pages.push_back(page);
-    page = new Page(new ColorWheelSelectorFactory, true);
-    _available_pages.push_back(page);
-#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
-    page = new Page(new ColorICCSelectorFactory, true);
-    _available_pages.push_back(page);
-#endif
-}
-
-Gtk::Widget *ColorNotebook::create(SelectedColor &color) {
-    GtkWidget *w = sp_color_selector_new(SP_TYPE_COLOR_NOTEBOOK);
-    SPColorSelector *s = SP_COLOR_SELECTOR(w);
-    ColorNotebook* nb = dynamic_cast<ColorNotebook*>(s->base);
-    return Glib::wrap(w);
-}
-
-ColorNotebook::Page::Page(Inkscape::UI::ColorSelectorFactory *selector_factory, bool enabled_full)
-    : selector_factory(selector_factory)
-    , enabled_full(enabled_full)
-{
-}
-
-void ColorNotebook::_colorChanged()
-{
-    _updating = true;
-    _selected_color.setColorAlpha(_color, _alpha);
+void ColorNotebook::_onSelectedColorChanged() {
     _updateICCButtons();
-    _updating = false;
 }
 
-void ColorNotebook::_picker_clicked(GtkWidget * /*widget*/, SPColorNotebook * /*colorbook*/)
+void ColorNotebook::_onPageSwitched(GtkNotebook *notebook,
+        GtkWidget   *page,
+        guint page_num,
+        ColorNotebook *colorbook)
 {
-    // Set the dropper into a "one click" mode, so it reverts to the previous tool after a click
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    prefs->setBool("/tools/dropper/onetimepick", true);
-    Inkscape::UI::Tools::sp_toggle_dropper(SP_ACTIVE_DESKTOP);
+    if (colorbook) {
+        // remember the page we switched to
+        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+        prefs->setInt("/colorselector/page", page_num);
+    }
 }
 
+
 // TODO pass in param so as to avoid the need for SP_ACTIVE_DOCUMENT
 void ColorNotebook::_updateICCButtons()
 {
@@ -483,60 +379,7 @@ void ColorNotebook::_setCurrentPage(int i)
     }
 }
 
-void ColorNotebook::_buttonClicked(GtkWidget *widget,  SPColorNotebook *colorbook)
-{
-    ColorNotebook* nb = dynamic_cast<ColorNotebook*>(SP_COLOR_SELECTOR(colorbook)->base);
-
-    if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widget))) {
-        return;
-    }
-
-    for(gint i = 0; i < gtk_notebook_get_n_pages (GTK_NOTEBOOK (nb->_book)); i++) {
-        if (nb->_buttons[i] == widget) {
-            gtk_notebook_set_current_page (GTK_NOTEBOOK (nb->_book), i);
-        }
-    }
-}
-
-void ColorNotebook::_onSelectedColorChanged() {
-    if (_updating) {
-        return;
-    }
-
-    SPColor color;
-    gfloat alpha = 1.0;
-    _selected_color.colorAlpha(color, alpha);
-    _updateInternals(color, alpha, false);
-    _updateICCButtons();
-}
-
-void ColorNotebook::_onSelectedColorDragged() {
-    if (_updating) {
-        return;
-    }
-    SPColor color;
-    gfloat alpha = 1.0;
-    _selected_color.colorAlpha(color, alpha);
-    _updateInternals(color, alpha, true);
-    _updateICCButtons();
-}
-
-void ColorNotebook::_onSelectedColorGrabbed() {
-    if (_updating) {
-        return;
-    }
-
-    _grabbed();
-}
-
-void ColorNotebook::_onSelectedColorReleased() {
-    if (_updating) {
-        return;
-    }
-    _released();
-}
-
-GtkWidget* ColorNotebook::_addPage(Page& page) {
+void ColorNotebook::_addPage(Page& page) {
     Gtk::Widget *selector_widget;
 
     selector_widget = page.selector_factory->createWidget(_selected_color);
@@ -556,12 +399,13 @@ GtkWidget* ColorNotebook::_addPage(Page& page) {
         gtk_widget_show (_buttons[page_num]);
         gtk_box_pack_start (GTK_BOX (_buttonbox), _buttons[page_num], TRUE, TRUE, 0);
 
-        g_signal_connect (G_OBJECT (_buttons[page_num]), "clicked", G_CALLBACK (_buttonClicked), _csel);
+        g_signal_connect (G_OBJECT (_buttons[page_num]), "clicked", G_CALLBACK (_onButtonClicked), this);
     }
-
-    return selector_widget->gobj();
 }
 
+}
+}
+}
 
 /* Commented out: see comment at the bottom of the header file
 
diff --git a/src/ui/widget/color-notebook.h b/src/ui/widget/color-notebook.h
index 177519e25..8b74f20f1 100644
--- a/src/ui/widget/color-notebook.h
+++ b/src/ui/widget/color-notebook.h
@@ -1,16 +1,18 @@
-#ifndef SEEN_SP_COLOR_NOTEBOOK_H
-#define SEEN_SP_COLOR_NOTEBOOK_H
-
-/*
+/**
+ * @file
  * A notebook with RGB, CMYK, CMS, HSL, and Wheel pages
- *
- * Author:
+ */
+/* Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
+ *   bulia byak <buliabyak@users.sf.net>
+ *   Tomasz Boczkowski <penginsbacon@gmail.com> (c++-sification)
  *
- * Copyright (C) 2001-2002 Lauris Kaplinski
+ * Copyright (C) 2001-2014 Authors
  *
  * This code is in public domain
  */
+#ifndef SEEN_SP_COLOR_NOTEBOOK_H
+#define SEEN_SP_COLOR_NOTEBOOK_H
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -23,26 +25,30 @@
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <gtk/gtk.h>
 #include <glib.h>
+#if GTK_CHECK_VERSION(3,0,0)
+#include <gtkmm/grid.h>
+#else
 #include <gtkmm/table.h>
+#endif
 
 #include "color.h"
-#include "widgets/sp-color-selector.h"
 #include "ui/selected-color.h"
 
+namespace Inkscape {
+namespace UI {
+namespace Widget {
 
-struct SPColorNotebook;
-
-class ColorNotebook: public ColorSelector
+class ColorNotebook
+#if GTK_CHECK_VERSION(3,0,0)
+    : public Gtk::Grid
+#else
+    : public Gtk::Table
+#endif
 {
 public:
-    ColorNotebook( SPColorSelector* csel );
+    ColorNotebook(SelectedColor &color);
     virtual ~ColorNotebook();
 
-    //Temporary factory method - transition from SPColorSelector
-    static Gtk::Widget* create(Inkscape::UI::SelectedColor &color);
-
-    virtual void init();
-
 protected:
     struct Page {
         Page(Inkscape::UI::ColorSelectorFactory *selector_factory, bool enabled_full);
@@ -51,25 +57,19 @@ protected:
         bool enabled_full;
     };
 
-    static void _buttonClicked(GtkWidget *widget,  SPColorNotebook *colorbook);
-    static void _picker_clicked(GtkWidget *widget,  SPColorNotebook *colorbook);
-
-    virtual void _colorChanged();
+    virtual void _initUI();
+    void _addPage(Page& page);
 
+    static void _onButtonClicked(GtkWidget *widget, ColorNotebook *colorbook);
+    static void _onPickerClicked(GtkWidget *widget, ColorNotebook *colorbook);
+    static void _onPageSwitched(GtkNotebook *notebook, GtkWidget *page,
+            guint page_num, ColorNotebook *colorbook);
     virtual void _onSelectedColorChanged();
-    virtual void _onSelectedColorDragged();
-    virtual void _onSelectedColorGrabbed();
-    virtual void _onSelectedColorReleased();
 
     void _updateICCButtons();
     void _setCurrentPage(int i);
 
-    GtkWidget* _addPage(Page& page);
-
-    Inkscape::UI::SelectedColor _selected_color_tmp;
     Inkscape::UI::SelectedColor &_selected_color;
-    gboolean _updating : 1;
-    gulong _switchId;
     gulong _entryId;
     GtkWidget *_book;
     GtkWidget *_buttonbox;
@@ -103,40 +103,10 @@ private:
     */
 };
 
-
-
-
-
-#define SP_TYPE_COLOR_NOTEBOOK (sp_color_notebook_get_type ())
-#define SP_COLOR_NOTEBOOK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_COLOR_NOTEBOOK, SPColorNotebook))
-#define SP_COLOR_NOTEBOOK_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), SP_TYPE_COLOR_NOTEBOOK, SPColorNotebookClass))
-#define SP_IS_COLOR_NOTEBOOK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_COLOR_NOTEBOOK))
-#define SP_IS_COLOR_NOTEBOOK_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SP_TYPE_COLOR_NOTEBOOK))
-
-struct SPColorNotebook {
-    SPColorSelector parent;    /* Parent */
-};
-
-struct SPColorNotebookClass {
-    SPColorSelectorClass parent_class;
-
-    void (* grabbed) (SPColorNotebook *rgbsel);
-    void (* dragged) (SPColorNotebook *rgbsel);
-    void (* released) (SPColorNotebook *rgbsel);
-    void (* changed) (SPColorNotebook *rgbsel);
-};
-
-GType sp_color_notebook_get_type(void);
-
-GtkWidget *sp_color_notebook_new (void);
-
-/* void sp_color_notebook_set_mode (SPColorNotebook *csel, SPColorNotebookMode mode); */
-/* SPColorNotebookMode sp_color_notebook_get_mode (SPColorNotebook *csel); */
-
-
-
+}
+}
+}
 #endif // SEEN_SP_COLOR_NOTEBOOK_H
-
 /*
   Local Variables:
   mode:c++
diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index dc827f377..a9948309e 100644
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -57,7 +57,7 @@ void ColorPicker::setupDialog(const Glib::ustring &title)
     _colorSelectorDialog.set_title (title);
     _colorSelectorDialog.set_border_width (4);
 
-    _color_selector = Gtk::manage(ColorNotebook::create(_selected_color));
+    _color_selector = Gtk::manage(new ColorNotebook(_selected_color));
 
 #if WITH_GTKMM_3_0
     _colorSelectorDialog.get_content_area()->pack_start (
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 2d654ac43..e751f4872 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -856,6 +856,8 @@ static void sp_grd_ed_del_stop(GtkWidget */*widget*/,  GtkWidget *vb)
 
 static GtkWidget * sp_gradient_vector_widget_new(SPGradient *gradient, SPStop *select_stop)
 {
+    using Inkscape::UI::Widget::ColorNotebook;
+
     GtkWidget *vb, *w, *f;
 
     g_return_val_if_fail(!gradient || SP_IS_GRADIENT(gradient), NULL);
@@ -991,7 +993,7 @@ static GtkWidget * sp_gradient_vector_widget_new(SPGradient *gradient, SPStop *s
     selected_color->signal_dragged.connect(sigc::bind(sigc::ptr_fun(&sp_gradient_vector_color_dragged), selected_color, G_OBJECT(vb)));
     selected_color->signal_dragged.connect(sigc::bind(sigc::ptr_fun(&sp_gradient_vector_color_changed), selected_color, G_OBJECT(vb)));
 
-    Gtk::Widget *color_selector = Gtk::manage(ColorNotebook::create(*selected_color));
+    Gtk::Widget *color_selector = Gtk::manage(new ColorNotebook(*selected_color));
     color_selector->show();
     gtk_container_add(GTK_CONTAINER(f), color_selector->gobj());
 
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 3f2edb4f2..a7e8e9750 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -657,6 +657,8 @@ void SPPaintSelector::onSelectedColorChanged() {
 
 static void sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelector::Mode /*mode*/)
 {
+    using Inkscape::UI::Widget::ColorNotebook;
+
     sp_paint_selector_set_style_buttons(psel, psel->solid);
     gtk_widget_set_sensitive(psel->style, TRUE);
 
@@ -677,7 +679,7 @@ static void sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelec
         gtk_widget_show(vb);
 
         /* Color selector */
-        Gtk::Widget *color_selector = Gtk::manage(ColorNotebook::create(*(psel->selected_color)));
+        Gtk::Widget *color_selector = Gtk::manage(new ColorNotebook(*(psel->selected_color)));
         color_selector->show();
         gtk_box_pack_start(GTK_BOX(vb), color_selector->gobj(), TRUE, TRUE, 0);
 
diff --git a/src/widgets/swatch-selector.cpp b/src/widgets/swatch-selector.cpp
index eb8bf7a4f..6f2807255 100644
--- a/src/widgets/swatch-selector.cpp
+++ b/src/widgets/swatch-selector.cpp
@@ -22,6 +22,8 @@ SwatchSelector::SwatchSelector() :
     _gsel(0),
     _updating_color(false)
 {
+    using Inkscape::UI::Widget::ColorNotebook;
+
     GtkWidget *gsel = sp_gradient_selector_new();
     _gsel = SP_GRADIENT_SELECTOR(gsel);
     g_object_set_data( G_OBJECT(gobj()), "base", this );
@@ -31,7 +33,7 @@ SwatchSelector::SwatchSelector() :
 
     pack_start(*Gtk::manage(Glib::wrap(gsel)));
 
-    Gtk::Widget *color_selector = Gtk::manage(ColorNotebook::create(_selected_color));
+    Gtk::Widget *color_selector = Gtk::manage(new ColorNotebook(_selected_color));
     color_selector->show();
     pack_start(*color_selector);