Fixed premature exit of helpview sample and utility

[wxWidgets.git] / src / gtk / minifram.cpp

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index da857b0e6e0b487c3ce02d37c0c23a6c376db4d4..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" {
-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
 
-    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);
 
@@ -99,14 +99,15 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
         wxBrush brush( LightContrastColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT) ) );
         dc.SetBrush( brush );
         dc.SetPen( *wxTRANSPARENT_PEN );
-        dc.DrawRectangle( 3, 3, win->m_width - 7, height-2 );
+        dc.DrawRectangle( 3, 3, win->m_width - 7, height );
 
         dc.SetTextForeground( *wxWHITE );
         dc.DrawText( win->GetTitle(), 6, 3 );
 
         if (style & wxCLOSE_BOX)
-            dc.DrawBitmap( win->m_closeButton, win->m_width-19, 3, true );
+            dc.DrawBitmap( win->m_closeButton, win->m_width-19, 2, true );
     }
+    return false;
 }
 }