Merged master into gtk3

2016-01-30 16:00:53 +01:00
parent 2880cfbbda b5aa2dcffc
commit fc339a2fea
40 changed files with 1455 additions and 1463 deletions
--- a/rtgui/batchqueue.h
+++ b/rtgui/batchqueue.h
@@ -57,9 +57,8 @@ protected:
    MyImageMenuItem* tail;
    Gtk::MenuItem* selall;
    Gtk::MenuItem* open;
-    std::unique_ptr<Gtk::Menu> pmenu;
-
    Glib::RefPtr<Gtk::AccelGroup> pmaccelgroup;
+    Gtk::Menu pmenu;

    BatchQueueListener* listener;