Merge branch 'gtk3' into gtk3-bugfix

2016-12-13 23:04:25 +01:00
parent 3b3a14bb93 e1c5e76c10
commit a7d4f76364
11 changed files with 117 additions and 37 deletions
--- a/rtgui/guiutils.h
+++ b/rtgui/guiutils.h
@@ -519,7 +519,7 @@ public:
    // you have to check if the surface is created thanks to surfaceCreated before starting to draw on it
    bool surfaceCreated()
    {
-        return surface;
+        return static_cast<bool>(surface);
    }
    Cairo::RefPtr<Cairo::ImageSurface> getSurface()
    {