AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-05 16:20:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix problem where child->requisition was accessed directly instead of

Browse Source 
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)
This commit is contained in:
Owen Taylor 2002-01-08 19:21:55 +00:00 committed by Owen Taylor
parent b24d44e421
commit 07d4e54cc6
8 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
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)
2001-01-08 James Henstridge <james@daa.com.au>
* gtk/gtkstyle.c: add trailing */ on doc comment.

7
ChangeLog.pre-2-0
View File

@ -1,3 +1,10 @@
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)
2001-01-08 James Henstridge <james@daa.com.au>
* gtk/gtkstyle.c: add trailing */ on doc comment.

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
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)
2001-01-08 James Henstridge <james@daa.com.au>
* gtk/gtkstyle.c: add trailing */ on doc comment.

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
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)
2001-01-08 James Henstridge <james@daa.com.au>
* gtk/gtkstyle.c: add trailing */ on doc comment.

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
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)
2001-01-08 James Henstridge <james@daa.com.au>
* gtk/gtkstyle.c: add trailing */ on doc comment.

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
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)
2001-01-08 James Henstridge <james@daa.com.au>
* gtk/gtkstyle.c: add trailing */ on doc comment.

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
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)
2001-01-08 James Henstridge <james@daa.com.au>
* gtk/gtkstyle.c: add trailing */ on doc comment.

7
gtk/gtkcheckbutton.c
View File

@ -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);