AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove the attach info after calling gtk_menu_do_remove(), since that

Browse Source 
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.
This commit is contained in:
Matthias Clasen 2004-01-22 20:45:36 +00:00 committed by Matthias Clasen
parent fa4e057e98
commit d49500e4b7
6 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
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.
Thu Jan 22 21:38:52 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* NEWS: Updates

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
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.
Thu Jan 22 21:38:52 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* NEWS: Updates

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
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.
Thu Jan 22 21:38:52 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* NEWS: Updates

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
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.
Thu Jan 22 21:38:52 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* NEWS: Updates

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
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.
Thu Jan 22 21:38:52 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* NEWS: Updates

7
gtk/gtkmenu.c
View File

@ -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);
}