gtk322

commit 2ee38d1881aeea27bb49acc450631d813d1f28ba
Author: Hubert Figuière <hub@figuiere.net>
Date:   Wed Dec 7 09:44:01 2016 -0500

    Bug 13815 - draw event should return TRUE

    This fix the black drawing regression witj Gtk3.22

Bug: http://bugzilla.abisource.com/13815
Bug-Debian:  https://bugs.debian.org/842443
Bug-Ubuntu: https://launchpad.net/bugs/1637893

Gbp-Pq: Name gtk322.patch

diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
index 780000ea69f545f2974849f60a4856add477dbd2..10f8e00ffb6f10ac0a3d6780b7ae528b1bbb05cc 100644 (file)
--- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp
+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g
 }
 
 #if GTK_CHECK_VERSION(3,0,0)
-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
 #else
-gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
+gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
 #endif
 {
        XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
                pView->draw(&rClip);
 #endif
        }
-       return FALSE;
+       return TRUE;
 }
 
 static bool bScrollWait = false;

diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h
index 30ee5d8e8fba7536a716df00509fb509531f8341..a0ff57fabcfdabc5be0557bdf7ab2c9525d5c4dc 100644 (file)
--- a/src/af/xap/gtk/xap_UnixFrameImpl.h
+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h
@@ -152,9 +152,9 @@ protected:
                        static gint key_release_event(GtkWidget* w, GdkEventKey* e);
                        static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
 #if GTK_CHECK_VERSION(3,0,0)
-                       static gint draw(GtkWidget * w, cairo_t * cr);
+                       static gboolean draw(GtkWidget * w, cairo_t * cr);
 #else
-                       static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
+                       static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
 #endif
                        static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p);
                        static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/);