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

Merge master into gtk3

Browse Source
This commit is contained in:
heckflosse
2016-10-28 17:59:47 +02:00
parent 5244c44420 3a346d919d
commit b16ef8d1f5
259 changed files with 5061 additions and 3654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/adjuster.h
View File

@@ -81,7 +81,7 @@ public:
int delay;
Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep, double vdefault, Gtk::Image *imgIcon1 = NULL, Gtk::Image *imgIcon2 = NULL, double2double_fun slider2value = NULL, double2double_fun value2slider = NULL);
Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep, double vdefault, Gtk::Image *imgIcon1 = nullptr, Gtk::Image *imgIcon2 = nullptr, double2double_fun slider2value = nullptr, double2double_fun value2slider = nullptr);
virtual ~Adjuster ();
// Add an "Automatic" checkbox next to the reset button.
@@ -91,7 +91,7 @@ public:
// Send back the value of og the Auto checkbox
bool getAutoValue ()
{
return automatic != NULL ? automatic->get_active () : false;
return automatic != nullptr ? automatic->get_active () : false;
}
void setAutoValue (bool a);
bool notifyListenerAutoToggled ();