Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-10-15 19:59:31 +00:00
parent e60022505d
commit e47c778924
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gtk/win_gtk.c
View File

@@ -40,8 +40,6 @@ static void gtk_pizza_size_request (GtkWidget *widget,
GtkRequisition *requisition); GtkRequisition *requisition);
static void gtk_pizza_size_allocate (GtkWidget *widget, static void gtk_pizza_size_allocate (GtkWidget *widget,
GtkAllocation *allocation); GtkAllocation *allocation);
static gint gtk_pizza_expose (GtkWidget *widget,
GdkEventExpose *event);
static void gtk_pizza_style_set (GtkWidget *widget, static void gtk_pizza_style_set (GtkWidget *widget,
GtkStyle *previous_style); GtkStyle *previous_style);
static void gtk_pizza_add (GtkContainer *container, 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->unrealize = gtk_pizza_unrealize;
widget_class->size_request = gtk_pizza_size_request; widget_class->size_request = gtk_pizza_size_request;
widget_class->size_allocate = gtk_pizza_size_allocate; widget_class->size_allocate = gtk_pizza_size_allocate;
widget_class->expose_event = gtk_pizza_expose;
widget_class->style_set = gtk_pizza_style_set; widget_class->style_set = gtk_pizza_style_set;
container_class->add = gtk_pizza_add; 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 static void
gtk_pizza_style_set(GtkWidget *widget, GtkStyle *previous_style) gtk_pizza_style_set(GtkWidget *widget, GtkStyle *previous_style)
{ {

7
src/gtk/window.cpp
View File

@@ -465,7 +465,12 @@ gtk_window_expose_callback( GtkWidget *widget,
// time anymore. // time anymore.
GtkPizza *pizza = GTK_PIZZA( widget ); 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 #if 0