merge with dev

2018-10-07 09:58:43 +02:00
parent e9d4dede48 c34bd31765
commit 72ed6f81b0
156 changed files with 1988 additions and 2059 deletions
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -195,7 +195,6 @@ protected:
    void addPanel(Gtk::Box* where, FoldableToolPanel* panel, int level = 1);
    void foldThemAll(GdkEventButton* event);
    void updateVScrollbars(bool hide);
-    void updateTabsHeader(bool useIcons);

 private:

@@ -301,7 +300,6 @@ public:
    }

    void updateTPVScrollbar(bool hide);
-    void updateTabsUsesIcons(bool useIcons);
    bool handleShortcutKey(GdkEventKey* event);

    // ToolBarListener interface