Replace deprecated functions.
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 24 Jul 2011 18:03:53 +0000 (18:03 +0000)
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 24 Jul 2011 18:03:53 +0000 (18:03 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38187 f5534014-38df-0310-8fa8-9805f1628bb7

gtk/iax2_analysis.c
gtk/rtp_analysis.c
gtk/tap_param_dlg.c
gtk/uat_gui.c

index 945d75ed9f1dfd9004a020c539e7fa23183462c6..a9f1766500a64ac1b60f72b82b05bc5731b26c57 100644 (file)
@@ -1551,7 +1551,7 @@ create_yscale_max_menu_items(user_data_t* user_data)
        GtkWidget *combo_box;
        int i;
 
-       combo_box = gtk_combo_box_new_text ();
+       combo_box = gtk_combo_box_text_new();
 
        for(i=0;i<MAX_YSCALE;i++){
                if(yscale_max[i]==AUTO_MAX_YSCALE){
@@ -1561,7 +1561,7 @@ create_yscale_max_menu_items(user_data_t* user_data)
                } else {
                        g_snprintf(str, sizeof(str), "%u s", yscale_max[i]/1000000);
                }
-               gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), str);
+                gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), str);
        }
        gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), user_data->dlg.dialog_graph.max_y_units_index);
        g_signal_connect(combo_box, "changed", G_CALLBACK(yscale_select), user_data);
@@ -1577,11 +1577,11 @@ create_pixels_per_tick_menu_items(user_data_t *user_data)
        GtkWidget *combo_box;
        int i;
 
-       combo_box = gtk_combo_box_new_text ();
+       combo_box = gtk_combo_box_text_new();
 
        for(i=0;i<MAX_PIXELS_PER_TICK;i++){
                g_snprintf(str, sizeof(str), "%u", pixels_per_tick[i]);
-               gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), str);
+                gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), str);
        }
        gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), user_data->dlg.dialog_graph.pixels_per_tick_index);
 
@@ -1598,7 +1598,7 @@ create_tick_interval_menu_items(user_data_t *user_data)
        char str[15];
        int i;
 
-       combo_box = gtk_combo_box_new_text ();
+       combo_box = gtk_combo_box_text_new();
 
        for(i=0;i<MAX_TICK_VALUES;i++){
                if(tick_interval_values[i]>=1000){
@@ -1610,7 +1610,7 @@ create_tick_interval_menu_items(user_data_t *user_data)
                } else {
                        g_snprintf(str, sizeof(str), "0.%03u sec", (tick_interval_values[i])%10);
                }
-               gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), str);
+                gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), str);
        }
        gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), user_data->dlg.dialog_graph.interval_index);
        g_signal_connect(combo_box, "changed", G_CALLBACK(tick_interval_select), user_data);
index 987f52e2f3de545026dab3feb5e999dd09db7e5b..4ee3c547a8660a91735b021e7e6abdd630d0cee1 100644 (file)
@@ -1580,7 +1580,7 @@ create_yscale_max_menu_items(user_data_t* user_data)
        GtkWidget *combo_box;
        int i;
 
-       combo_box = gtk_combo_box_new_text ();
+       combo_box = gtk_combo_box_text_new();
 
        for(i=0;i<MAX_YSCALE;i++){
                if(yscale_max[i]==AUTO_MAX_YSCALE){
@@ -1590,7 +1590,7 @@ create_yscale_max_menu_items(user_data_t* user_data)
                } else {
                        g_snprintf(str, sizeof(str), "%u s", yscale_max[i]/1000000);
                }
-               gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), str);
+                gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), str);
        }
        gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), user_data->dlg.dialog_graph.max_y_units_index);
        g_signal_connect(combo_box, "changed", G_CALLBACK(yscale_select), (gpointer)user_data);
@@ -1606,11 +1606,11 @@ create_pixels_per_tick_menu_items(user_data_t *user_data)
        GtkWidget *combo_box;
        int i;
 
-       combo_box = gtk_combo_box_new_text ();
+       combo_box = gtk_combo_box_text_new();
 
        for(i=0;i<MAX_PIXELS_PER_TICK;i++){
                g_snprintf(str, sizeof(str), "%u", pixels_per_tick[i]);
-               gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), str);
+                gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), str);
        }
        gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), user_data->dlg.dialog_graph.pixels_per_tick_index);
 
@@ -1627,7 +1627,7 @@ create_tick_interval_menu_items(user_data_t *user_data)
        char str[15];
        int i;
 
-       combo_box = gtk_combo_box_new_text ();
+       combo_box = gtk_combo_box_text_new();
 
        for(i=0;i<MAX_TICK_VALUES;i++){
                if(tick_interval_values[i]>=1000){
@@ -1639,7 +1639,7 @@ create_tick_interval_menu_items(user_data_t *user_data)
                } else {
                        g_snprintf(str, sizeof(str), "0.%03u sec", (tick_interval_values[i])%10);
                }
-               gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), str);
+                gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), str);
        }
        gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), user_data->dlg.dialog_graph.interval_index);
        g_signal_connect(combo_box, "changed", G_CALLBACK(tick_interval_select), (gpointer)user_data);
index 4667d6b3360df0235acd7eb3bede3f94637b2152..fd5a74af99a2dcaa36bffccce122b78ed4fc171f 100644 (file)
@@ -246,10 +246,10 @@ tap_param_dlg_cb(GtkWidget *w _U_, gpointer data)
             gtk_widget_show(label);
 
             /* Combo box */
-            item=gtk_combo_box_new_text();
+            item=gtk_combo_box_text_new();
             for (j = 0; current_dlg->cont.params[i].enum_vals[j].name != NULL;
                  j++)
-                gtk_combo_box_append_text(GTK_COMBO_BOX(item),
+                 gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(item),
                                           current_dlg->cont.params[i].enum_vals[j].description);
             gtk_combo_box_set_active(GTK_COMBO_BOX(item), 0);
             break;
index e6a36aa37274c494ca340345435a454dc828c101..0fd6f1cb3a5a56ba3a2556efda7178bc3cd9767e 100644 (file)
@@ -68,7 +68,7 @@
 #include "gtk/gui_stat_menu.h"
 #include "gtk/main.h"
 #include "gtk/uat_gui.h"
-
+#include "gtk/old-gtk-compat.h"
 
 # define BUTTON_SIZE_X -1
 # define BUTTON_SIZE_Y -1
@@ -495,11 +495,11 @@ static void uat_edit_dialog(uat_t* uat, gint row, gboolean copy) {
                                int* valptr = g_malloc(sizeof(int));    /* A place to store the index of the    */
                                                                        /*  "active" fld_data array entry       */
                                                                        /* -1 means "nothing selected (active)" */
-                               combo_box = gtk_combo_box_new_text();
+                               combo_box = gtk_combo_box_text_new();
                                *valptr = -1;
                                for (idx = 0; enum_vals[idx].strptr != NULL; idx++) {
                                        const char* str = enum_vals[idx].strptr;
-                                       gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), str);
+                                        gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(combo_box), str);
                                        
                                        if ( g_str_equal(str, text) ) {
                                                *valptr = idx;