fixing to new trunk

(bzr r15142.1.38)

1 files changed, 5 insertions, 15 deletions

diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 6e6e6c527..dff92594b 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -17,7 +17,6 @@
 
 #include <gtkmm/dialog.h> // for Gtk::RESPONSE_*
 #include <gtkmm/menu.h>
-#include <gtkmm/stock.h>
 #include <gtkmm/checkmenuitem.h>
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/separatormenuitem.h>
@@ -66,7 +65,7 @@ Panel::Panel(Glib::ustring const &label, gchar const *prefs_path,
     _label(label),
     _apply_label(apply_label),
     _verb_num(verb_num),
-    _temp_arrow(Gtk::ARROW_LEFT, Gtk::SHADOW_ETCHED_OUT),
+    _temp_arrow(),
     _menu(0),
     _action_area(0),
     _fillable(0)
@@ -269,11 +268,9 @@ void Panel::_init()
         _top_bar.pack_end(_menu_popper, false, false);
         gint width = 0;
         gint height = 0;
-
-        if ( gtk_icon_size_lookup( Inkscape::getRegisteredIconSize(Inkscape::ICON_SIZE_DECORATION), &width, &height ) ) {
-            _temp_arrow.set_size_request(width, height);
-        }
-
+        gtk_image_set_from_icon_name(_temp_arrow.gobj(),
+                                     "pan-start-symbolic",
+                                     Inkscape::getRegisteredIconSize(Inkscape::ICON_SIZE_SMALL_TOOLBAR));
         _menu_popper.add(_temp_arrow);
         _menu_popper.signal_button_press_event().connect_notify(sigc::mem_fun(*this, &Panel::_popper));
     }
@@ -578,14 +575,7 @@ void Panel::_apply()
 
 Gtk::Button *Panel::addResponseButton(const Glib::ustring &button_text, int response_id, bool pack_start)
 {
-    Gtk::Button *button = new Gtk::Button(button_text);
-    _addResponseButton(button, response_id, pack_start);
-    return button;
-}
-
-Gtk::Button *Panel::addResponseButton(const Gtk::StockID &stock_id, int response_id, bool pack_start)
-{
-    Gtk::Button *button = new Gtk::Button(stock_id);
+    Gtk::Button *button = new Gtk::Button(button_text, true);
     _addResponseButton(button, response_id, pack_start);
     return button;
 }