expose handlers are supposed to return a gboolean;

false may be correct, at least it's not random

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index a373cb8bdf6061c86dfa7148ebdd860b7815e482..7ac91509dc08cf8d29dacd0e8f2e20a52e547935 100644 (file)
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -166,7 +166,7 @@ gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static void
+static gboolean

 gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxGLCanvas *win )
 {
     // don't need to install idle handler, its done from "event" signal
 gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxGLCanvas *win )
 {
     // don't need to install idle handler, its done from "event" signal


@@ -177,6 +177,7 @@ gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_e
                                   gdk_event->area.y,
                                   gdk_event->area.width,
                                   gdk_event->area.height );
                                   gdk_event->area.y,
                                   gdk_event->area.width,
                                   gdk_event->area.height );

+    return false;

 }
 }
 
 }
 }
 

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 9eda58cc16ec22a2441cf136c2dd22b7b088ddd6..6a99ba396be546204d01a05794dfb996ffe2e583 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -58,12 +58,12 @@ static wxColor LightContrastColour(const wxColour& c)
 }
 
 extern "C" {
 }
 
 extern "C" {

-static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxMiniFrame *win )
+static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose* gdk_event, wxMiniFrame* win)

 {
     // don't need to install idle handler, its done from "event" signal
 
 {
     // don't need to install idle handler, its done from "event" signal
 

-    if (!win->m_hasVMT) return;
-    if (gdk_event->count > 0) return;
+    if (!win->m_hasVMT || gdk_event->count > 0)
+        return false;

 
     GtkPizza *pizza = GTK_PIZZA(widget);
 
 
     GtkPizza *pizza = GTK_PIZZA(widget);
 


@@ -107,6 +107,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
         if (style & wxCLOSE_BOX)
             dc.DrawBitmap( win->m_closeButton, win->m_width-19, 2, true );
     }
         if (style & wxCLOSE_BOX)
             dc.DrawBitmap( win->m_closeButton, win->m_width-19, 2, true );
     }

+    return false;

 }
 }
 
 }
 }