Testing merge of master 95f0d6 into gtk3 9cf0e5

2016-12-27 17:14:45 +01:00
parent 9cf0e5c40f
commit e4f6319d1b
42 changed files with 1824 additions and 1523 deletions
--- a/rtgui/curveeditorgroup.h
+++ b/rtgui/curveeditorgroup.h
@@ -85,7 +85,7 @@ public:
        return displayedCurve;
    }
    //void on_realize ();
-    CurveEditor* addCurve(CurveType cType, Glib::ustring curveLabel, Gtk::Widget *relatedWidget = nullptr, bool periodic = true);
+    CurveEditor* addCurve(CurveType cType, Glib::ustring curveLabel, Gtk::Widget *relatedWidget = nullptr, bool expandRelatedWidget = true, bool periodic = true);

 protected:
    //void curveTypeToggled ();