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

6
rtgui/thumbbrowserbase.cc
View File

@@ -25,7 +25,7 @@
using namespace std;
ThumbBrowserBase::ThumbBrowserBase ()
: lastClicked(NULL), previewHeight(options.thumbSize), numOfCols(1), inspector(NULL), isInspectorActive(false), location(THLOC_FILEBROWSER)
: lastClicked(nullptr), previewHeight(options.thumbSize), numOfCols(1), inspector(nullptr), isInspectorActive(false), location(THLOC_FILEBROWSER)
{
inW = -1;
inH = -1;
@@ -738,7 +738,7 @@ void ThumbBrowserBase::on_style_updated ()
refreshThumbImages ();
}
ThumbBrowserBase::Internal::Internal () : ofsX(0), ofsY(0), parent(NULL), dirty(true)
ThumbBrowserBase::Internal::Internal () : ofsX(0), ofsY(0), parent(nullptr), dirty(true)
{
Glib::RefPtr<Gtk::StyleContext> style = get_style_context();
set_name("FileCatalog");
@@ -787,7 +787,7 @@ void ThumbBrowserBase::buttonPressed (int x, int y, int button, GdkEventType typ
{
// GUI already acquired
ThumbBrowserEntryBase* fileDescr = NULL;
ThumbBrowserEntryBase* fileDescr = nullptr;
bool handled = false;
{