Commit 78ab1ea3 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor
Browse files

Fixed problem with uints resulting in huge child allocations.

Mon Feb  1 15:14:56 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkoptionmenu.c (gtk_option_menu_size_allocate):
	 Fixed problem with uints resulting in huge child
	 allocations.
parent a512f0b8
Mon Feb 1 15:14:56 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_size_allocate):
Fixed problem with uints resulting in huge child
allocations.
Mon Feb 1 14:54:28 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Cast uints
to ints in geometry calculations. This should
prevent FP exceptions on FreeBSD when quantities
become negative. [ Actually, this is probably
a workaround with a gcc bug with handling of
bitfields, according to Ben Jackson <ben@ben.com> ]
to ints in geometry calculations. This should
prevent FP exceptions on FreeBSD when quantities
become negative. [ Actually, this is probably
a workaround with a gcc bug with handling of
bitfields, according to Ben Jackson <ben@ben.com> ]
Mon Feb 1 13:35:14 GMT 1999 Tony Gale <gale@gtk.org>
......
Mon Feb 1 15:14:56 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_size_allocate):
Fixed problem with uints resulting in huge child
allocations.
Mon Feb 1 14:54:28 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Cast uints
to ints in geometry calculations. This should
prevent FP exceptions on FreeBSD when quantities
become negative. [ Actually, this is probably
a workaround with a gcc bug with handling of
bitfields, according to Ben Jackson <ben@ben.com> ]
to ints in geometry calculations. This should
prevent FP exceptions on FreeBSD when quantities
become negative. [ Actually, this is probably
a workaround with a gcc bug with handling of
bitfields, according to Ben Jackson <ben@ben.com> ]
Mon Feb 1 13:35:14 GMT 1999 Tony Gale <gale@gtk.org>
......
Mon Feb 1 15:14:56 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_size_allocate):
Fixed problem with uints resulting in huge child
allocations.
Mon Feb 1 14:54:28 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Cast uints
to ints in geometry calculations. This should
prevent FP exceptions on FreeBSD when quantities
become negative. [ Actually, this is probably
a workaround with a gcc bug with handling of
bitfields, according to Ben Jackson <ben@ben.com> ]
to ints in geometry calculations. This should
prevent FP exceptions on FreeBSD when quantities
become negative. [ Actually, this is probably
a workaround with a gcc bug with handling of
bitfields, according to Ben Jackson <ben@ben.com> ]
Mon Feb 1 13:35:14 GMT 1999 Tony Gale <gale@gtk.org>
......
Mon Feb 1 15:14:56 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_size_allocate):
Fixed problem with uints resulting in huge child
allocations.
Mon Feb 1 14:54:28 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Cast uints
to ints in geometry calculations. This should
prevent FP exceptions on FreeBSD when quantities
become negative. [ Actually, this is probably
a workaround with a gcc bug with handling of
bitfields, according to Ben Jackson <ben@ben.com> ]
to ints in geometry calculations. This should
prevent FP exceptions on FreeBSD when quantities
become negative. [ Actually, this is probably
a workaround with a gcc bug with handling of
bitfields, according to Ben Jackson <ben@ben.com> ]
Mon Feb 1 13:35:14 GMT 1999 Tony Gale <gale@gtk.org>
......
Mon Feb 1 15:14:56 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_size_allocate):
Fixed problem with uints resulting in huge child
allocations.
Mon Feb 1 14:54:28 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Cast uints
to ints in geometry calculations. This should
prevent FP exceptions on FreeBSD when quantities
become negative. [ Actually, this is probably
a workaround with a gcc bug with handling of
bitfields, according to Ben Jackson <ben@ben.com> ]
to ints in geometry calculations. This should
prevent FP exceptions on FreeBSD when quantities
become negative. [ Actually, this is probably
a workaround with a gcc bug with handling of
bitfields, according to Ben Jackson <ben@ben.com> ]
Mon Feb 1 13:35:14 GMT 1999 Tony Gale <gale@gtk.org>
......
Mon Feb 1 15:14:56 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_size_allocate):
Fixed problem with uints resulting in huge child
allocations.
Mon Feb 1 14:54:28 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Cast uints
to ints in geometry calculations. This should
prevent FP exceptions on FreeBSD when quantities
become negative. [ Actually, this is probably
a workaround with a gcc bug with handling of
bitfields, according to Ben Jackson <ben@ben.com> ]
to ints in geometry calculations. This should
prevent FP exceptions on FreeBSD when quantities
become negative. [ Actually, this is probably
a workaround with a gcc bug with handling of
bitfields, according to Ben Jackson <ben@ben.com> ]
Mon Feb 1 13:35:14 GMT 1999 Tony Gale <gale@gtk.org>
......
Mon Feb 1 15:14:56 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkoptionmenu.c (gtk_option_menu_size_allocate):
Fixed problem with uints resulting in huge child
allocations.
Mon Feb 1 14:54:28 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Cast uints
to ints in geometry calculations. This should
prevent FP exceptions on FreeBSD when quantities
become negative. [ Actually, this is probably
a workaround with a gcc bug with handling of
bitfields, according to Ben Jackson <ben@ben.com> ]
to ints in geometry calculations. This should
prevent FP exceptions on FreeBSD when quantities
become negative. [ Actually, this is probably
a workaround with a gcc bug with handling of
bitfields, according to Ben Jackson <ben@ben.com> ]
Mon Feb 1 13:35:14 GMT 1999 Tony Gale <gale@gtk.org>
......
......@@ -307,11 +307,11 @@ gtk_option_menu_size_allocate (GtkWidget *widget,
GTK_WIDGET (widget)->style->klass->xthickness) + 1;
child_allocation.y = (GTK_CONTAINER (widget)->border_width +
GTK_WIDGET (widget)->style->klass->ythickness) + 1;
child_allocation.width = (allocation->width - child_allocation.x * 2 -
OPTION_INDICATOR_WIDTH - OPTION_INDICATOR_SPACING * 5 -
CHILD_LEFT_SPACING - CHILD_RIGHT_SPACING) - 2;
child_allocation.height = (allocation->height - child_allocation.y * 2 -
CHILD_TOP_SPACING - CHILD_BOTTOM_SPACING) - 2;
child_allocation.width = MAX (1, (gint)allocation->width - child_allocation.x * 2 -
OPTION_INDICATOR_WIDTH - OPTION_INDICATOR_SPACING * 5 -
CHILD_LEFT_SPACING - CHILD_RIGHT_SPACING - 2);
child_allocation.height = MAX (1, (gint)allocation->height - child_allocation.y * 2 -
CHILD_TOP_SPACING - CHILD_BOTTOM_SPACING - 2);
child_allocation.x += CHILD_LEFT_SPACING;
child_allocation.y += CHILD_RIGHT_SPACING;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment