1 files changed, 14 insertions, 5 deletions
diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h
index 788aa673e..23c2dd456 100644
--- a/src/widgets/paint-selector.h
+++ b/src/widgets/paint-selector.h
@@ -12,12 +12,18 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <glib.h>
 #include <gtk/gtk.h>
 
 #include "color.h"
 #include "fill-or-stroke.h"
 #include "sp-gradient-spread.h"
 #include "sp-gradient-units.h"
+#include "ui/selected-color.h"
 
 class SPGradient;
 class SPDesktop;
@@ -44,8 +50,7 @@ struct SPPaintSelector {
         MODE_EMPTY,
         MODE_MULTIPLE,
         MODE_NONE,
-        MODE_COLOR_RGB,
-        MODE_COLOR_CMYK,
+        MODE_SOLID_COLOR,
         MODE_GRADIENT_LINEAR,
         MODE_GRADIENT_RADIAL,
 #ifdef WITH_MESH
@@ -83,9 +88,8 @@ struct SPPaintSelector {
     GtkWidget *frame, *selector;
     GtkWidget *label;
 
-    SPColor color;
-    float alpha;
-
+    Inkscape::UI::SelectedColor *selected_color;
+    bool updating_color;
 
     static Mode getModeForStyle(SPStyle const & style, FillOrStroke kind);
 
@@ -114,6 +118,11 @@ struct SPPaintSelector {
 
     // TODO move this elsewhere:
     void setFlatColor( SPDesktop *desktop, const gchar *color_property, const gchar *opacity_property );
+
+    void onSelectedColorGrabbed();
+    void onSelectedColorDragged();
+    void onSelectedColorReleased();
+    void onSelectedColorChanged();
 };
 
 enum {COMBO_COL_LABEL=0, COMBO_COL_STOCK=1, COMBO_COL_PATTERN=2, COMBO_COL_SEP=3, COMBO_N_COLS=4};