diff options
| author | Tomasz Boczkowski <penginsbacon@gmail.com> | 2015-04-26 17:51:08 +0000 |
|---|---|---|
| committer | Tomasz Boczkowski <penginsbacon@gmail.com> | 2015-04-26 17:51:08 +0000 |
| commit | 09c12ba65e2aa359603d3ed41a00624efd42693d (patch) | |
| tree | fe3469e0d8ae6aa897f5f1d549b24b2f77cfe3dd /src/ui/dialog/objects.h | |
| parent | merged SPColorICCSelector c++-sification from svgpaints branch (diff) | |
| parent | ColorNotebook is Gtk::Widget and uses ColorSelector (diff) | |
| download | inkscape-09c12ba65e2aa359603d3ed41a00624efd42693d.tar.gz inkscape-09c12ba65e2aa359603d3ed41a00624efd42693d.zip | |
Using SelectedColor instead of SPColorSelector
(bzr r14059.1.10)
Diffstat (limited to 'src/ui/dialog/objects.h')
| -rw-r--r-- | src/ui/dialog/objects.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ui/dialog/objects.h b/src/ui/dialog/objects.h index 74c2382ac..aa50353c2 100644 --- a/src/ui/dialog/objects.h +++ b/src/ui/dialog/objects.h @@ -20,6 +20,7 @@ # include <glibmm/threads.h> #endif +#include <boost/scoped_ptr.hpp> #include <gtkmm/box.h> #include <gtkmm/treeview.h> #include <gtkmm/treestore.h> @@ -40,6 +41,9 @@ struct SPColorSelector; namespace Inkscape { namespace UI { + +class SelectedColor; + namespace Dialog { @@ -170,8 +174,7 @@ private: Gtk::Alignment _blur_alignment; Gtk::Dialog _colorSelectorDialog; - SPColorSelector *_colorSelector; - + boost::scoped_ptr<Inkscape::UI::SelectedColor> _selectedColor; //Methods: @@ -237,7 +240,7 @@ private: void setupDialog(const Glib::ustring &title); - friend void sp_highlight_picker_color_mod(SPColorSelector *csel, GObject *cp); + void _highlightPickerColorMod(); }; |