From 83c8ece517ffc7cbfcb9b2493147e61606e5efc8 Mon Sep 17 00:00:00 2001 From: Geoff Lankow Date: Sun, 25 Mar 2018 20:39:59 +1300 Subject: Create and use LabelledColorPicker widget --- src/ui/widget/registered-widget.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/ui/widget/registered-widget.cpp') diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp index 753b72c2e..d539cdcc5 100644 --- a/src/ui/widget/registered-widget.cpp +++ b/src/ui/widget/registered-widget.cpp @@ -365,13 +365,10 @@ RegisteredColorPicker::RegisteredColorPicker(const Glib::ustring& label, Registry& wr, Inkscape::XML::Node* repr_in, SPDocument *doc_in) - : RegisteredWidget (title, tip, 0, true) + : RegisteredWidget (label, title, tip, 0, true) { init_parent("", wr, repr_in, doc_in); - _label = new Gtk::Label (label, Gtk::ALIGN_END); - _label->set_use_underline (true); - _label->set_mnemonic_widget (*this); _ckey = ckey; _akey = akey; _changed_connection = connectChanged (sigc::mem_fun (*this, &RegisteredColorPicker::on_changed)); @@ -385,13 +382,13 @@ RegisteredColorPicker::~RegisteredColorPicker() void RegisteredColorPicker::setRgba32 (guint32 rgba) { - ColorPicker::setRgba32 (rgba); + LabelledColorPicker::setRgba32 (rgba); } void RegisteredColorPicker::closeWindow() { - ColorPicker::closeWindow(); + LabelledColorPicker::closeWindow(); } void -- cgit v1.2.3