diff options
| author | Tomasz Boczkowski <penginsbacon@gmail.com> | 2014-06-01 14:41:20 +0000 |
|---|---|---|
| committer | Tomasz Boczkowski <penginsbacon@gmail.com> | 2014-06-01 14:41:20 +0000 |
| commit | 65782d9a28fe5745e672b33c005edfda715c2ed8 (patch) | |
| tree | 69c8872ec7ee2ea21ac6902e6bfe81f1494aae52 /src/widgets/swatch-selector.h | |
| parent | using ColorSelector in SPPaintSelector (diff) | |
| download | inkscape-65782d9a28fe5745e672b33c005edfda715c2ed8.tar.gz inkscape-65782d9a28fe5745e672b33c005edfda715c2ed8.zip | |
using ColorSelector in SwatchSelector
(bzr r13341.6.50)
Diffstat (limited to 'src/widgets/swatch-selector.h')
| -rw-r--r-- | src/widgets/swatch-selector.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/widgets/swatch-selector.h b/src/widgets/swatch-selector.h index c8c9983a6..d447fff37 100644 --- a/src/widgets/swatch-selector.h +++ b/src/widgets/swatch-selector.h @@ -10,6 +10,7 @@ #endif #include <gtkmm/box.h> +#include "ui/selected-color.h" class SPDocument; class SPGradient; @@ -37,13 +38,14 @@ public: SPGradientSelector *getGradientSelector(); private: - static void _grabbedCb(SPColorSelector *csel, void *data); - static void _draggedCb(SPColorSelector *csel, void *data); - static void _releasedCb(SPColorSelector *csel, void *data); - static void _changedCb(SPColorSelector *csel, void *data); + void _grabbedCb(); + void _draggedCb(); + void _releasedCb(); + void _changedCb(); SPGradientSelector *_gsel; - SPColorSelector *_csel; + Inkscape::UI::SelectedColor _selected_color; + bool _updating_color; }; |