AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 05:50:10 +00:00
Code Issues Projects Releases Wiki Activity

An old allocation error.

Browse Source 
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.
This commit is contained in:
Owen Taylor 1998-04-13 02:45:25 +00:00 committed by Owen Taylor
parent 92006c8e78
commit a3ee7a9416
9 changed files with 66 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
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> 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 * Changed LGPL address for FSF in all .h and .c files

9
ChangeLog.pre-2-0
View File

@ -1,3 +1,12 @@
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> 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 * Changed LGPL address for FSF in all .h and .c files

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
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> 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 * Changed LGPL address for FSF in all .h and .c files

9
ChangeLog.pre-2-2
View File

@ -1,3 +1,12 @@
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> 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 * Changed LGPL address for FSF in all .h and .c files

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
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> 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 * Changed LGPL address for FSF in all .h and .c files

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
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> 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 * Changed LGPL address for FSF in all .h and .c files

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
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> 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 * Changed LGPL address for FSF in all .h and .c files

3
gtk/gtkmenuitem.c
View File

@ -395,7 +395,8 @@ gtk_menu_item_size_allocate (GtkWidget *widget,
child_allocation.x = (GTK_CONTAINER (widget)->border_width + child_allocation.x = (GTK_CONTAINER (widget)->border_width +
widget->style->klass->xthickness + widget->style->klass->xthickness +
BORDER_SPACING); 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.width = MAX (1, allocation->width - child_allocation.x * 2);
child_allocation.height = MAX (1, allocation->height - child_allocation.y * 2); child_allocation.height = MAX (1, allocation->height - child_allocation.y * 2);
child_allocation.x += GTK_MENU_ITEM (widget)->toggle_size; child_allocation.x += GTK_MENU_ITEM (widget)->toggle_size;

2
gtk/gtkviewport.c
View File

@ -481,7 +481,7 @@ gtk_viewport_add (GtkContainer *container,
{ {
gtk_widget_set_parent (widget, GTK_WIDGET (container)); gtk_widget_set_parent (widget, GTK_WIDGET (container));
gtk_widget_set_parent_window (widget, GTK_VIEWPORT (container)->bin_window); 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) && if (GTK_WIDGET_MAPPED (widget->parent) &&
!GTK_WIDGET_MAPPED (widget)) !GTK_WIDGET_MAPPED (widget))