diff --git a/ChangeLog b/ChangeLog index 89a83984cd..3317241dfc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 30 16:36:53 2002 Owen Taylor + + * tests/testgtk.c: Fix bug in the selection mode option + menus which were setting the wrong values. + (#85763, Manuel Op de Coul) + Tue Jul 30 15:39:06 2002 Owen Taylor * demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 89a83984cd..3317241dfc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Tue Jul 30 16:36:53 2002 Owen Taylor + + * tests/testgtk.c: Fix bug in the selection mode option + menus which were setting the wrong values. + (#85763, Manuel Op de Coul) + Tue Jul 30 15:39:06 2002 Owen Taylor * demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 89a83984cd..3317241dfc 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Tue Jul 30 16:36:53 2002 Owen Taylor + + * tests/testgtk.c: Fix bug in the selection mode option + menus which were setting the wrong values. + (#85763, Manuel Op de Coul) + Tue Jul 30 15:39:06 2002 Owen Taylor * demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 89a83984cd..3317241dfc 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Tue Jul 30 16:36:53 2002 Owen Taylor + + * tests/testgtk.c: Fix bug in the selection mode option + menus which were setting the wrong values. + (#85763, Manuel Op de Coul) + Tue Jul 30 15:39:06 2002 Owen Taylor * demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 89a83984cd..3317241dfc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Tue Jul 30 16:36:53 2002 Owen Taylor + + * tests/testgtk.c: Fix bug in the selection mode option + menus which were setting the wrong values. + (#85763, Manuel Op de Coul) + Tue Jul 30 15:39:06 2002 Owen Taylor * demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 89a83984cd..3317241dfc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Tue Jul 30 16:36:53 2002 Owen Taylor + + * tests/testgtk.c: Fix bug in the selection mode option + menus which were setting the wrong values. + (#85763, Manuel Op de Coul) + Tue Jul 30 15:39:06 2002 Owen Taylor * demos/Makefile.am: Honor GDK_PIXBUF_CSOURCE from diff --git a/tests/testgtk.c b/tests/testgtk.c index a7f8d5ab2c..abd115ccd3 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -4959,6 +4959,19 @@ list_clear (GtkWidget *widget, gtk_list_clear_items (GTK_LIST (list), 0, -1); } +static gchar *selection_mode_items[] = +{ + "Single", + "Browse", + "Multiple" +}; + +static const GtkSelectionMode selection_modes[] = { + GTK_SELECTION_SINGLE, + GTK_SELECTION_BROWSE, + GTK_SELECTION_MULTIPLE +}; + static GtkWidget *list_omenu; static void @@ -4974,7 +4987,7 @@ list_toggle_sel_mode (GtkWidget *widget, gpointer data) i = gtk_option_menu_get_history (GTK_OPTION_MENU (widget)); - gtk_list_set_selection_mode (list, (GtkSelectionMode) i); + gtk_list_set_selection_mode (list, selection_modes[i]); } static void @@ -4982,13 +4995,6 @@ create_list (void) { static GtkWidget *window = NULL; - static gchar *items[] = - { - "Single", - "Browse", - "Multiple" - }; - if (!window) { GtkWidget *cbox; @@ -5084,7 +5090,7 @@ create_list (void) label = gtk_label_new ("Selection Mode :"); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); - list_omenu = build_option_menu (items, 3, 3, + list_omenu = build_option_menu (selection_mode_items, 3, 3, list_toggle_sel_mode, list); gtk_box_pack_start (GTK_BOX (hbox), list_omenu, FALSE, TRUE, 0); @@ -5441,7 +5447,7 @@ clist_toggle_sel_mode (GtkWidget *widget, gpointer data) i = gtk_option_menu_get_history (GTK_OPTION_MENU (widget)); - gtk_clist_set_selection_mode (clist, (GtkSelectionMode) i); + gtk_clist_set_selection_mode (clist, selection_modes[i]); } static void @@ -5475,13 +5481,6 @@ create_clist (void) "Title 8", "Title 9", "Title 10", "Title 11" }; - static gchar *items[] = - { - "Single", - "Browse", - "Multiple", - }; - char text[TESTGTK_CLIST_COLUMNS][50]; char *texts[TESTGTK_CLIST_COLUMNS]; @@ -5593,7 +5592,7 @@ create_clist (void) label = gtk_label_new ("Selection Mode :"); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); - clist_omenu = build_option_menu (items, 3, 3, + clist_omenu = build_option_menu (selection_mode_items, 3, 3, clist_toggle_sel_mode, clist); gtk_box_pack_start (GTK_BOX (hbox), clist_omenu, FALSE, TRUE, 0); @@ -6110,7 +6109,7 @@ ctree_toggle_sel_mode (GtkWidget *widget, gpointer data) i = gtk_option_menu_get_history (GTK_OPTION_MENU (widget)); - gtk_clist_set_selection_mode (GTK_CLIST (ctree), (GtkSelectionMode) i); + gtk_clist_set_selection_mode (GTK_CLIST (ctree), selection_modes[i]); after_press (ctree, NULL); } @@ -6297,13 +6296,6 @@ void create_ctree (void) "Right" }; - static gchar *items4[] = - { - "Single", - "Browse", - "Multiple", - }; - if (!window) { window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -6514,7 +6506,7 @@ void create_ctree (void) gtk_tooltips_set_tip (tooltips, omenu3, "The tree's justification.", NULL); - omenu4 = build_option_menu (items4, 3, 3, + omenu4 = build_option_menu (selection_mode_items, 3, 3, ctree_toggle_sel_mode, ctree); gtk_box_pack_start (GTK_BOX (hbox), omenu4, FALSE, TRUE, 0); gtk_tooltips_set_tip (tooltips, omenu4, "The list's selection mode.",