static void
add_random (GtkToolbar *toolbar, gint n)
{
+ gint n_items;
gint position;
gchar *label = g_strdup_printf ("Button %d", n);
g_free (label);
gtk_widget_show_all (GTK_WIDGET (toolitem));
- if (g_list_length (toolbar->children) == 0)
+ n_items = gtk_toolbar_get_n_items (toolbar);
+ if (n_items == 0)
position = 0;
else
- position = g_random_int_range (0, g_list_length (toolbar->children));
+ position = g_random_int_range (0, n_items);
gtk_toolbar_insert (toolbar, toolitem, position);
}
static void
remove_random (GtkToolbar *toolbar)
{
- GtkWidget *child;
+ GtkToolItem *tool_item;
+ gint n_items;
gint position;
- if (!toolbar->children)
+ n_items = gtk_toolbar_get_n_items (toolbar);
+
+ if (n_items == 0)
return;
- position = g_random_int_range (0, g_list_length (toolbar->children));
+ position = g_random_int_range (0, n_items);
- child = g_list_nth_data (toolbar->children, position);
-
- gtk_container_remove (GTK_CONTAINER (toolbar), child);
+ tool_item = gtk_toolbar_get_nth_item (toolbar, position);
+
+ gtk_container_remove (GTK_CONTAINER (toolbar),
+ GTK_WIDGET (tool_item));
}
static gboolean
Info *info = data;
Action action;
-
+ gint n_items;
+
if (info->counter++ == 200)
{
gtk_main_quit ();
gtk_widget_show (GTK_WIDGET (info->toolbar));
}
- if (!info->toolbar->children)
+ n_items = gtk_toolbar_get_n_items (info->toolbar);
+ if (n_items == 0)
{
add_random (info->toolbar, info->counter);
return TRUE;
}
- else if (g_list_length (info->toolbar->children) > 50)
+ else if (n_items > 50)
{
int i;
for (i = 0; i < 25; i++)
for (i = 0; i < G_N_ELEMENTS (toolbar_styles); i++)
gtk_combo_box_append_text (GTK_COMBO_BOX (option_menu), toolbar_styles[i]);
gtk_combo_box_set_active (GTK_COMBO_BOX (option_menu),
- GTK_TOOLBAR (toolbar)->style);
+ gtk_toolbar_get_style (GTK_TOOLBAR (toolbar)));
gtk_box_pack_start (GTK_BOX (hbox2), option_menu, FALSE, FALSE, 0);
g_signal_connect (option_menu, "changed",
G_CALLBACK (change_toolbar_style), toolbar);