Commit aca1b6f3 authored by Soeren Sandmann's avatar Soeren Sandmann Committed by Søren Sandmann Pedersen

Make it work even when item 0 is a placeholder. (#125826) add an assertion

Thu Oct 30 17:57:53 2003  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktoolbar.c (logical_to_physical): Make it work even when
	item 0 is a placeholder. (#125826)
	* tests/testtoolbar.c: add an assertion that
	gtk_toolbar_get_nth_item (0) != NULL
parent 34264601
Thu Oct 30 17:57:53 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (logical_to_physical): Make it work even when
item 0 is a placeholder. (#125826)
* tests/testtoolbar.c: add an assertion that
gtk_toolbar_get_nth_item (0) != NULL
Thu Oct 30 17:40:26 2003 Soeren Sandmann <sandmann@daimi.au.dk> Thu Oct 30 17:40:26 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (logical_to_physical): Make it work for * gtk/gtktoolbar.c (logical_to_physical): Make it work for
logical == 0. logical == 0.(#125826)
Thu Oct 30 16:20:58 2003 Soeren Sandmann <sandmann@daimi.au.dk> Thu Oct 30 16:20:58 2003 Soeren Sandmann <sandmann@daimi.au.dk>
......
Thu Oct 30 17:57:53 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (logical_to_physical): Make it work even when
item 0 is a placeholder. (#125826)
* tests/testtoolbar.c: add an assertion that
gtk_toolbar_get_nth_item (0) != NULL
Thu Oct 30 17:40:26 2003 Soeren Sandmann <sandmann@daimi.au.dk> Thu Oct 30 17:40:26 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (logical_to_physical): Make it work for * gtk/gtktoolbar.c (logical_to_physical): Make it work for
logical == 0. logical == 0.(#125826)
Thu Oct 30 16:20:58 2003 Soeren Sandmann <sandmann@daimi.au.dk> Thu Oct 30 16:20:58 2003 Soeren Sandmann <sandmann@daimi.au.dk>
......
Thu Oct 30 17:57:53 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (logical_to_physical): Make it work even when
item 0 is a placeholder. (#125826)
* tests/testtoolbar.c: add an assertion that
gtk_toolbar_get_nth_item (0) != NULL
Thu Oct 30 17:40:26 2003 Soeren Sandmann <sandmann@daimi.au.dk> Thu Oct 30 17:40:26 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (logical_to_physical): Make it work for * gtk/gtktoolbar.c (logical_to_physical): Make it work for
logical == 0. logical == 0.(#125826)
Thu Oct 30 16:20:58 2003 Soeren Sandmann <sandmann@daimi.au.dk> Thu Oct 30 16:20:58 2003 Soeren Sandmann <sandmann@daimi.au.dk>
......
Thu Oct 30 17:57:53 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (logical_to_physical): Make it work even when
item 0 is a placeholder. (#125826)
* tests/testtoolbar.c: add an assertion that
gtk_toolbar_get_nth_item (0) != NULL
Thu Oct 30 17:40:26 2003 Soeren Sandmann <sandmann@daimi.au.dk> Thu Oct 30 17:40:26 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (logical_to_physical): Make it work for * gtk/gtktoolbar.c (logical_to_physical): Make it work for
logical == 0. logical == 0.(#125826)
Thu Oct 30 16:20:58 2003 Soeren Sandmann <sandmann@daimi.au.dk> Thu Oct 30 16:20:58 2003 Soeren Sandmann <sandmann@daimi.au.dk>
......
Thu Oct 30 17:57:53 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (logical_to_physical): Make it work even when
item 0 is a placeholder. (#125826)
* tests/testtoolbar.c: add an assertion that
gtk_toolbar_get_nth_item (0) != NULL
Thu Oct 30 17:40:26 2003 Soeren Sandmann <sandmann@daimi.au.dk> Thu Oct 30 17:40:26 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (logical_to_physical): Make it work for * gtk/gtktoolbar.c (logical_to_physical): Make it work for
logical == 0. logical == 0.(#125826)
Thu Oct 30 16:20:58 2003 Soeren Sandmann <sandmann@daimi.au.dk> Thu Oct 30 16:20:58 2003 Soeren Sandmann <sandmann@daimi.au.dk>
......
...@@ -1797,19 +1797,22 @@ logical_to_physical (GtkToolbar *toolbar, gint logical) ...@@ -1797,19 +1797,22 @@ logical_to_physical (GtkToolbar *toolbar, gint logical)
g_assert (logical >= 0); g_assert (logical >= 0);
physical = 0; physical = 0;
for (list = priv->content; list && logical > 0; list = list->next) for (list = priv->content; list; list = list->next)
{ {
ToolbarContent *content = list->data; ToolbarContent *content = list->data;
if (!content->is_placeholder) if (!content->is_placeholder)
logical--; {
if (logical == 0)
break;
logical--;
}
physical++; physical++;
if (!content->is_placeholder && logical == 0)
break;
} }
g_assert (logical == 0); g_assert (logical == 0);
return physical; return physical;
} }
......
...@@ -625,12 +625,14 @@ main (gint argc, gchar **argv) ...@@ -625,12 +625,14 @@ main (gint argc, gchar **argv)
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
gtk_tool_item_set_expand (item, TRUE); gtk_tool_item_set_expand (item, TRUE);
gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (item), FALSE); gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (item), FALSE);
g_assert (gtk_toolbar_get_nth_item (toolbar, 0) != 0);
item = gtk_radio_tool_button_new_from_stock (NULL, GTK_STOCK_JUSTIFY_LEFT); item = gtk_radio_tool_button_new_from_stock (NULL, GTK_STOCK_JUSTIFY_LEFT);
group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (item)); group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (item));
add_item_to_list (store, item, "Left"); add_item_to_list (store, item, "Left");
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
item = gtk_radio_tool_button_new_from_stock (group, GTK_STOCK_JUSTIFY_CENTER); item = gtk_radio_tool_button_new_from_stock (group, GTK_STOCK_JUSTIFY_CENTER);
#if 0 #if 0
make_prop_editor (G_OBJECT (item)); make_prop_editor (G_OBJECT (item));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment