Merge branch 'dev' into favorites-gui

rtgui/labcurve.h

@@ -59,11 +59,14 @@ protected:
     DiagonalCurveEditor* cdshape;
 
     //%%%%%%%%%%%%%%%%
-    Gtk::CheckButton* avoidcolorshift;
     Gtk::CheckButton* lcredsk;
 
+    MyComboBoxText* gamutmunselmethod;
+    sigc::connection   gamutmunselmethodconn;
+    rtengine::ProcEvent Evgamutmunsell;
+
     Adjuster* rstprotection;
-    sigc::connection  bwtconn, acconn, lcconn;
+    sigc::connection  bwtconn, lcconn;
     bool lastACVal, lastLCVal;
 
     //%%%%%%%%%%%%%%%%
@@ -85,8 +88,8 @@ public:
 
     void curveChanged (CurveEditor* ce) override;
     void adjusterChanged (Adjuster* a, double newval) override;
-    void avoidcolorshift_toggled ();
     void lcredsk_toggled();
+    void gamutmunselChanged();
 
     void updateCurveBackgroundHistogram(
         const LUTu& histToneCurve,