Merge branch 'master' into nikitakit_master
[synfig.git] / synfig-studio / src / gtkmm / workarea.cpp
index d07db87..d2a1f3b 100644 (file)
@@ -754,7 +754,7 @@ WorkArea::WorkArea(etl::loose_handle<synfigapp::CanvasInterface> canvas_interfac
        // Create the menu button
        menubutton=manage(new class Gtk::Button());
        Gtk::Arrow *arrow1 = manage(new class Gtk::Arrow(Gtk::ARROW_RIGHT, Gtk::SHADOW_OUT));
-       arrow1->set_size_request(11,11);
+       arrow1->set_size_request(10,10);
        menubutton->add(*arrow1);
        menubutton->show_all();
        menubutton->signal_pressed().connect(sigc::mem_fun(*this, &WorkArea::popup_menu));
@@ -2721,8 +2721,7 @@ studio::WorkArea::set_cursor(Gdk::CursorType x)
        drawing_area->get_window()->set_cursor(Gdk::Cursor(x));
 }
 
-#include "iconcontroller.h"
-
+//#include "iconcontroller.h"
 void
 studio::WorkArea::refresh_cursor()
 {