|
 |
6a88dfb |
From cec2fda355b67b5b814a803c5ed128c425cbb030 Mon Sep 17 00:00:00 2001
|
|
|
6a88dfb |
From: Hubert Figuiere <hub@figuiere.net>
|
|
|
6a88dfb |
Date: Thu, 8 Dec 2016 02:03:10 +0000
|
|
|
6a88dfb |
Subject: [PATCH] Bug 13815 - draw event should return TRUE
|
|
|
6a88dfb |
|
|
|
6a88dfb |
This fix the black drawing regression with Gtk3.22
|
|
|
6a88dfb |
|
|
|
6a88dfb |
git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@35394 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
|
|
|
6a88dfb |
---
|
|
|
6a88dfb |
src/af/xap/gtk/xap_UnixFrameImpl.cpp | 6 +++---
|
|
|
6a88dfb |
src/af/xap/gtk/xap_UnixFrameImpl.h | 4 ++--
|
|
|
6a88dfb |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
6a88dfb |
|
|
|
6a88dfb |
diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
|
|
|
6a88dfb |
index 780000e..10f8e00 100644
|
|
|
6a88dfb |
--- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp
|
|
|
6a88dfb |
+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
|
|
|
6a88dfb |
@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g
|
|
|
6a88dfb |
}
|
|
|
6a88dfb |
|
|
|
6a88dfb |
#if GTK_CHECK_VERSION(3,0,0)
|
|
|
6a88dfb |
-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
|
|
|
6a88dfb |
+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
|
|
|
6a88dfb |
#else
|
|
|
6a88dfb |
-gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
|
|
|
6a88dfb |
+gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
|
|
|
6a88dfb |
#endif
|
|
|
6a88dfb |
{
|
|
|
6a88dfb |
XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
|
|
|
6a88dfb |
@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
|
|
|
6a88dfb |
pView->draw(&rClip);
|
|
|
6a88dfb |
#endif
|
|
|
6a88dfb |
}
|
|
|
6a88dfb |
- return FALSE;
|
|
|
6a88dfb |
+ return TRUE;
|
|
|
6a88dfb |
}
|
|
|
6a88dfb |
|
|
|
6a88dfb |
static bool bScrollWait = false;
|
|
|
6a88dfb |
diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h
|
|
|
6a88dfb |
index 30ee5d8..a0ff57f 100644
|
|
|
6a88dfb |
--- a/src/af/xap/gtk/xap_UnixFrameImpl.h
|
|
|
6a88dfb |
+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h
|
|
|
6a88dfb |
@@ -152,9 +152,9 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl
|
|
|
6a88dfb |
static gint key_release_event(GtkWidget* w, GdkEventKey* e);
|
|
|
6a88dfb |
static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
|
|
|
6a88dfb |
#if GTK_CHECK_VERSION(3,0,0)
|
|
|
6a88dfb |
- static gint draw(GtkWidget * w, cairo_t * cr);
|
|
|
6a88dfb |
+ static gboolean draw(GtkWidget * w, cairo_t * cr);
|
|
|
6a88dfb |
#else
|
|
|
6a88dfb |
- static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
|
|
|
6a88dfb |
+ static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
|
|
|
6a88dfb |
#endif
|
|
|
6a88dfb |
static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p);
|
|
|
6a88dfb |
static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/);
|