diff options
| author | Anders Carlsson <andersca@src.gnome.org> | 2000-12-02 18:05:34 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@src.gnome.org> | 2000-12-02 18:05:34 +0000 |
| commit | b18bb07b2d825d3788ab30f955a2fe2c6ad2915a (patch) | |
| tree | 386563137b80e62a4fdb49931f9dd03a748a0abf /gtk/gtktogglebutton.c | |
| parent | 35876710dc133b5cab14241174ba0e680ca854af (diff) | |
| download | gtk+-b18bb07b2d825d3788ab30f955a2fe2c6ad2915a.tar.gz | |
Commit GtkToggleButton fix to HEAD too.
Diffstat (limited to 'gtk/gtktogglebutton.c')
| -rw-r--r-- | gtk/gtktogglebutton.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c index 5b70c7e04d..951c3ee65c 100644 --- a/gtk/gtktogglebutton.c +++ b/gtk/gtktogglebutton.c @@ -401,11 +401,22 @@ static gint gtk_toggle_button_expose (GtkWidget *widget, GdkEventExpose *event) { - if (!GTK_WIDGET_NO_WINDOW (widget) && - GTK_WIDGET_CLASS (parent_class)->expose_event) - return GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event); - else - return FALSE; + GtkBin *bin; + GdkEventExpose child_event; + + if (GTK_WIDGET_DRAWABLE (widget)) + { + bin = GTK_BIN (widget); + + gtk_toggle_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); + } + + return TRUE; } static void |