Merge branch 'gtk3' into gtk3-bugfix

2016-11-12 01:19:27 +01:00
parent cbd0060bcd 024905a8ca
commit b3167eadce
13 changed files with 131 additions and 46 deletions
--- a/rtgui/imagearea.h
+++ b/rtgui/imagearea.h
@@ -41,9 +41,8 @@ class ImageArea : public Gtk::DrawingArea, public CropWindowListener, public Edi
 protected:

    Glib::ustring infotext;
-    Glib::RefPtr<Pango::Layout> ilayout;
    Glib::RefPtr<Pango::Layout> deglayout;
-    Glib::RefPtr<Gdk::Pixbuf>   ipixbuf;
+    BackBuffer iBackBuffer;
    bool showClippedH, showClippedS;

    ImageAreaPanel* parent;