Merge branch 'dev' into hidpi-icons

2019-02-25 22:37:00 +01:00
parent cc1779a0ae 43e93d8ad4
commit bd175ec8d1
104 changed files with 1550 additions and 1131 deletions
--- a/rtgui/guiutils.h
+++ b/rtgui/guiutils.h
@@ -195,6 +195,8 @@ private:
    ExpanderBox* expBox;        /// Frame that includes the child and control its visibility
    Gtk::EventBox *imageEvBox;  /// Enable/Disable or Open/Close arrow event box

+    using Gtk::Container::add;
+
    /// Triggered on opened/closed event
    bool on_toggle(GdkEventButton* event);
    /// Triggered on enabled/disabled change -> will emit a toggle event to the connected objects