diff options
| author | Matthias Clasen <maclas@gmx.de> | 2004-01-22 20:45:36 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-01-22 20:45:36 +0000 |
| commit | d49500e4b766db74417443c7c79f4875e0ed01ec (patch) | |
| tree | 9dc706ce3b1582a2ca3b9ae38bc4364e7c0e87fc /gtk | |
| parent | fa4e057e98701768aae41df1f837a16a17861fd7 (diff) | |
| download | gdk-pixbuf-d49500e4b766db74417443c7c79f4875e0ed01ec.tar.gz | |
Remove the attach info after calling gtk_menu_do_remove(), since that
Thu Jan 22 21:45:24 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkmenu.c (gtk_menu_remove): Remove the attach
info after calling gtk_menu_do_remove(), since that function
uses the attach info. Doh!
* gtk/gtkmenu.c (gtk_menu_do_remove): Don't check priv->columns
for being 1 directly after setting it to 0.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkmenu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 850b03d33..9e5049af5 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -941,10 +941,12 @@ gtk_menu_do_remove (GtkMenuShell *menu_shell, GList *children; GtkMenuPrivate *priv; gint delta; + gboolean single_column; ai = get_attach_info (G_OBJECT (child)); priv = gtk_menu_get_private (GTK_MENU (menu_shell)); delta = ai->bottom_attach - ai->top_attach; + single_column = priv->columns == 1; /* recalculate these, assuming the child has already been removed */ priv->rows = 0; @@ -955,7 +957,7 @@ gtk_menu_do_remove (GtkMenuShell *menu_shell, AttachInfo *child_ai = get_attach_info (children->data); /* Do not move items in table menus */ - if (priv->columns == 1 && child_ai->bottom_attach > ai->bottom_attach) + if (single_column && child_ai->bottom_attach > ai->bottom_attach) gtk_container_child_set (GTK_CONTAINER (menu_shell), children->data, "top_attach", child_ai->top_attach - delta, "bottom_attach", child_ai->bottom_attach - delta, @@ -987,10 +989,9 @@ gtk_menu_remove (GtkContainer *container, menu->old_active_menu_item = NULL; } - g_object_set_data (G_OBJECT (widget), ATTACH_INFO_KEY, NULL); - GTK_CONTAINER_CLASS (parent_class)->remove (container, widget); gtk_menu_do_remove (GTK_MENU_SHELL (container), widget); + g_object_set_data (G_OBJECT (widget), ATTACH_INFO_KEY, NULL); } |