diff options
Diffstat (limited to 'gtk/gtkbutton.c')
| -rw-r--r-- | gtk/gtkbutton.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index ecdd7b5a0e..6b8d1f6a14 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -142,9 +142,8 @@ gtk_button_class_init (GtkButtonClass *klass) object_class = (GtkObjectClass*) klass; widget_class = (GtkWidgetClass*) klass; container_class = (GtkContainerClass*) klass; - - parent_class = gtk_type_class (GTK_TYPE_BIN); - + + parent_class = g_type_class_peek_parent (klass); object_class->set_arg = gtk_button_set_arg; object_class->get_arg = gtk_button_get_arg; @@ -715,7 +714,6 @@ gtk_button_expose (GtkWidget *widget, GdkEventExpose *event) { GtkBin *bin; - GdkEventExpose child_event; g_return_val_if_fail (widget != NULL, FALSE); g_return_val_if_fail (GTK_IS_BUTTON (widget), FALSE); @@ -726,13 +724,10 @@ gtk_button_expose (GtkWidget *widget, bin = GTK_BIN (widget); gtk_button_paint (widget, &event->area); - - child_event = *event; - if (bin->child && GTK_WIDGET_NO_WINDOW (bin->child) && - gtk_widget_intersect (bin->child, &event->area, &child_event.area)) - gtk_widget_event (bin->child, (GdkEvent*) &child_event); + + (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event); } - + return FALSE; } |