Merge branch 'dev' into newlocallab

2019-08-08 16:18:58 +02:00
parent 3603cad472 82e329ca83
commit b3e0013e56
96 changed files with 1000 additions and 1654 deletions
--- a/rtgui/flatcurveeditorsubgroup.h
+++ b/rtgui/flatcurveeditorsubgroup.h
@@ -21,10 +21,11 @@

 #include <gtkmm.h>
 #include "curveeditorgroup.h"
+#include "../rtengine/noncopyable.h"

 class FlatCurveEditor;

-class FlatCurveEditorSubGroup: public CurveEditorSubGroup
+class FlatCurveEditorSubGroup: public CurveEditorSubGroup, public rtengine::NonCopyable
 {

    friend class FlatCurveEditor;