diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-03-02 20:20:39 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-03-02 20:20:39 +0000 |
| commit | 4cbe2db1a32993e1d9357c7fd13cd1511fdb389a (patch) | |
| tree | dc1cbe8520ce7e63f7e48e499224b99bca089741 | |
| parent | 07e5df616e4ad5d5f464e2be167947c08197af14 (diff) | |
| download | wireshark-4cbe2db1a32993e1d9357c7fd13cd1511fdb389a.tar.gz wireshark-4cbe2db1a32993e1d9357c7fd13cd1511fdb389a.tar.bz2 wireshark-4cbe2db1a32993e1d9357c7fd13cd1511fdb389a.zip | |
Use gtk_combo_box_new_text ().
svn path=/trunk/; revision=27580
| -rw-r--r-- | gtk/find_dlg.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c index 8d50b6c27b..9f8589b6fc 100644 --- a/gtk/find_dlg.c +++ b/gtk/find_dlg.c @@ -278,16 +278,13 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) /* Character Type Selection Dropdown Box These only apply to the string find option */ /* Create Combo Box */ - combo_cb = gtk_combo_new(); + combo_cb = gtk_combo_box_new_text(); - glist = g_list_append(glist, "ASCII Unicode & Non-Unicode"); - glist = g_list_append(glist, "ASCII Non-Unicode"); - glist = g_list_append(glist, "ASCII Unicode"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo_cb), "ASCII Unicode & Non-Unicode"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo_cb), "ASCII Non-Unicode"); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo_cb), "ASCII Unicode"); - gtk_combo_set_popdown_strings(GTK_COMBO(combo_cb), glist); - g_list_free(glist); - /* You only get to choose from the options we offer */ - gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(combo_cb)->entry), FALSE); + gtk_combo_box_set_active(GTK_COMBO_BOX(combo_cb),0); gtk_container_add(GTK_CONTAINER(string_opt_vb), combo_cb); gtk_widget_show(combo_cb); @@ -537,7 +534,7 @@ find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) summary_data_rb = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_SOURCE_SUMMARY_KEY); filter_text = gtk_entry_get_text(GTK_ENTRY(filter_te)); - string_type = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(combo_cb)->entry)); + string_type = gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo_cb)); case_type = !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(case_cb)); decode_data = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(decode_data_rb)); |