ColorNotebook is Gtk::Widget and uses ColorSelector

(bzr r13341.6.52)

3 files changed, 9 insertions, 3 deletions

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);