callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't search entire row list twice for element being removed.

Browse Source 
* gtk/gtkclist.c (real_remove_row):
        Don't search entire row list twice for element being removed.

        * gtk/gtkmenushell.c (gtk_menu_shell_insert):
        Replaced hand-coded implementation of g_list_insert with
        call to g_list_insert.

        * gtk/gtktooltips.c
          (gtk_tooltips_destroy_data, gtk_tooltips_layout_text):
        tooltipsdata->row test not-null test now properly encompasses
        both g_list_* calls.
This commit is contained in:
Jeff Garzik
1999-01-21 03:46:32 +00:00
parent 1a58d9b3cf
commit a646da3f1e
10 changed files with 111 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkmenushell.c
View File

@ -296,10 +296,6 @@ gtk_menu_shell_insert (GtkMenuShell *menu_shell,
GtkWidget *child,
gint position)
{
GList *tmp_list;
GList *new_list;
gint nchildren;
g_return_if_fail (menu_shell != NULL);
g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell));
g_return_if_fail (child != NULL);
@ -318,29 +314,7 @@ gtk_menu_shell_insert (GtkMenuShell *menu_shell,
gtk_widget_map (child);
}
nchildren = g_list_length (menu_shell->children);
if ((position < 0) || (position > nchildren))
position = nchildren;
if (position == nchildren)
{
menu_shell->children = g_list_append (menu_shell->children, child);
}
else
{
tmp_list = g_list_nth (menu_shell->children, position);
new_list = g_list_alloc ();
new_list->data = child;
if (tmp_list->prev)
tmp_list->prev->next = new_list;
new_list->next = tmp_list;
new_list->prev = tmp_list->prev;
tmp_list->prev = new_list;
if (tmp_list == menu_shell->children)
menu_shell->children = new_list;
}
menu_shell->children = g_list_insert (menu_shell->children, child, position);
if (GTK_WIDGET_VISIBLE (menu_shell))
gtk_widget_queue_resize (GTK_WIDGET (menu_shell));