diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-01-08 19:21:55 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-01-08 19:21:55 +0000 |
| commit | 07d4e54cc6f32421aae976bd797a9dd9943e0ada (patch) | |
| tree | 1897dc56fb846aff429006e2f380cb84a35143a3 /gtk/gtkcheckbutton.c | |
| parent | b24d44e421ed429bec40de42650b26c4ba82fbf2 (diff) | |
| download | gtk+-07d4e54cc6f32421aae976bd797a9dd9943e0ada.tar.gz | |
Fix problem where child->requisition was accessed directly instead of
Tue Jan 8 14:19:43 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcheckbutton.c (gtk_check_button_size_allocate):
Fix problem where child->requisition was accessed
directly instead of calling get_child_requisition()
(#68199, Damon Chaplin)
Diffstat (limited to 'gtk/gtkcheckbutton.c')
| -rw-r--r-- | gtk/gtkcheckbutton.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index d124836328..9f6f76fcea 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -299,14 +299,17 @@ gtk_check_button_size_allocate (GtkWidget *widget, if (GTK_BIN (button)->child && GTK_WIDGET_VISIBLE (GTK_BIN (button)->child)) { + GtkRequisition child_requisition; gint border_width = GTK_CONTAINER (widget)->border_width; + + gtk_widget_get_child_requisition (GTK_BIN (button)->child, &child_requisition); - child_allocation.width = MIN (GTK_BIN (button)->child->requisition.width, + child_allocation.width = MIN (child_requisition.width, allocation->width - ((border_width + focus_width + focus_pad) * 2 + indicator_size + indicator_spacing * 3)); - child_allocation.height = MIN (GTK_BIN (button)->child->requisition.height, + child_allocation.height = MIN (child_requisition.height, allocation->height - (border_width + focus_width + focus_pad) * 2); child_allocation.x = (border_width + indicator_size + indicator_spacing * 3 + widget->allocation.x + focus_width + focus_pad); |