diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 9 | ||||
| -rw-r--r-- | gtk/gtkmenuitem.c | 3 | ||||
| -rw-r--r-- | gtk/gtkviewport.c | 2 |
9 files changed, 66 insertions, 2 deletions
@@ -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> * Changed LGPL address for FSF in all .h and .c files diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 966cbab03..d7a93c059 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -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> * Changed LGPL address for FSF in all .h and .c files diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 966cbab03..d7a93c059 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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> * Changed LGPL address for FSF in all .h and .c files diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 966cbab03..d7a93c059 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -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> * Changed LGPL address for FSF in all .h and .c files diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 966cbab03..d7a93c059 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -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> * Changed LGPL address for FSF in all .h and .c files diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 966cbab03..d7a93c059 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -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> * Changed LGPL address for FSF in all .h and .c files diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 966cbab03..d7a93c059 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -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> * Changed LGPL address for FSF in all .h and .c files diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index a71c488fb..db08dc345 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -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; diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index a8029efe2..bbfd69eb8 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -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)) |