Commit a3ee7a94 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

An old allocation error.

Sun Apr 12 22:43:22 1998  Owen Taylor  <owt1@cornell.edu>

	* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate):
	An old allocation error.

	* gtk/gtkviewport.c (gtk_viewport_add): Don't map
	when adding a not-VISIBLE widget to a VISIBLE
	viewport.
parent 92006c8e
Sun Apr 12 22:43:22 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate):
An old allocation error.
* gtk/gtkviewport.c (gtk_viewport_add): Don't map
when adding a not-VISIBLE widget to a VISIBLE
viewport.
Sun Apr 12 18:54:29 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
* Changed LGPL address for FSF in all .h and .c files
......
Sun Apr 12 22:43:22 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate):
An old allocation error.
* gtk/gtkviewport.c (gtk_viewport_add): Don't map
when adding a not-VISIBLE widget to a VISIBLE
viewport.
Sun Apr 12 18:54:29 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
* Changed LGPL address for FSF in all .h and .c files
......
Sun Apr 12 22:43:22 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate):
An old allocation error.
* gtk/gtkviewport.c (gtk_viewport_add): Don't map
when adding a not-VISIBLE widget to a VISIBLE
viewport.
Sun Apr 12 18:54:29 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
* Changed LGPL address for FSF in all .h and .c files
......
Sun Apr 12 22:43:22 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate):
An old allocation error.
* gtk/gtkviewport.c (gtk_viewport_add): Don't map
when adding a not-VISIBLE widget to a VISIBLE
viewport.
Sun Apr 12 18:54:29 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
* Changed LGPL address for FSF in all .h and .c files
......
Sun Apr 12 22:43:22 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate):
An old allocation error.
* gtk/gtkviewport.c (gtk_viewport_add): Don't map
when adding a not-VISIBLE widget to a VISIBLE
viewport.
Sun Apr 12 18:54:29 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
* Changed LGPL address for FSF in all .h and .c files
......
Sun Apr 12 22:43:22 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate):
An old allocation error.
* gtk/gtkviewport.c (gtk_viewport_add): Don't map
when adding a not-VISIBLE widget to a VISIBLE
viewport.
Sun Apr 12 18:54:29 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
* Changed LGPL address for FSF in all .h and .c files
......
Sun Apr 12 22:43:22 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate):
An old allocation error.
* gtk/gtkviewport.c (gtk_viewport_add): Don't map
when adding a not-VISIBLE widget to a VISIBLE
viewport.
Sun Apr 12 18:54:29 PDT 1998 Shawn T. Amundson <amundson@gtk.org>
* Changed LGPL address for FSF in all .h and .c files
......
......@@ -395,7 +395,8 @@ gtk_menu_item_size_allocate (GtkWidget *widget,
child_allocation.x = (GTK_CONTAINER (widget)->border_width +
widget->style->klass->xthickness +
BORDER_SPACING);
child_allocation.y = GTK_CONTAINER (widget)->border_width;
child_allocation.y = (GTK_CONTAINER (widget)->border_width +
widget->style->klass->ythickness);
child_allocation.width = MAX (1, allocation->width - child_allocation.x * 2);
child_allocation.height = MAX (1, allocation->height - child_allocation.y * 2);
child_allocation.x += GTK_MENU_ITEM (widget)->toggle_size;
......
......@@ -481,7 +481,7 @@ gtk_viewport_add (GtkContainer *container,
{
gtk_widget_set_parent (widget, GTK_WIDGET (container));
gtk_widget_set_parent_window (widget, GTK_VIEWPORT (container)->bin_window);
if (GTK_WIDGET_VISIBLE (widget->parent))
if (GTK_WIDGET_VISIBLE (widget))
{
if (GTK_WIDGET_MAPPED (widget->parent) &&
!GTK_WIDGET_MAPPED (widget))
......
Markdown is supported
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