|
Bernhard M. Wiedemann |
2d3900 |
Index: abiword-3.0.2/src/af/xap/gtk/xap_UnixFrameImpl.cpp
|
|
Bernhard M. Wiedemann |
2d3900 |
===================================================================
|
|
Bernhard M. Wiedemann |
2d3900 |
--- src/af/xap/gtk/xap_UnixFrameImpl.cpp
|
|
Bernhard M. Wiedemann |
2d3900 |
+++ src/af/xap/gtk/xap_UnixFrameImpl.cpp
|
|
Bernhard M. Wiedemann |
2d3900 |
@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_even
|
|
Bernhard M. Wiedemann |
2d3900 |
}
|
|
Bernhard M. Wiedemann |
2d3900 |
|
|
Bernhard M. Wiedemann |
2d3900 |
#if GTK_CHECK_VERSION(3,0,0)
|
|
Bernhard M. Wiedemann |
2d3900 |
-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
|
|
Bernhard M. Wiedemann |
2d3900 |
+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
|
|
Bernhard M. Wiedemann |
2d3900 |
#else
|
|
Bernhard M. Wiedemann |
2d3900 |
-gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
|
|
Bernhard M. Wiedemann |
2d3900 |
+gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
|
|
Bernhard M. Wiedemann |
2d3900 |
#endif
|
|
Bernhard M. Wiedemann |
2d3900 |
{
|
|
Bernhard M. Wiedemann |
2d3900 |
XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
|
|
Bernhard M. Wiedemann |
2d3900 |
@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkW
|
|
Bernhard M. Wiedemann |
2d3900 |
pView->draw(&rClip);
|
|
Bernhard M. Wiedemann |
2d3900 |
#endif
|
|
Bernhard M. Wiedemann |
2d3900 |
}
|
|
Bernhard M. Wiedemann |
2d3900 |
- return FALSE;
|
|
Bernhard M. Wiedemann |
2d3900 |
+ return TRUE;
|
|
Bernhard M. Wiedemann |
2d3900 |
}
|
|
Bernhard M. Wiedemann |
2d3900 |
|
|
Bernhard M. Wiedemann |
2d3900 |
static bool bScrollWait = false;
|
|
Bernhard M. Wiedemann |
2d3900 |
Index: abiword-3.0.2/src/af/xap/gtk/xap_UnixFrameImpl.h
|
|
Bernhard M. Wiedemann |
2d3900 |
===================================================================
|
|
Bernhard M. Wiedemann |
2d3900 |
--- src/af/xap/gtk/xap_UnixFrameImpl.h
|
|
Bernhard M. Wiedemann |
2d3900 |
+++ src/af/xap/gtk/xap_UnixFrameImpl.h
|
|
Bernhard M. Wiedemann |
2d3900 |
@@ -152,9 +152,9 @@ protected:
|
|
Bernhard M. Wiedemann |
2d3900 |
static gint key_release_event(GtkWidget* w, GdkEventKey* e);
|
|
Bernhard M. Wiedemann |
2d3900 |
static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
|
|
Bernhard M. Wiedemann |
2d3900 |
#if GTK_CHECK_VERSION(3,0,0)
|
|
Bernhard M. Wiedemann |
2d3900 |
- static gint draw(GtkWidget * w, cairo_t * cr);
|
|
Bernhard M. Wiedemann |
2d3900 |
+ static gboolean draw(GtkWidget * w, cairo_t * cr);
|
|
Bernhard M. Wiedemann |
2d3900 |
#else
|
|
Bernhard M. Wiedemann |
2d3900 |
- static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
|
|
Bernhard M. Wiedemann |
2d3900 |
+ static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
|
|
Bernhard M. Wiedemann |
2d3900 |
#endif
|
|
Bernhard M. Wiedemann |
2d3900 |
static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p);
|
|
Bernhard M. Wiedemann |
2d3900 |
static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/);
|