1 files changed, 14 insertions, 8 deletions
diff --git a/src/ui/dialog/objects.h b/src/ui/dialog/objects.h
index 74c2382ac..9b9a6025a 100644
--- a/src/ui/dialog/objects.h
+++ b/src/ui/dialog/objects.h
@@ -16,10 +16,7 @@
 # include <config.h>
 #endif
 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-# include <glibmm/threads.h>
-#endif
-
+#include <boost/scoped_ptr.hpp>
 #include <gtkmm/box.h>
 #include <gtkmm/treeview.h>
 #include <gtkmm/treestore.h>
@@ -40,6 +37,9 @@ struct SPColorSelector;
 namespace Inkscape {
 
 namespace UI {
+
+class SelectedColor;
+
 namespace Dialog {
 
 
@@ -147,7 +147,14 @@ private:
     Gtk::Menu _popupMenu;
     Inkscape::UI::Widget::SpinButton _spinBtn;
     Gtk::VBox _page;
-    
+
+    Gtk::Label _visibleHeader;
+    Gtk::Label _lockHeader;
+    Gtk::Label _typeHeader;
+    Gtk::Label _clipmaskHeader;
+    Gtk::Label _highlightHeader;
+    Gtk::Label _nameHeader;
+
     /* Composite Settings */
     Gtk::VBox       _composite_vbox;
     Gtk::VBox       _opacity_vbox;
@@ -170,8 +177,7 @@ private:
     Gtk::Alignment  _blur_alignment;
 
     Gtk::Dialog _colorSelectorDialog;
-    SPColorSelector *_colorSelector;
-
+    boost::scoped_ptr<Inkscape::UI::SelectedColor> _selectedColor;
     
     //Methods:
     
@@ -237,7 +243,7 @@ private:
     
     void setupDialog(const Glib::ustring &title);
     
-    friend void sp_highlight_picker_color_mod(SPColorSelector *csel, GObject *cp);
+    void _highlightPickerColorMod();
 
 };