Using SelectedColor in extenstion/param/color

(bzr r13341.6.45)

2 files changed, 14 insertions, 1 deletions

diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index 420efacc1..38ea04372 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -45,6 +45,7 @@
 
 using Inkscape::CMSSystem;
 
+using namespace Inkscape::UI;
 using namespace Inkscape::UI::Widget;
 
 struct SPColorNotebookTracker {
@@ -383,6 +384,7 @@ GtkWidget *sp_color_notebook_new()
 
 ColorNotebook::ColorNotebook( SPColorSelector* csel )
     : ColorSelector( csel )
+    , _selected_color(_selected_color_tmp)
 {
     Page *page;
 
@@ -400,6 +402,13 @@ ColorNotebook::ColorNotebook( SPColorSelector* csel )
 #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)
diff --git a/src/widgets/sp-color-notebook.h b/src/widgets/sp-color-notebook.h
index cc3fb4c76..42fb0ed97 100644
--- a/src/widgets/sp-color-notebook.h
+++ b/src/widgets/sp-color-notebook.h
@@ -38,6 +38,9 @@ public:
     ColorNotebook( SPColorSelector* csel );
     virtual ~ColorNotebook();
 
+    //Temporary factory method - transition from SPColorSelector
+    static Gtk::Widget* create(Inkscape::UI::SelectedColor &color);
+
     virtual void init();
 
 protected:
@@ -63,7 +66,8 @@ protected:
 
     GtkWidget* _addPage(Page& page);
 
-    Inkscape::UI::SelectedColor _selected_color;
+    Inkscape::UI::SelectedColor _selected_color_tmp;
+    Inkscape::UI::SelectedColor &_selected_color;
     gboolean _updating : 1;
     gulong _switchId;
     gulong _entryId;