diff options
| author | Tim Janik <timj@gtk.org> | 1998-07-07 01:25:27 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-07-07 01:25:27 +0000 |
| commit | 88fba9f84531a3c38b9ad6dbc9820288cb8b6094 (patch) | |
| tree | d2910e65e110f05e85f21a85f76a318ec8e4ac0b /gtk/gtkcheckbutton.c | |
| parent | da0930717e5ecc4d535e857dc70035aa8990635d (diff) | |
| download | gtk+-88fba9f84531a3c38b9ad6dbc9820288cb8b6094.tar.gz | |
totaly binary incomnpatible change:
Mon Jul 6 18:30:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkbutton.h:
* gtk/gtkbutton.c: GtkButtons are now derived from GtkBin. we mirror
GTK_BIN (button)->child to button->child to keep source compatibility.
* gtk/gtkoptionmenu.c:
* gtk/gtkclist.c:
* gtkcheckbutton.c: don't refer to button->child, but
GTK_BIN (button)->child instead.
Diffstat (limited to 'gtk/gtkcheckbutton.c')
| -rw-r--r-- | gtk/gtkcheckbutton.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index 38bc73b824..8b863a8b80 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -141,9 +141,9 @@ gtk_check_button_draw (GtkWidget *widget, gtk_check_button_draw_indicator (check_button, area); - if (button->child && GTK_WIDGET_NO_WINDOW (button->child) && - gtk_widget_intersect (button->child, area, &child_area)) - gtk_widget_draw (button->child, &child_area); + if (GTK_BIN (button)->child && GTK_WIDGET_NO_WINDOW (GTK_BIN (button)->child) && + gtk_widget_intersect (GTK_BIN (button)->child, area, &child_area)) + gtk_widget_draw (GTK_BIN (button)->child, &child_area); gtk_widget_draw_focus (widget); } @@ -245,7 +245,7 @@ gtk_check_button_size_allocate (GtkWidget *widget, button = GTK_BUTTON (widget); - if (button->child && GTK_WIDGET_VISIBLE (button->child)) + if (GTK_BIN (button)->child && GTK_WIDGET_VISIBLE (GTK_BIN (button)->child)) { child_allocation.x = (GTK_CONTAINER (widget)->border_width + CHECK_BUTTON_CLASS (widget)->indicator_size + @@ -255,7 +255,7 @@ gtk_check_button_size_allocate (GtkWidget *widget, GTK_CONTAINER (widget)->border_width - 1); child_allocation.height = MAX (1, allocation->height - child_allocation.y * 2); - gtk_widget_size_allocate (button->child, &child_allocation); + gtk_widget_size_allocate (GTK_BIN (button)->child, &child_allocation); } } else @@ -288,9 +288,9 @@ gtk_check_button_expose (GtkWidget *widget, gtk_check_button_draw_indicator (check_button, &event->area); child_event = *event; - if (button->child && GTK_WIDGET_NO_WINDOW (button->child) && - gtk_widget_intersect (button->child, &event->area, &child_event.area)) - gtk_widget_event (button->child, (GdkEvent*) &child_event); + if (GTK_BIN (button)->child && GTK_WIDGET_NO_WINDOW (GTK_BIN (button)->child) && + gtk_widget_intersect (GTK_BIN (button)->child, &event->area, &child_event.area)) + gtk_widget_event (GTK_BIN (button)->child, (GdkEvent*) &child_event); gtk_widget_draw_focus (widget); } |