SPColorScales c++-sification - using SelectedColor

(bzr r13341.6.40)

4 files changed, 9 insertions, 3 deletions

diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index 808dfc925..f872a3164 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -33,6 +33,9 @@
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
 
+using namespace Inkscape::UI::Widget;
+
+
 #ifdef DEBUG_LCMS
 extern guint update_in_progress;
 #define DEBUG_MESSAGE(key, ...) \
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index 0e1634314..807fe38e0 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -455,7 +455,9 @@ ColorNotebook::Page::Page(Inkscape::UI::ColorSelectorFactory *selector_factory,
 
 void ColorNotebook::_colorChanged()
 {
+    _updating = true;
     _selected_color.setColorAlpha(_color, _alpha, true);
+    _updating = false;
 
     SPColorSelector* cselPage = getCurrentSelector();
     if ( cselPage )
@@ -613,13 +615,13 @@ void ColorNotebook::_onSelectedColorDragged() {
     }
     bool oldState = _dragging;
 
-    _dragging = TRUE;
+    _dragging = true;
     SPColor color;
     gfloat alpha = 1.0;
 
     _updating = true;
     _selected_color.colorAlpha(color, alpha);
-    _updateInternals(color, alpha, _dragging);
+    _updateInternals(color, alpha, true);
     _updating = false;
 
     _dragging = oldState;
diff --git a/src/widgets/sp-color-notebook.h b/src/widgets/sp-color-notebook.h
index 7c6dbc770..ca9343bf0 100644
--- a/src/widgets/sp-color-notebook.h
+++ b/src/widgets/sp-color-notebook.h
@@ -23,6 +23,7 @@
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <gtk/gtk.h>
 #include <glib.h>
+#include <gtkmm/table.h>
 
 #include "../color.h"
 #include "sp-color-selector.h"
diff --git a/src/widgets/sp-color-selector.cpp b/src/widgets/sp-color-selector.cpp
index 05af162ef..58aa0e1af 100644
--- a/src/widgets/sp-color-selector.cpp
+++ b/src/widgets/sp-color-selector.cpp
@@ -312,7 +312,7 @@ void ColorSelector::_updateInternals( const SPColor& color, gfloat alpha, gboole
                    (_held ? "CHANGED" : "DRAGGED" ),
                    color.toRGBA32( alpha ), (color.icc?color.icc->colorProfile.c_str():"<null>"), FOO_NAME(_csel));
 #endif
-        g_signal_emit(G_OBJECT(_csel), csel_signals[_held ? CHANGED : DRAGGED], 0);
+        g_signal_emit(G_OBJECT(_csel), csel_signals[_held ? DRAGGED : CHANGED], 0);
     }
 }