From: Paul Cornett <paulcor@bullseye.com>
Date: Sun, 15 Oct 2006 19:59:31 +0000 (+0000)
Subject: remove gtk_pizza_expose, its purpose is easily accomplished from existing expose... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e47c778924ef4f0456edd5912cf7a2131ecb634f

remove gtk_pizza_expose, its purpose is easily accomplished from existing expose-event handler in window.cpp


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

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 0457c7ac9e..232fb54653 100644
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -40,8 +40,6 @@ static void gtk_pizza_size_request  (GtkWidget        *widget,
                                      GtkRequisition   *requisition);
 static void gtk_pizza_size_allocate (GtkWidget        *widget,
                                      GtkAllocation    *allocation);
-static gint gtk_pizza_expose        (GtkWidget        *widget,
-                                     GdkEventExpose   *event);
 static void gtk_pizza_style_set     (GtkWidget *widget,
                                      GtkStyle  *previous_style);
 static void gtk_pizza_add           (GtkContainer     *container,
@@ -148,7 +146,6 @@ gtk_pizza_class_init (GtkPizzaClass *klass)
     widget_class->unrealize = gtk_pizza_unrealize;
     widget_class->size_request = gtk_pizza_size_request;
     widget_class->size_allocate = gtk_pizza_size_allocate;
-    widget_class->expose_event = gtk_pizza_expose;
     widget_class->style_set = gtk_pizza_style_set;
 
     container_class->add = gtk_pizza_add;
@@ -563,26 +560,6 @@ gtk_pizza_size_allocate (GtkWidget     *widget,
     }
 }
 
-static gint
-gtk_pizza_expose (GtkWidget      *widget,
-                  GdkEventExpose *event)
-{
-    GtkPizza *pizza;
-
-    g_return_val_if_fail (widget != NULL, FALSE);
-    g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE);
-    g_return_val_if_fail (event != NULL, FALSE);
-
-    pizza = (GtkPizza*)widget;
-
-    if (event->window != pizza->bin_window)
-        return FALSE;
-
-    pizza_parent_class->expose_event(widget, event);
-
-    return FALSE;
-}
-
 static void
 gtk_pizza_style_set(GtkWidget *widget, GtkStyle  *previous_style)
 {
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 8ef873305d..f2022e177e 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -465,7 +465,12 @@ gtk_window_expose_callback( GtkWidget *widget,
     // time anymore.
 
     GtkPizza *pizza = GTK_PIZZA( widget );
-    if (gdk_event->window != pizza->bin_window) return FALSE;
+    if (gdk_event->window != pizza->bin_window)
+    {
+        // block expose events on GTK_WIDGET(pizza)->window,
+        //   all drawing is done on pizza->bin_window
+        return true;
+    }
 
 
 #if 0