liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gtk3' into gtk3-bugfix

Browse Source
This commit is contained in:
Hombre
2016-10-28 23:48:22 +02:00
parent 4d19b97109 b16ef8d1f5
commit e4e474ca8a
259 changed files with 5062 additions and 3653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/mycurve.cc
View File

@@ -21,7 +21,7 @@
#include <cstring>
#include <gdkmm/types.h>
MyCurve::MyCurve () : pipetteR(-1.f), pipetteG(-1.f), pipetteB(-1.f), pipetteVal(-1.f), listener(NULL), cursor_type( CSArrow)
MyCurve::MyCurve () : pipetteR(-1.f), pipetteG(-1.f), pipetteB(-1.f), pipetteVal(-1.f), listener(nullptr), cursor_type( CSArrow)
{
graphX = get_allocation().get_width() - RADIUS * 2;
@@ -30,9 +30,9 @@ MyCurve::MyCurve () : pipetteR(-1.f), pipetteG(-1.f), pipetteB(-1.f), pipetteVal
prevGraphH = graphH;
buttonPressed = false;
snapTo = ST_None;
leftBar = NULL;
bottomBar = NULL;
colorProvider = NULL;
leftBar = nullptr;
bottomBar = nullptr;
colorProvider = nullptr;
snapToElmt = -100;
curveIsDirty = true;
edited_point = -1;
@@ -190,11 +190,11 @@ void MyCurve::on_style_updated ()
void MyCurve::refresh()
{
if (leftBar != NULL) {
if (leftBar != nullptr) {
leftBar->setDirty(true);
}
if (bottomBar != NULL) {
if (bottomBar != nullptr) {
bottomBar->setDirty(true);
}