diff options
38 files changed, 83 insertions, 86 deletions
diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c index a9322617dc..7e3bd66794 100644 --- a/gtk/capture_file_dlg.c +++ b/gtk/capture_file_dlg.c @@ -495,7 +495,7 @@ file_open_cmd(GtkWidget *w) gtk_box_pack_start(GTK_BOX(main_vb), filter_hbox, FALSE, FALSE, 0); gtk_widget_show(filter_hbox); - filter_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); + filter_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args); SIGNAL_CONNECT(filter_bt, "destroy", filter_button_destroy_cb, NULL); gtk_box_pack_start(GTK_BOX(filter_hbox), filter_bt, FALSE, TRUE, 0); @@ -848,7 +848,7 @@ file_merge_cmd(GtkWidget *w) gtk_box_pack_start(GTK_BOX(main_vb), filter_hbox, FALSE, FALSE, 0); gtk_widget_show(filter_hbox); - filter_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); + filter_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args); SIGNAL_CONNECT(filter_bt, "destroy", filter_button_destroy_cb, NULL); gtk_box_pack_start(GTK_BOX(filter_hbox), filter_bt, FALSE, TRUE, 0); diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c index 9ec1cefa14..bf6246ad64 100644 --- a/gtk/capture_if_dlg.c +++ b/gtk/capture_if_dlg.c @@ -485,7 +485,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_) if_lb = gtk_label_new(" Packets/s "); gtk_table_attach_defaults(GTK_TABLE(if_tb), if_lb, 5, 6, row, row+1); - stop_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_CAPTURE_STOP); + stop_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_CAPTURE_STOP); gtk_tooltips_set_tip(tooltips, stop_bt, "Stop a running capture.", NULL); #ifdef _WIN32 @@ -592,7 +592,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_) gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->last_lb, 5, 6, row, row+1); /* capture button */ - if_dlg_data->capture_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_CAPTURE_START); + if_dlg_data->capture_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_CAPTURE_START); SIGNAL_CONNECT(if_dlg_data->capture_bt, "clicked", capture_do_cb, if_dlg_data); tmp_str = g_strdup_printf("Immediately start a capture from this interface:\n\n%s", if_tool_str->str); gtk_tooltips_set_tip(tooltips, if_dlg_data->capture_bt, @@ -601,7 +601,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_) gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->capture_bt, 6, 7, row, row+1); /* prepare button */ - if_dlg_data->prepare_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_CAPTURE_OPTIONS); + if_dlg_data->prepare_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_CAPTURE_OPTIONS); SIGNAL_CONNECT(if_dlg_data->prepare_bt, "clicked", capture_prepare_cb, if_dlg_data); gtk_tooltips_set_tip(tooltips, if_dlg_data->prepare_bt, "Open the capture options dialog with this interface selected.", NULL); @@ -609,7 +609,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_) /* details button */ #ifdef _WIN32 - if_dlg_data->details_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_CAPTURE_DETAILS); + if_dlg_data->details_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_CAPTURE_DETAILS); SIGNAL_CONNECT(if_dlg_data->details_bt, "clicked", capture_details_cb, if_dlg_data); gtk_tooltips_set_tip(tooltips, if_dlg_data->details_bt, "Open the capture details dialog of this interface.", NULL); diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c index 6b0ec0fa55..c5373a2474 100644 --- a/gtk/capture_prefs.c +++ b/gtk/capture_prefs.c @@ -133,7 +133,7 @@ capture_prefs_show(void) gtk_misc_set_alignment(GTK_MISC(ifopts_lb), 1.0, 0.5); gtk_widget_show(ifopts_lb); - ifopts_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_EDIT); + ifopts_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT); gtk_tooltips_set_tip(tooltips, ifopts_bt, "Open a dialog box to set various interface options.", NULL); SIGNAL_CONNECT(ifopts_bt, "clicked", ifopts_edit_cb, NULL); diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c index 893c27c6ea..c57cac21b4 100644 --- a/gtk/color_dlg.c +++ b/gtk/color_dlg.c @@ -236,27 +236,27 @@ colorize_dialog_new (char *filter) gtk_container_set_border_width (GTK_CONTAINER (edit_vbox), 5); gtk_container_add(GTK_CONTAINER(edit_fr), edit_vbox); - color_new = BUTTON_NEW_FROM_STOCK(GTK_STOCK_NEW); + color_new = gtk_button_new_from_stock(GTK_STOCK_NEW); gtk_box_pack_start (GTK_BOX (edit_vbox), color_new, FALSE, FALSE, 5); gtk_tooltips_set_tip (tooltips, color_new, ("Create a new filter at the end of the list"), NULL); - color_edit = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_EDIT); + color_edit = gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT); gtk_box_pack_start (GTK_BOX (edit_vbox), color_edit, FALSE, FALSE, 5); gtk_tooltips_set_tip (tooltips, color_edit, ("Edit the properties of the selected filter." " If more than one filter is selected, edit the first selected one"), NULL); gtk_widget_set_sensitive (color_edit, FALSE); - color_enable = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_ENABLE); + color_enable = gtk_button_new_from_stock(WIRESHARK_STOCK_ENABLE); gtk_box_pack_start (GTK_BOX (edit_vbox), color_enable, FALSE, FALSE, 5); gtk_tooltips_set_tip (tooltips, color_enable, ("Enable the selected filter(s)"), NULL); gtk_widget_set_sensitive (color_enable, FALSE); - color_disable = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISABLE); + color_disable = gtk_button_new_from_stock(WIRESHARK_STOCK_DISABLE); gtk_box_pack_start (GTK_BOX (edit_vbox), color_disable, FALSE, FALSE, 5); gtk_tooltips_set_tip (tooltips, color_disable, ("Disable the selected filter(s)"), NULL); gtk_widget_set_sensitive (color_disable, FALSE); - color_delete = BUTTON_NEW_FROM_STOCK(GTK_STOCK_DELETE); + color_delete = gtk_button_new_from_stock(GTK_STOCK_DELETE); gtk_box_pack_start (GTK_BOX (edit_vbox), color_delete, FALSE, FALSE, 5); gtk_tooltips_set_tip (tooltips, color_delete, ("Delete the selected filter(s)"), NULL); gtk_widget_set_sensitive (color_delete, FALSE); @@ -271,15 +271,15 @@ colorize_dialog_new (char *filter) gtk_container_set_border_width (GTK_CONTAINER (manage_vbox), 5); gtk_container_add(GTK_CONTAINER(manage_fr), manage_vbox); - color_export = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_EXPORT); + color_export = gtk_button_new_from_stock(WIRESHARK_STOCK_EXPORT); gtk_box_pack_start (GTK_BOX (manage_vbox), color_export, FALSE, FALSE, 5); gtk_tooltips_set_tip(tooltips, color_export, ("Save all/selected filters to a file"), NULL); - color_import = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_IMPORT); + color_import = gtk_button_new_from_stock(WIRESHARK_STOCK_IMPORT); gtk_box_pack_start (GTK_BOX (manage_vbox), color_import, FALSE, FALSE, 5); gtk_tooltips_set_tip(tooltips, color_import, ("Load filters from a file and append them to the list"), NULL); - color_clear = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLEAR); + color_clear = gtk_button_new_from_stock(GTK_STOCK_CLEAR); gtk_box_pack_start(GTK_BOX (manage_vbox), color_clear, FALSE, FALSE, 5); gtk_tooltips_set_tip(tooltips, color_clear, ("Clear the filter list and revert to system-wide default filter set"), NULL); @@ -343,7 +343,7 @@ colorize_dialog_new (char *filter) gtk_container_set_border_width (GTK_CONTAINER (order_vbox), 5); gtk_container_add(GTK_CONTAINER(order_fr), order_vbox); - color_filter_up = BUTTON_NEW_FROM_STOCK(GTK_STOCK_GO_UP); + color_filter_up = gtk_button_new_from_stock(GTK_STOCK_GO_UP); gtk_box_pack_start (GTK_BOX (order_vbox), color_filter_up, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, color_filter_up, ("Move filter higher in list"), NULL); gtk_widget_set_sensitive (color_filter_up, FALSE); @@ -351,7 +351,7 @@ colorize_dialog_new (char *filter) order_move_label = gtk_label_new (("Move\nselected filter\nup or down")); gtk_box_pack_start (GTK_BOX (order_vbox), order_move_label, FALSE, FALSE, 0); - color_filter_down = BUTTON_NEW_FROM_STOCK(GTK_STOCK_GO_DOWN); + color_filter_down = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN); gtk_box_pack_start (GTK_BOX (order_vbox), color_filter_down, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, color_filter_down, ("Move filter lower in list"), NULL); gtk_widget_set_sensitive (color_filter_down, FALSE); diff --git a/gtk/color_edit_dlg.c b/gtk/color_edit_dlg.c index fc6ed5eb4a..1b4fb1078e 100644 --- a/gtk/color_edit_dlg.c +++ b/gtk/color_edit_dlg.c @@ -189,7 +189,7 @@ edit_color_filter_dialog(GtkWidget *color_filters, /* Create the "Add Expression..." button, to pop up a dialog for constructing filter comparison expressions. */ - add_expression_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_ADD_EXPRESSION); + add_expression_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_ADD_EXPRESSION); SIGNAL_CONNECT(add_expression_bt, "clicked", filter_expr_cb, filt_text_entry); gtk_box_pack_start (GTK_BOX(filter_string_hbox), add_expression_bt, FALSE, FALSE, 3); gtk_tooltips_set_tip (tooltips, add_expression_bt, ("Add an expression to the filter string"), NULL); diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c index 2c041c8b1d..057ca303d2 100644 --- a/gtk/column_prefs.c +++ b/gtk/column_prefs.c @@ -99,12 +99,12 @@ column_prefs_show() { gtk_container_add(GTK_CONTAINER(edit_fr), edit_vb); gtk_widget_show(edit_vb); - new_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_NEW); + new_bt = gtk_button_new_from_stock(GTK_STOCK_NEW); SIGNAL_CONNECT(new_bt, "clicked", column_list_new_cb, NULL); gtk_box_pack_start (GTK_BOX (edit_vb), new_bt, FALSE, FALSE, 5); gtk_widget_show(new_bt); - del_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_DELETE); + del_bt = gtk_button_new_from_stock(GTK_STOCK_DELETE); gtk_widget_set_sensitive(del_bt, FALSE); SIGNAL_CONNECT(del_bt, "clicked", column_list_delete_cb, NULL); gtk_box_pack_start (GTK_BOX (edit_vb), del_bt, FALSE, FALSE, 5); @@ -184,7 +184,7 @@ column_prefs_show() { gtk_container_set_border_width (GTK_CONTAINER (order_vb), 5); gtk_widget_show(order_vb); - up_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_GO_UP); + up_bt = gtk_button_new_from_stock(GTK_STOCK_GO_UP); gtk_widget_set_sensitive(up_bt, FALSE); SIGNAL_CONNECT(up_bt, "clicked", column_arrow_cb, NULL); gtk_box_pack_start(GTK_BOX(order_vb), up_bt, FALSE, FALSE, 0); @@ -194,7 +194,7 @@ column_prefs_show() { gtk_widget_show (order_lb); gtk_box_pack_start (GTK_BOX (order_vb), order_lb, FALSE, FALSE, 0); - dn_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_GO_DOWN); + dn_bt = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN); gtk_widget_set_sensitive(dn_bt, FALSE); SIGNAL_CONNECT(dn_bt, "clicked", column_arrow_cb, NULL); gtk_box_pack_start(GTK_BOX(order_vb), dn_bt, FALSE, FALSE, 0); diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h index bdbd26eb97..c24eeafbb7 100644 --- a/gtk/compat_macros.h +++ b/gtk/compat_macros.h @@ -158,9 +158,6 @@ gtk_widget_set_size_request(GTK_WIDGET(widget), width, height) #define WIRESHARK_STOCK_COLOR9 "Wireshark_Stock_Color_9" #define WIRESHARK_STOCK_COLOR0 "Wireshark_Stock_Color_10" -#define BUTTON_NEW_FROM_STOCK(stock_id) \ -gtk_button_new_from_stock(stock_id); - #define CHECK_BUTTON_NEW_WITH_MNEMONIC(label_text, accel_group) \ gtk_check_button_new_with_mnemonic(label_text) diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c index c2653e0cdd..641881ec61 100644 --- a/gtk/dcerpc_stat.c +++ b/gtk/dcerpc_stat.c @@ -627,7 +627,7 @@ gtk_dcerpcstat_cb(GtkWidget *w _U_, gpointer d _U_) filter_box=gtk_hbox_new(FALSE, 3); /* Filter label */ - filter_bt=BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); + filter_bt=gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args); gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, FALSE, 0); gtk_widget_show(filter_bt); diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c index 24ad46e895..f3c8e145c1 100644 --- a/gtk/dlg_utils.c +++ b/gtk/dlg_utils.c @@ -46,7 +46,7 @@ dlg_button_new(GtkWidget *hbox, GtkWidget *button_hbox, const gchar *stock_id) { GtkWidget *button; - button = BUTTON_NEW_FROM_STOCK(stock_id); + button = gtk_button_new_from_stock(stock_id); GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); g_object_set_data(G_OBJECT(hbox), stock_id, button); gtk_box_pack_end(GTK_BOX(button_hbox), button, FALSE, FALSE, 0); @@ -208,7 +208,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...) /* do we have a help button? -> special handling for it */ if (help) { - button = BUTTON_NEW_FROM_STOCK(help); + button = gtk_button_new_from_stock(help); GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); g_object_set_data(G_OBJECT(hbox), help, button); gtk_box_pack_start(GTK_BOX(help_hbox), button, FALSE, FALSE, 0); diff --git a/gtk/export_object.c b/gtk/export_object.c index 2ff9d5e149..b28c25cbc4 100644 --- a/gtk/export_object.c +++ b/gtk/export_object.c @@ -375,7 +375,7 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_ bbox = gtk_hbox_new(FALSE, 5); /* Help button */ - help_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_HELP); + help_bt = gtk_button_new_from_stock(GTK_STOCK_HELP); SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_EXPORT_OBJECT_LIST); gtk_tooltips_set_tip(GTK_TOOLTIPS(button_bar_tips), help_bt, "Show help for this dialog.", NULL); @@ -391,7 +391,7 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_ gtk_box_pack_end(GTK_BOX(bbox), save_all_bt, FALSE, FALSE, 0); /* Save button */ - save_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE_AS); + save_bt = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS); SIGNAL_CONNECT(save_bt, "clicked", eo_save_clicked_cb, object_list); gtk_tooltips_set_tip(GTK_TOOLTIPS(button_bar_tips), save_bt, "Saves the currently selected content to a file.", @@ -399,7 +399,7 @@ export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_ gtk_box_pack_end(GTK_BOX(bbox), save_bt, FALSE, FALSE, 0); /* Close button */ - close_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE); GTK_WIDGET_SET_FLAGS(close_bt, GTK_CAN_DEFAULT); gtk_tooltips_set_tip(GTK_TOOLTIPS(button_bar_tips), close_bt, "Close this dialog.", NULL); diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c index ee187b6564..53444ba4b8 100644 --- a/gtk/filter_dlg.c +++ b/gtk/filter_dlg.c @@ -438,14 +438,14 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, gtk_container_add(GTK_CONTAINER(edit_fr), list_bb); gtk_widget_show(list_bb); - new_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_NEW); + new_bt = gtk_button_new_from_stock(GTK_STOCK_NEW); SIGNAL_CONNECT(new_bt, "clicked", filter_new_bt_clicked_cb, filter_list_type_p); gtk_widget_show(new_bt); gtk_box_pack_start (GTK_BOX (list_bb), new_bt, FALSE, FALSE, 0); gtk_tooltips_set_tip (tooltips, new_bt, "Create a new filter at the end of the list (with the current properties)", NULL); - del_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_DELETE); + del_bt = gtk_button_new_from_stock(GTK_STOCK_DELETE); gtk_widget_set_sensitive(del_bt, FALSE); SIGNAL_CONNECT(del_bt, "clicked", filter_del_bt_clicked_cb, filter_list_type_p); g_object_set_data(G_OBJECT(main_w), E_FILT_DEL_BT_KEY, del_bt); @@ -544,7 +544,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te, /* Create the "Add Expression..." button, to pop up a dialog for constructing filter comparison expressions. */ - add_expression_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_ADD_EXPRESSION); + add_expression_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_ADD_EXPRESSION); SIGNAL_CONNECT(add_expression_bt, "clicked", filter_add_expr_bt_cb, main_w); gtk_box_pack_start(GTK_BOX(bottom_hb), add_expression_bt, FALSE, FALSE, 0); gtk_widget_show(add_expression_bt); diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c index 52773614b0..57ee796794 100644 --- a/gtk/find_dlg.c +++ b/gtk/find_dlg.c @@ -197,7 +197,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) gtk_box_pack_start(GTK_BOX(find_type_vb), filter_hb, FALSE, FALSE, 0); gtk_widget_show(filter_hb); - filter_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); + filter_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args); SIGNAL_CONNECT(filter_bt, "destroy", filter_button_destroy_cb, NULL); g_object_set_data(G_OBJECT(filter_bt), E_FILT_TE_BUTTON_KEY, filter_bt); diff --git a/gtk/firewall_dlg.c b/gtk/firewall_dlg.c index 93c31b2072..b06be47687 100644 --- a/gtk/firewall_dlg.c +++ b/gtk/firewall_dlg.c @@ -287,19 +287,19 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_) gtk_button_box_set_spacing(GTK_BUTTON_BOX(button_hbox), 5); /* Create Copy Button */ - button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_COPY); + button = gtk_button_new_from_stock(GTK_STOCK_COPY); SIGNAL_CONNECT(button, "clicked", firewall_copy_cmd_cb, rule_info); gtk_tooltips_set_tip (tooltips, button, "Copy rule to clipboard ", NULL); gtk_box_pack_start(GTK_BOX(button_hbox), button, FALSE, FALSE, 0); /* Create Save As Button */ - button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE_AS); + button = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS); SIGNAL_CONNECT(button, "clicked", firewall_save_as_cmd_cb, rule_info); gtk_tooltips_set_tip (tooltips, button, "Save the rule as currently displayed ", NULL); gtk_box_pack_start(GTK_BOX(button_hbox), button, FALSE, FALSE, 0); /* Create Close Button */ - button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_tooltips_set_tip (tooltips, button, "Close the dialog", NULL); gtk_box_pack_start(GTK_BOX(button_hbox), button, FALSE, FALSE, 0); diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c index 05ed1ecb29..1d8821eb26 100644 --- a/gtk/flow_graph.c +++ b/gtk/flow_graph.c @@ -608,13 +608,13 @@ static void flow_graph_dlg_create (void) gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD); gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox), 30); - bt_ok = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK); + bt_ok = gtk_button_new_from_stock(GTK_STOCK_OK); gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_ok); gtk_tooltips_set_tip (tooltips, bt_ok, "Show the flow graph", NULL); SIGNAL_CONNECT(bt_ok, "clicked", flow_graph_on_ok, flow_graph_dlg_w); gtk_widget_show(bt_ok); - bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close); GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL); diff --git a/gtk/follow_stream.c b/gtk/follow_stream.c index eb81ed05de..6339fe97cc 100644 --- a/gtk/follow_stream.c +++ b/gtk/follow_stream.c @@ -759,20 +759,20 @@ follow_stream(gchar *title, follow_info_t *follow_info, #if GTK_CHECK_VERSION(2,4,0) /* Create Find Button */ - button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_FIND); + button = gtk_button_new_from_stock(GTK_STOCK_FIND); SIGNAL_CONNECT(button, "clicked", follow_find_cb, follow_info); gtk_tooltips_set_tip (tooltips, button, "Find text in the displayed content", NULL); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); #endif /* Create Save As Button */ - button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE_AS); + button = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS); SIGNAL_CONNECT(button, "clicked", follow_save_as_cmd_cb, follow_info); gtk_tooltips_set_tip (tooltips, button, "Save the content as currently displayed", NULL); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); /* Create Print Button */ - button = BUTTON_NEW_FROM_STOCK(GTK_STOCK_PRINT); + button = gtk_button_new_from_stock(GTK_STOCK_PRINT); SIGNAL_CONNECT(button, "clicked", follow_print_stream, follow_info); gtk_tooltips_set_tip(tooltips, button, "Print the content as currently displayed", NULL); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c index 850b509dc6..b1908bad35 100644 --- a/gtk/graph_analysis.c +++ b/gtk/graph_analysis.c @@ -1480,13 +1480,13 @@ static void dialog_graph_create_window(graph_analysis_data_t* user_data) gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox), 30); gtk_widget_show(hbuttonbox); - bt_save = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE_AS); + bt_save = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS); gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_save); gtk_widget_show(bt_save); SIGNAL_CONNECT(bt_save, "clicked", on_save_bt_clicked, user_data); gtk_tooltips_set_tip (tooltips, bt_save, "Save an ASCII representation of the graph to a file", NULL); - bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close); GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); gtk_widget_show(bt_close); diff --git a/gtk/io_stat.c b/gtk/io_stat.c index 95f2f208e8..dabf3a97a6 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -1935,7 +1935,7 @@ create_filter_box(io_stat_graph_t *gio, GtkWidget *box, int num) /* filter prefs dialog */ - gio->filter_bt=BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); + gio->filter_bt=gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); g_snprintf(str, 256, "Wireshark: Display Filter IO-Stat (Filter:%d)", num); if(gio->args->title){ diff --git a/gtk/main.c b/gtk/main.c index 10917b169a..944c7dfe11 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -4216,7 +4216,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) gtk_widget_show(filter_tb); /* Create the "Filter:" button */ - filter_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); + filter_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args); gtk_widget_show(filter_bt); g_object_set_data(G_OBJECT(top_level), E_FILT_BT_PTR_KEY, filter_bt); @@ -4249,7 +4249,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) /* Create the "Add Expression..." button, to pop up a dialog for constructing filter comparison expressions. */ - filter_add_expr_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_ADD_EXPRESSION); + filter_add_expr_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_ADD_EXPRESSION); g_object_set_data(G_OBJECT(filter_tb), E_FILT_FILTER_TE_KEY, filter_te); SIGNAL_CONNECT(filter_add_expr_bt, "clicked", filter_add_expr_bt_cb, filter_tb); gtk_widget_show(filter_add_expr_bt); @@ -4257,7 +4257,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) "Add an expression to this filter string", "Private"); /* Create the "Clear" button */ - filter_reset = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLEAR); + filter_reset = gtk_button_new_from_stock(GTK_STOCK_CLEAR); g_object_set_data(G_OBJECT(filter_reset), E_DFILTER_TE_KEY, filter_te); SIGNAL_CONNECT(filter_reset, "clicked", filter_reset_cb, NULL); gtk_widget_show(filter_reset); @@ -4265,7 +4265,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) "Clear this filter string and update the display", "Private"); /* Create the "Apply" button */ - filter_apply = BUTTON_NEW_FROM_STOCK(GTK_STOCK_APPLY); + filter_apply = gtk_button_new_from_stock(GTK_STOCK_APPLY); g_object_set_data(G_OBJECT(filter_apply), E_DFILTER_CM_KEY, filter_cm); SIGNAL_CONNECT(filter_apply, "clicked", filter_activate_cb, filter_te); gtk_widget_show(filter_apply); diff --git a/gtk/main_welcome.c b/gtk/main_welcome.c index 36ba0e1b0e..37ac26ddba 100644 --- a/gtk/main_welcome.c +++ b/gtk/main_welcome.c @@ -51,7 +51,7 @@ welcome_item(const gchar *stock_item, const gchar * label, const gchar * message item_hb = gtk_hbox_new(FALSE, 1); - w = BUTTON_NEW_FROM_STOCK(stock_item); + w = gtk_button_new_from_stock(stock_item); WIDGET_SET_SIZE(w, 80, 40); gtk_button_set_label(GTK_BUTTON(w), label); gtk_tooltips_set_tip(tooltips, w, tooltip, NULL); diff --git a/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c index c4773c8680..245066cdc1 100644 --- a/gtk/mcast_stream_dlg.c +++ b/gtk/mcast_stream_dlg.c @@ -456,9 +456,9 @@ mcast_on_params (GtkButton *button _U_, /* button row */ hbuttonbox = gtk_hbutton_box_new (); gtk_table_attach_defaults(GTK_TABLE(table), hbuttonbox, 0, 2, 5, 6); - ok_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK); + ok_bt = gtk_button_new_from_stock(GTK_STOCK_OK); gtk_container_add (GTK_CONTAINER (hbuttonbox), ok_bt); - cancel_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CANCEL); + cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL); gtk_container_add (GTK_CONTAINER (hbuttonbox), cancel_bt); GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT); gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END); @@ -596,7 +596,7 @@ static void mcaststream_dlg_create (void) gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_filter); gtk_tooltips_set_tip (tooltips, bt_filter, "Prepare a display filter of the selected stream", NULL); - bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close); gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL); GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index 0ce3609c80..6ae6087d89 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -907,7 +907,7 @@ create_preference_uat(GtkWidget *main_tb, int table_position, set_option_label(main_tb, table_position, label_text, tooltip_text, tooltips); - button = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_EDIT); + button = gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT); SIGNAL_CONNECT(button, "clicked", uat_window_cb, uat); diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c index 056b9504ff..8e2fa5a4e7 100644 --- a/gtk/print_dlg.c +++ b/gtk/print_dlg.c @@ -616,7 +616,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) gtk_widget_grab_focus(file_te); /* "Browse" button */ - file_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_BROWSE); + file_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_BROWSE); g_object_set_data(G_OBJECT(dest_cb), PRINT_FILE_BT_KEY, file_bt); g_object_set_data(G_OBJECT(file_bt), PRINT_TE_PTR_KEY, file_te); gtk_tooltips_set_tip (tooltips, file_bt, "Browse output filename in filesystem", NULL); diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c index ece44e59cf..017e515db4 100644 --- a/gtk/print_prefs.c +++ b/gtk/print_prefs.c @@ -117,7 +117,7 @@ GtkWidget * printer_prefs_show(void) gtk_table_attach_defaults(GTK_TABLE(main_tb), file_bt_hb, 1, 2, 3, 4); gtk_widget_show(file_bt_hb); - file_bt = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_BROWSE); + file_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_BROWSE); gtk_box_pack_end(GTK_BOX(file_bt_hb), file_bt, FALSE, FALSE, 0); gtk_widget_show(file_bt); diff --git a/gtk/profile_dlg.c b/gtk/profile_dlg.c index 99b9d6c5d7..0704e6ddd5 100644 --- a/gtk/profile_dlg.c +++ b/gtk/profile_dlg.c @@ -696,7 +696,7 @@ profile_dialog_new(void) gtk_container_add(GTK_CONTAINER(edit_fr), list_bb); gtk_widget_show(list_bb); - new_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_NEW); + new_bt = gtk_button_new_from_stock(GTK_STOCK_NEW); SIGNAL_CONNECT(new_bt, "clicked", profile_new_bt_clicked_cb, NULL); gtk_widget_show(new_bt); gtk_box_pack_start (GTK_BOX (list_bb), new_bt, FALSE, FALSE, 0); @@ -704,7 +704,7 @@ profile_dialog_new(void) "Create a new profile (with default properties)", NULL); #if 0 - copy_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_COPY); + copy_bt = gtk_button_new_from_stock(GTK_STOCK_COPY); gtk_widget_set_sensitive(copy_bt, FALSE); SIGNAL_CONNECT(copy_bt, "clicked", profile_copy_bt_clicked_cb, NULL); g_object_set_data(G_OBJECT(main_w), E_PROF_COPY_BT_KEY, copy_bt); @@ -714,7 +714,7 @@ profile_dialog_new(void) "Copy the selected profile", NULL); #endif - del_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_DELETE); + del_bt = gtk_button_new_from_stock(GTK_STOCK_DELETE); gtk_widget_set_sensitive(del_bt, FALSE); SIGNAL_CONNECT(del_bt, "clicked", profile_del_bt_clicked_cb, NULL); g_object_set_data(G_OBJECT(main_w), E_PROF_DEL_BT_KEY, del_bt); diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c index 42d7ad3d2a..1f18235e26 100644 --- a/gtk/rpc_stat.c +++ b/gtk/rpc_stat.c @@ -489,7 +489,7 @@ gtk_rpcstat_cb(GtkWidget *w _U_, gpointer d _U_) filter_box=gtk_hbox_new(FALSE, 3); /* Filter label */ - filter_bt=BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); + filter_bt=gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args); gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, FALSE, 0); gtk_widget_show(filter_bt); diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 9b52c4e2f8..c0821bc303 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -3117,12 +3117,12 @@ static void create_rtp_dialog(user_data_t* user_data) gtk_widget_show(csv_bt); SIGNAL_CONNECT(csv_bt, "clicked", save_csv_as_cb, user_data); - refresh_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_REFRESH); + refresh_bt = gtk_button_new_from_stock(GTK_STOCK_REFRESH); gtk_container_add(GTK_CONTAINER(box4), refresh_bt); gtk_widget_show(refresh_bt); SIGNAL_CONNECT(refresh_bt, "clicked", on_refresh_bt_clicked, user_data); - goto_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_JUMP_TO); + goto_bt = gtk_button_new_from_stock(GTK_STOCK_JUMP_TO); gtk_container_add(GTK_CONTAINER(box4), goto_bt); gtk_widget_show(goto_bt); SIGNAL_CONNECT(goto_bt, "clicked", on_goto_bt_clicked, user_data); @@ -3145,7 +3145,7 @@ static void create_rtp_dialog(user_data_t* user_data) gtk_widget_show(next_bt); SIGNAL_CONNECT(next_bt, "clicked", on_next_bt_clicked, user_data); - close_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add(GTK_CONTAINER(box4), close_bt); GTK_WIDGET_SET_FLAGS(close_bt, GTK_CAN_DEFAULT); gtk_widget_show(close_bt); diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c index babd60fffa..8604ea5b2f 100644 --- a/gtk/rtp_player.c +++ b/gtk/rtp_player.c @@ -1919,7 +1919,7 @@ rtp_player_dlg_create(void) SIGNAL_CONNECT(bt_stop, "clicked", on_bt_stop_clicked, NULL); gtk_tooltips_set_tip (tooltips, bt_stop, "Stop the RTP channel(s)", NULL); - bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close); GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL); diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c index cc2da94e8b..011bdb4608 100644 --- a/gtk/rtp_stream_dlg.c +++ b/gtk/rtp_stream_dlg.c @@ -763,10 +763,10 @@ static void rtpstream_dlg_create (void) gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_findrev); gtk_tooltips_set_tip (tooltips, bt_findrev, "Find the reverse stream matching the selected forward stream", NULL); /* - bt_goto = BUTTON_NEW_FROM_STOCK(GTK_STOCK_JUMP_TO); + bt_goto = gtk_button_new_from_stock(GTK_STOCK_JUMP_TO); gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_goto); */ - bt_save = BUTTON_NEW_FROM_STOCK(GTK_STOCK_SAVE_AS); + bt_save = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS); gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_save); gtk_tooltips_set_tip (tooltips, bt_save, "Save stream payload in rtpdump format", NULL); @@ -780,7 +780,7 @@ static void rtpstream_dlg_create (void) /* XXX - maybe we want to have a "Copy as CSV" stock button here? */ /*bt_copy = gtk_button_new_with_label ("Copy content to clipboard as CSV");*/ - bt_copy = BUTTON_NEW_FROM_STOCK(GTK_STOCK_COPY); + bt_copy = gtk_button_new_from_stock(GTK_STOCK_COPY); gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_copy); gtk_tooltips_set_tip(tooltips, bt_copy, "Copy all statistical values of this page to the clipboard in CSV (Comma Seperated Values) format.", NULL); @@ -789,7 +789,7 @@ static void rtpstream_dlg_create (void) gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_analyze); gtk_tooltips_set_tip (tooltips, bt_analyze, "Open an analyze window of the selected stream(s)", NULL); - bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close); gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL); GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c index 9e45f538c4..8c16d4e34d 100644 --- a/gtk/scsi_stat.c +++ b/gtk/scsi_stat.c @@ -381,7 +381,7 @@ gtk_scsistat_cb(GtkWidget *w _U_, gpointer d _U_) filter_box=gtk_hbox_new(FALSE, 3); /* Filter label */ - filter_bt=BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); + filter_bt=gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &args); gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, FALSE, 0); gtk_widget_show(filter_bt); diff --git a/gtk/sctp_assoc_analyse.c b/gtk/sctp_assoc_analyse.c index 2642c6a12b..7a9385b0a9 100644 --- a/gtk/sctp_assoc_analyse.c +++ b/gtk/sctp_assoc_analyse.c @@ -547,7 +547,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) gtk_widget_show (bt_filter); SIGNAL_CONNECT(bt_filter, "clicked", sctp_set_filter, u_data); - close_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(hbox), close_bt, FALSE, FALSE, 0); gtk_widget_show(close_bt); SIGNAL_CONNECT(close_bt, "clicked", on_close_dlg, u_data); @@ -660,7 +660,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) gtk_widget_set_sensitive(graph_bt1, FALSE); gtk_widget_set_sensitive(graph_bt2, FALSE); } - close_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(h_button_box), close_bt, FALSE, FALSE, 0); gtk_widget_show(close_bt); SIGNAL_CONNECT(close_bt, "clicked", on_close_dlg, u_data); @@ -767,7 +767,7 @@ static void create_analyse_window(struct sctp_analyse* u_data) gtk_widget_set_sensitive(graph_bt1, FALSE); gtk_widget_set_sensitive(graph_bt2, FALSE); } - close_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(h_button_box), close_bt, FALSE, FALSE, 0); gtk_widget_show(close_bt); SIGNAL_CONNECT(close_bt, "clicked", on_close_dlg, u_data); diff --git a/gtk/sctp_byte_graph_dlg.c b/gtk/sctp_byte_graph_dlg.c index 4d3ace4bfa..4c053d9e41 100644 --- a/gtk/sctp_byte_graph_dlg.c +++ b/gtk/sctp_byte_graph_dlg.c @@ -1092,7 +1092,7 @@ static void init_sctp_graph_window(struct sctp_udata *u_data) gtk_tooltips_set_tip(tooltip_out, zoomout_bt, "Zoom out one step", NULL); gtk_widget_set_sensitive(zoomout_bt, FALSE); - bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(hbox), bt_close, FALSE, FALSE, 0); gtk_widget_show(bt_close); SIGNAL_CONNECT(bt_close, "clicked", sctp_graph_close_cb, u_data); diff --git a/gtk/sctp_chunk_stat_dlg.c b/gtk/sctp_chunk_stat_dlg.c index 9ba5248762..dcb78b023f 100644 --- a/gtk/sctp_chunk_stat_dlg.c +++ b/gtk/sctp_chunk_stat_dlg.c @@ -318,7 +318,7 @@ gtk_sctpstat_dlg(struct sctp_udata *u_data, unsigned int direction) gtk_button_box_set_child_ipadding(GTK_BUTTON_BOX (hbuttonbox2), 4, 0); gtk_widget_show(hbuttonbox2); - bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_close); gtk_widget_show (bt_close); @@ -436,7 +436,7 @@ static void sctp_chunk_dlg(struct sctp_udata *u_data) gtk_button_box_set_child_ipadding(GTK_BUTTON_BOX (h_button_box), 4, 0); gtk_widget_show(h_button_box); - close_bt = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(h_button_box), close_bt, FALSE, FALSE, 0); gtk_widget_show(close_bt); SIGNAL_CONNECT(close_bt, "clicked", on_close_dlg, u_data); diff --git a/gtk/sctp_error_dlg.c b/gtk/sctp_error_dlg.c index b9f09f1c16..b231898eed 100644 --- a/gtk/sctp_error_dlg.c +++ b/gtk/sctp_error_dlg.c @@ -216,7 +216,7 @@ gtk_sctperror_dlg(void) gtk_widget_show (bt_frame); gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_frame); - bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_widget_show (bt_close); gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_close); diff --git a/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c index 15572b93d9..e2deca7e72 100644 --- a/gtk/sctp_graph_dlg.c +++ b/gtk/sctp_graph_dlg.c @@ -1168,7 +1168,7 @@ static void init_sctp_graph_window(struct sctp_udata *u_data) gtk_tooltips_set_tip(tooltip_out, zoomout_bt, "Zoom out one step", NULL); gtk_widget_set_sensitive(zoomout_bt, FALSE); - bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(hbox), bt_close, FALSE, FALSE, 0); gtk_widget_show(bt_close); SIGNAL_CONNECT(bt_close, "clicked", sctp_graph_close_cb, u_data); diff --git a/gtk/sctp_stat_dlg.c b/gtk/sctp_stat_dlg.c index 8526ba24f5..e4f50d050e 100644 --- a/gtk/sctp_stat_dlg.c +++ b/gtk/sctp_stat_dlg.c @@ -590,7 +590,7 @@ gtk_sctpstat_dlg(void) gtk_widget_show (bt_analyse); gtk_widget_set_sensitive(bt_analyse,FALSE); - bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_close); GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); window_set_cancel_button( sctp_stat_dlg_w, bt_close, sctp_stat_on_close); diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c index edfafddce8..0e8befb0cb 100644 --- a/gtk/tap_dfilter_dlg.c +++ b/gtk/tap_dfilter_dlg.c @@ -201,7 +201,7 @@ tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data) filter_box=gtk_hbox_new(FALSE, 3); /* Filter button */ - filter_bt=BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); + filter_bt=gtk_button_new_from_stock(WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY); SIGNAL_CONNECT(filter_bt, "clicked", display_filter_construct_cb, &(current_dlg->args)); gtk_box_pack_start(GTK_BOX(filter_box), filter_bt, FALSE, TRUE, 0); gtk_widget_show(filter_bt); diff --git a/gtk/uat_gui.c b/gtk/uat_gui.c index 98fd92862c..e2a6d29feb 100644 --- a/gtk/uat_gui.c +++ b/gtk/uat_gui.c @@ -887,16 +887,16 @@ static GtkWidget* uat_window(void* u) { gtk_box_pack_end(GTK_BOX(vbox), edit_hbox, TRUE, FALSE, 0); - rep->bt_down = BUTTON_NEW_FROM_STOCK(GTK_STOCK_GO_DOWN); - rep->bt_up = BUTTON_NEW_FROM_STOCK(GTK_STOCK_GO_UP); + rep->bt_down = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN); + rep->bt_up = gtk_button_new_from_stock(GTK_STOCK_GO_UP); gtk_box_pack_start(GTK_BOX(move_hbox), rep->bt_up, TRUE, FALSE, 5); gtk_box_pack_start(GTK_BOX(move_hbox), rep->bt_down, TRUE, FALSE, 5); - rep->bt_new = BUTTON_NEW_FROM_STOCK(GTK_STOCK_NEW); - rep->bt_edit = BUTTON_NEW_FROM_STOCK(WIRESHARK_STOCK_EDIT); - rep->bt_delete = BUTTON_NEW_FROM_STOCK(GTK_STOCK_DELETE); + rep->bt_new = gtk_button_new_from_stock(GTK_STOCK_NEW); + rep->bt_edit = gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT); + rep->bt_delete = gtk_button_new_from_stock(GTK_STOCK_DELETE); gtk_box_pack_end(GTK_BOX(edit_hbox), rep->bt_new, TRUE, FALSE, 5); gtk_box_pack_end(GTK_BOX(edit_hbox), rep->bt_edit, TRUE, FALSE, 5); diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c index 1cd1cdb8f7..3f1fd15562 100644 --- a/gtk/voip_calls_dlg.c +++ b/gtk/voip_calls_dlg.c @@ -787,7 +787,7 @@ static void voip_calls_dlg_create (void) GTK_WIDGET_SET_FLAGS(bt_select_all, GTK_CAN_DEFAULT); gtk_tooltips_set_tip (tooltips, bt_select_all, "Select all the calls", NULL); - bt_close = BUTTON_NEW_FROM_STOCK(GTK_STOCK_CLOSE); + bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close); GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); gtk_tooltips_set_tip (tooltips, bt_close, "Close this dialog", NULL); |