AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-24 12:41:16 +00:00
Code Issues Projects Releases Wiki Activity

Replace option menus in testgtk with combo boxes

Browse Source
This commit is contained in:
Christian Dywan 2010-03-26 17:55:07 +01:00 committed by Javier Jardón
parent 63131903ad
commit 274395063a
1 changed files with 14 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
tests/testgtk.c
View File

@ -110,30 +110,16 @@ build_option_menu (gchar *items[],
gpointer data) gpointer data)
{ {
GtkWidget *omenu; GtkWidget *omenu;
GtkWidget *menu;
GtkWidget *menu_item;
GSList *group;
gint i; gint i;
omenu = gtk_option_menu_new (); omenu = gtk_combo_box_new_text ();
g_signal_connect (omenu, "changed", g_signal_connect (omenu, "changed",
G_CALLBACK (func), data); G_CALLBACK (func), data);
menu = gtk_menu_new ();
group = NULL;
for (i = 0; i < num_items; i++) for (i = 0; i < num_items; i++)
{ gtk_combo_box_append_text (GTK_COMBO_BOX (omenu), items[i]);
menu_item = gtk_radio_menu_item_new_with_label (group, items[i]);
group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menu_item));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
if (i == history)
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), TRUE);
gtk_widget_show (menu_item);
}
gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu); gtk_combo_box_set_active (GTK_COMBO_BOX (omenu), history);
gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), history);
return omenu; return omenu;
} }
@ -4470,9 +4456,8 @@ create_menus (GtkWidget *widget)
0, 0,
GTK_ACCEL_VISIBLE); GTK_ACCEL_VISIBLE);
optionmenu = gtk_option_menu_new (); optionmenu = gtk_combo_box_new_text ();
gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu); gtk_combo_box_set_active (GTK_COMBO_BOX (optionmenu), 3);
gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), 3);
gtk_box_pack_start (GTK_BOX (box2), optionmenu, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box2), optionmenu, TRUE, TRUE, 0);
gtk_widget_show (optionmenu); gtk_widget_show (optionmenu);
@ -7730,7 +7715,7 @@ notebook_type_changed (GtkWidget *optionmenu,
notebook = GTK_NOTEBOOK (data); notebook = GTK_NOTEBOOK (data);
c = gtk_option_menu_get_history (GTK_OPTION_MENU (optionmenu)); c = gtk_combo_box_get_active (GTK_COMBO_BOX (optionmenu));
switch (c) switch (c)
{ {
@ -9250,7 +9235,7 @@ gravity_selected (GtkWidget *widget,
gpointer data) gpointer data)
{ {
gtk_window_set_gravity (GTK_WINDOW (g_object_get_data (data, "target")), gtk_window_set_gravity (GTK_WINDOW (g_object_get_data (data, "target")),
gtk_option_menu_get_history (GTK_OPTION_MENU (widget)) + GDK_GRAVITY_NORTH_WEST); gtk_combo_box_get_active (GTK_COMBO_BOX (widget)) + GDK_GRAVITY_NORTH_WEST);
} }
static void static void
@ -9258,7 +9243,7 @@ pos_selected (GtkWidget *widget,
gpointer data) gpointer data)
{ {
gtk_window_set_position (GTK_WINDOW (g_object_get_data (data, "target")), gtk_window_set_position (GTK_WINDOW (g_object_get_data (data, "target")),
gtk_option_menu_get_history (GTK_OPTION_MENU (widget)) + GTK_WIN_POS_NONE); gtk_combo_box_get_active (GTK_COMBO_BOX (widget)) + GTK_WIN_POS_NONE);
} }
static void static void
@ -9489,7 +9474,6 @@ window_controls (GtkWidget *window)
GtkAdjustment *adj; GtkAdjustment *adj;
GtkWidget *entry; GtkWidget *entry;
GtkWidget *om; GtkWidget *om;
GtkWidget *menu;
gint i; gint i;
control_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); control_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@ -9648,12 +9632,10 @@ window_controls (GtkWidget *window)
G_CONNECT_SWAPPED); G_CONNECT_SWAPPED);
gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
menu = gtk_menu_new (); om = gtk_combo_box_new_text ();
i = 0; i = 0;
while (i < 10) while (i < 10)
{ {
GtkWidget *mi;
static gchar *names[] = { static gchar *names[] = {
"GDK_GRAVITY_NORTH_WEST", "GDK_GRAVITY_NORTH_WEST",
"GDK_GRAVITY_NORTH", "GDK_GRAVITY_NORTH",
@ -9669,20 +9651,11 @@ window_controls (GtkWidget *window)
}; };
g_assert (names[i]); g_assert (names[i]);
gtk_combo_box_append_text (GTK_COMBO_BOX (om), names[i]);
mi = gtk_menu_item_new_with_label (names[i]);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
++i; ++i;
} }
gtk_widget_show_all (menu);
om = gtk_option_menu_new ();
gtk_option_menu_set_menu (GTK_OPTION_MENU (om), menu);
g_signal_connect (om, g_signal_connect (om,
"changed", "changed",
G_CALLBACK (gravity_selected), G_CALLBACK (gravity_selected),
@ -9691,12 +9664,10 @@ window_controls (GtkWidget *window)
gtk_box_pack_end (GTK_BOX (vbox), om, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (vbox), om, FALSE, FALSE, 0);
menu = gtk_menu_new (); om = gtk_combo_box_new_text ();
i = 0; i = 0;
while (i < 5) while (i < 5)
{ {
GtkWidget *mi;
static gchar *names[] = { static gchar *names[] = {
"GTK_WIN_POS_NONE", "GTK_WIN_POS_NONE",
"GTK_WIN_POS_CENTER", "GTK_WIN_POS_CENTER",
@ -9707,19 +9678,10 @@ window_controls (GtkWidget *window)
}; };
g_assert (names[i]); g_assert (names[i]);
gtk_combo_box_append_text (GTK_COMBO_BOX (om), names[i]);
mi = gtk_menu_item_new_with_label (names[i]);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
++i; ++i;
} }
gtk_widget_show_all (menu);
om = gtk_option_menu_new ();
gtk_option_menu_set_menu (GTK_OPTION_MENU (om), menu);
g_signal_connect (om, g_signal_connect (om,
"changed", "changed",
@ -9838,7 +9800,7 @@ progressbar_toggle_orientation (GtkWidget *widget, gpointer data)
if (!gtk_widget_get_mapped (widget)) if (!gtk_widget_get_mapped (widget))
return; return;
i = gtk_option_menu_get_history (GTK_OPTION_MENU (widget)); i = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (pdata->pbar), gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (pdata->pbar),
(GtkProgressBarOrientation) i); (GtkProgressBarOrientation) i);
@ -9859,7 +9821,7 @@ progressbar_toggle_ellipsize (GtkWidget *widget,
ProgressData *pdata = data; ProgressData *pdata = data;
if (gtk_widget_is_drawable (widget)) if (gtk_widget_is_drawable (widget))
{ {
gint i = gtk_option_menu_get_history (GTK_OPTION_MENU (widget)); gint i = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (pdata->pbar), i); gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (pdata->pbar), i);
} }
} }