diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-06-29 13:28:54 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-06-29 13:28:54 +0000 |
| commit | 88e5cefd2b64d56aa00009f91d9c481c9b8c3c74 (patch) | |
| tree | 901357ee4a10db7a130c7c591e2fe85ee32bc931 /src/ui/widget/labelled.cpp | |
| parent | glade WIP (diff) | |
| parent | Hackfest icon work: restore selected menu icons and make theming easier (diff) | |
| download | inkscape-88e5cefd2b64d56aa00009f91d9c481c9b8c3c74.tar.gz inkscape-88e5cefd2b64d56aa00009f91d9c481c9b8c3c74.zip | |
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/ui/widget/labelled.cpp')
| -rw-r--r-- | src/ui/widget/labelled.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/widget/labelled.cpp b/src/ui/widget/labelled.cpp index 6e3652830..d3dc6210f 100644 --- a/src/ui/widget/labelled.cpp +++ b/src/ui/widget/labelled.cpp @@ -14,8 +14,7 @@ #include "labelled.h" -/* For getting the Gtkmmified Icon manager */ -#include "widgets/icon.h" +#include <gtkmm/image.h> #include <gtkmm/label.h> namespace Inkscape { @@ -33,8 +32,9 @@ Labelled::Labelled(Glib::ustring const &label, Glib::ustring const &tooltip, { g_assert(g_utf8_validate(icon.c_str(), -1, NULL)); if (icon != "") { - _icon = sp_icon_get_icon(icon.c_str(), Inkscape::ICON_SIZE_LARGE_TOOLBAR); - pack_start(*Gtk::manage(_icon), Gtk::PACK_SHRINK); + _icon = Gtk::manage(new Gtk::Image()); + _icon->set_from_icon_name(icon, Gtk::ICON_SIZE_LARGE_TOOLBAR); + pack_start(*_icon, Gtk::PACK_SHRINK); } pack_start(*Gtk::manage(_label), Gtk::PACK_EXPAND_WIDGET, 6); pack_start(*Gtk::manage(_widget), Gtk::PACK_SHRINK, 6); |