Merge branch 'master' into gtk3

2016-07-09 23:49:31 +02:00
parent 93360770e1 3b734e4a7a
commit 040962c1b7
49 changed files with 418 additions and 419 deletions
--- a/rtgui/mycurve.cc
+++ b/rtgui/mycurve.cc
@@ -21,10 +21,9 @@
 #include <cstring>
 #include <gdkmm/types.h>

-MyCurve::MyCurve () : pipetteR(-1.f), pipetteG(-1.f), pipetteB(-1.f), pipetteVal(-1.f), listener(NULL)
+MyCurve::MyCurve () : pipetteR(-1.f), pipetteG(-1.f), pipetteB(-1.f), pipetteVal(-1.f), listener(NULL), cursor_type( CSArrow)
 {

-    cursor_type = CSArrow;
    graphX = get_allocation().get_width() - RADIUS * 2;
    graphY = get_allocation().get_height() - RADIUS * 2;
    prevGraphW = graphW;