diff options
-rw-r--r-- | ui/gtk/airpcap_dlg.c | 44 | ||||
-rw-r--r-- | ui/gtk/color_edit_dlg.c | 12 | ||||
-rw-r--r-- | ui/gtk/decode_as_dlg.c | 8 | ||||
-rw-r--r-- | ui/gtk/dlg_utils.c | 16 | ||||
-rw-r--r-- | ui/gtk/filter_autocomplete.c | 12 | ||||
-rw-r--r-- | ui/gtk/flow_graph.c | 4 | ||||
-rw-r--r-- | ui/gtk/funnel_stat.c | 8 | ||||
-rw-r--r-- | ui/gtk/graph_analysis.c | 8 | ||||
-rw-r--r-- | ui/gtk/iax2_analysis.c | 4 | ||||
-rw-r--r-- | ui/gtk/mcast_stream_dlg.c | 8 | ||||
-rw-r--r-- | ui/gtk/old-gtk-compat.h | 2 | ||||
-rw-r--r-- | ui/gtk/rtp_analysis.c | 4 | ||||
-rw-r--r-- | ui/gtk/rtp_player.c | 8 | ||||
-rw-r--r-- | ui/gtk/rtp_stream_dlg.c | 4 | ||||
-rw-r--r-- | ui/gtk/sctp_stat_dlg.c | 4 | ||||
-rw-r--r-- | ui/gtk/voip_calls_dlg.c | 8 |
16 files changed, 2 insertions, 152 deletions
diff --git a/ui/gtk/airpcap_dlg.c b/ui/gtk/airpcap_dlg.c index 30fa398043..1798e0c60a 100644 --- a/ui/gtk/airpcap_dlg.c +++ b/ui/gtk/airpcap_dlg.c @@ -1086,21 +1086,13 @@ on_add_new_key_bt_clicked(GtkWidget *button _U_, gpointer data) gtk_widget_set_name (ok_bt, "ok_bt"); gtk_widget_show (ok_bt); gtk_container_add (GTK_CONTAINER (low_h_button_box), ok_bt); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default (ok_bt, TRUE); -#else - GTK_WIDGET_SET_FLAGS (ok_bt, GTK_CAN_DEFAULT); -#endif cancel_bt = gtk_button_new_with_mnemonic ("Cancel"); gtk_widget_set_name (cancel_bt, "cancel_bt"); gtk_widget_show (cancel_bt); gtk_container_add (GTK_CONTAINER (low_h_button_box), cancel_bt); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default (cancel_bt, TRUE); -#else - GTK_WIDGET_SET_FLAGS (cancel_bt, GTK_CAN_DEFAULT); -#endif add_frame_lb = gtk_label_new ("<b>Modify Selected Key</b>"); gtk_widget_set_name (add_frame_lb, "add_frame_lb"); @@ -1332,21 +1324,13 @@ on_edit_key_bt_clicked(GtkWidget *button _U_, gpointer data) gtk_widget_set_name (ok_bt, "ok_bt"); gtk_widget_show (ok_bt); gtk_container_add (GTK_CONTAINER (low_h_button_box), ok_bt); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default (ok_bt, TRUE); -#else - GTK_WIDGET_SET_FLAGS (ok_bt, GTK_CAN_DEFAULT); -#endif cancel_bt = gtk_button_new_with_mnemonic ("Cancel"); gtk_widget_set_name (cancel_bt, "cancel_bt"); gtk_widget_show (cancel_bt); gtk_container_add (GTK_CONTAINER (low_h_button_box), cancel_bt); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default (cancel_bt, TRUE); -#else - GTK_WIDGET_SET_FLAGS (cancel_bt, GTK_CAN_DEFAULT); -#endif edit_frame_lb = gtk_label_new ("<b>Modify Selected Key</b>"); gtk_widget_set_name (edit_frame_lb, "edit_frame_lb"); @@ -2230,51 +2214,31 @@ display_airpcap_key_management_cb(GtkWidget *w _U_, gpointer data) gtk_widget_set_name (add_new_key_bt, "add_new_key_bt"); gtk_widget_show (add_new_key_bt); gtk_container_add (GTK_CONTAINER (key_v_button_box), add_new_key_bt); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default (add_new_key_bt, TRUE); -#else - GTK_WIDGET_SET_FLAGS (add_new_key_bt, GTK_CAN_DEFAULT); -#endif edit_key_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT); gtk_widget_set_name (edit_key_bt, "edit_key_bt"); gtk_widget_show (edit_key_bt); gtk_container_add (GTK_CONTAINER (key_v_button_box), edit_key_bt); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default (edit_key_bt, TRUE); -#else - GTK_WIDGET_SET_FLAGS (edit_key_bt, GTK_CAN_DEFAULT); -#endif remove_key_bt = gtk_button_new_from_stock(GTK_STOCK_DELETE); gtk_widget_set_name (remove_key_bt, "remove_key_bt"); gtk_widget_show (remove_key_bt); gtk_container_add (GTK_CONTAINER (key_v_button_box), remove_key_bt); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default (remove_key_bt, TRUE); -#else - GTK_WIDGET_SET_FLAGS (remove_key_bt, GTK_CAN_DEFAULT); -#endif move_key_up_bt = gtk_button_new_from_stock(GTK_STOCK_GO_UP); gtk_widget_set_name (move_key_up_bt, "move_key_up_bt"); gtk_widget_show (move_key_up_bt); gtk_container_add (GTK_CONTAINER (key_v_button_box), move_key_up_bt); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default (move_key_up_bt, TRUE); -#else - GTK_WIDGET_SET_FLAGS (move_key_up_bt, GTK_CAN_DEFAULT); -#endif move_key_down_bt = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN); gtk_widget_set_name (move_key_down_bt, "move_key_down_bt"); gtk_widget_show (move_key_down_bt); gtk_container_add (GTK_CONTAINER (key_v_button_box), move_key_down_bt); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default (move_key_down_bt, TRUE); -#else - GTK_WIDGET_SET_FLAGS (move_key_down_bt, GTK_CAN_DEFAULT); -#endif keys_frame_lb = gtk_label_new ("<b>Decryption Keys</b>"); gtk_widget_set_name (keys_frame_lb, "keys_frame_lb"); @@ -2775,21 +2739,13 @@ airpcap_keys_check_w(GtkWidget *w, gpointer data _U_) gtk_widget_set_name (ok_bt, "ok_bt"); gtk_widget_show (ok_bt); gtk_container_add (GTK_CONTAINER (low_h_button_box), ok_bt); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default (ok_bt, TRUE); -#else - GTK_WIDGET_SET_FLAGS (ok_bt, GTK_CAN_DEFAULT); -#endif cancel_bt = gtk_button_new_with_mnemonic ("Cancel"); gtk_widget_set_name (cancel_bt, "cancel_bt"); gtk_widget_show (cancel_bt); gtk_container_add (GTK_CONTAINER (low_h_button_box), cancel_bt); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default (cancel_bt, TRUE); -#else - GTK_WIDGET_SET_FLAGS (cancel_bt, GTK_CAN_DEFAULT); -#endif /* Store pointers to all widgets, for use by lookup_widget(). */ g_signal_connect (ok_bt, "clicked", G_CALLBACK(on_keys_check_ok_bt_clicked), keys_check_w); diff --git a/ui/gtk/color_edit_dlg.c b/ui/gtk/color_edit_dlg.c index db1d7e24a7..b46f8c0aac 100644 --- a/ui/gtk/color_edit_dlg.c +++ b/ui/gtk/color_edit_dlg.c @@ -507,19 +507,11 @@ color_sel_win_new(color_filter_t *colorf, gboolean is_bg) g_object_get(color_sel_win, "ok-button", &color_sel_ok, NULL); g_object_set_data(G_OBJECT(color_sel_win), "color_sel_ok", color_sel_ok); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(color_sel_ok, TRUE); -#else - GTK_WIDGET_SET_FLAGS (color_sel_ok, GTK_CAN_DEFAULT); -#endif g_object_get(color_sel_win, "cancel-button", &color_sel_cancel, NULL); g_object_set_data(G_OBJECT(color_sel_win), "color_sel_cancel", color_sel_cancel); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(color_sel_cancel, TRUE); -#else - GTK_WIDGET_SET_FLAGS (color_sel_cancel, GTK_CAN_DEFAULT); -#endif window_set_cancel_button(color_sel_win, color_sel_cancel, NULL); /* ensure esc does req'd local cxl action. */ /* esc as handled by the */ /* gtk_color_selection_dialog widget */ @@ -527,11 +519,7 @@ color_sel_win_new(color_filter_t *colorf, gboolean is_bg) g_object_get(color_sel_win, "help-button", &color_sel_help, NULL); g_object_set_data(G_OBJECT(color_sel_win), "color_sel_help", color_sel_help); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(color_sel_help, TRUE); -#else - GTK_WIDGET_SET_FLAGS (color_sel_help, GTK_CAN_DEFAULT); -#endif g_signal_connect(color_sel_ok, "clicked", G_CALLBACK(color_sel_ok_cb), color_sel_win); g_signal_connect(color_sel_cancel, "clicked", G_CALLBACK(color_sel_cancel_cb), color_sel_win); diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c index fed848bd41..59f35eafa4 100644 --- a/ui/gtk/decode_as_dlg.c +++ b/ui/gtk/decode_as_dlg.c @@ -1970,22 +1970,14 @@ decode_as_cb (GtkWidget * w _U_, gpointer user_data _U_) button = gtk_button_new_with_label("Show Current"); g_signal_connect(button, "clicked", G_CALLBACK(decode_show_cb), NULL); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(button, TRUE); -#else - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); -#endif gtk_box_pack_start(GTK_BOX(button_vb), button, FALSE, FALSE, 0); gtk_widget_set_tooltip_text(button, "Open a dialog showing the current settings.\n" "Note you need to select and press apply first to be able to save the current setting"); button = gtk_button_new_from_stock(GTK_STOCK_CLEAR); g_signal_connect(button, "clicked", G_CALLBACK(decode_clear_cb), NULL); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(button, TRUE); -#else - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); -#endif gtk_box_pack_start(GTK_BOX(button_vb), button, FALSE, FALSE, 0); gtk_widget_set_tooltip_text(button, "Clear ALL settings."); diff --git a/ui/gtk/dlg_utils.c b/ui/gtk/dlg_utils.c index 80ad688af2..a850716221 100644 --- a/ui/gtk/dlg_utils.c +++ b/ui/gtk/dlg_utils.c @@ -48,11 +48,7 @@ dlg_button_new(GtkWidget *hbox, GtkWidget *button_hbox, const gchar *stock_id) GtkWidget *button; button = gtk_button_new_from_stock(stock_id); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(button, TRUE); -#else - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); -#endif g_object_set_data(G_OBJECT(hbox), stock_id, button); gtk_box_pack_end(GTK_BOX(button_hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); @@ -250,11 +246,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...) /* do we have a help button? -> special handling for it */ if (help) { button = gtk_button_new_from_stock(help); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(button, TRUE); -#else - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); -#endif g_object_set_data(G_OBJECT(hbox), help, button); gtk_box_pack_start(GTK_BOX(help_hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); @@ -264,11 +256,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...) /* do we have a copy button? -> special handling for it */ if (copy) { button = gtk_button_new_from_stock(copy); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(button, TRUE); -#else - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); -#endif g_object_set_data(G_OBJECT(hbox), copy, button); gtk_box_pack_start(GTK_BOX(help_hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); @@ -297,11 +285,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...) /* do we have a map button? -> special handling for it */ if (map) { button = gtk_button_new_from_stock(map); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(button, TRUE); -#else - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); -#endif g_object_set_data(G_OBJECT(hbox), map, button); gtk_box_pack_start(GTK_BOX(help_hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); diff --git a/ui/gtk/filter_autocomplete.c b/ui/gtk/filter_autocomplete.c index c5e7e21f6e..cbafdc0165 100644 --- a/ui/gtk/filter_autocomplete.c +++ b/ui/gtk/filter_autocomplete.c @@ -322,11 +322,7 @@ autocompletion_list_lookup(GtkWidget *filter_te, GtkWidget *popup_win, GtkWidget #else gtk_widget_size_request(list, &requisition); #endif -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_get_allocation(popup_win, &popup_win_alloc); -#else - popup_win_alloc = popup_win->allocation; -#endif gtk_widget_set_size_request(popup_win, popup_win_alloc.width, (requisition.height<200? requisition.height+8:200)); @@ -766,11 +762,7 @@ filter_autocomplete_new(GtkWidget *filter_te, const gchar *protocol_name, #else gtk_widget_size_request(treeview, &requisition); #endif -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_get_allocation(filter_te, &filter_te_alloc); -#else - filter_te_alloc = filter_te->allocation; -#endif gtk_widget_set_size_request(popup_win, filter_te_alloc.width, (requisition.height<200? requisition.height+8:200)); @@ -847,11 +839,7 @@ filter_autocomplete_handle_backspace(GtkWidget *filter_te, GtkWidget *list, GtkW gtk_widget_size_request(list, &requisition); #endif -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_get_allocation(popup_win, &popup_win_alloc); -#else - popup_win_alloc = popup_win->allocation; -#endif /* XXX use gtk_window_set_default_size()? */ gtk_widget_set_size_request(popup_win, popup_win_alloc.width, diff --git a/ui/gtk/flow_graph.c b/ui/gtk/flow_graph.c index c61a4ec7ab..42584ac5af 100644 --- a/ui/gtk/flow_graph.c +++ b/ui/gtk/flow_graph.c @@ -607,11 +607,7 @@ flow_graph_dlg_create (void) bt_cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL); gtk_box_pack_start(GTK_BOX(hbuttonbox), bt_cancel, TRUE, TRUE, 0); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(bt_cancel, TRUE); -#else - GTK_WIDGET_SET_FLAGS(bt_cancel, GTK_CAN_DEFAULT); -#endif gtk_widget_set_tooltip_text (bt_cancel, "Cancel this dialog"); window_set_cancel_button(flow_graph_dlg_w, bt_cancel, window_cancel_button_cb); diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c index b4f63350b3..87bee553c3 100644 --- a/ui/gtk/funnel_stat.c +++ b/ui/gtk/funnel_stat.c @@ -196,11 +196,7 @@ static funnel_text_window_t* new_text_window(const gchar* title) { gtk_box_pack_start(GTK_BOX(main_vb), hbox, FALSE, FALSE, 0); tw->bt_close = gtk_button_new_with_label("Close"); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(tw->bt_close, TRUE); -#else - GTK_WIDGET_SET_FLAGS(tw->bt_close, GTK_CAN_DEFAULT); -#endif g_object_set_data(G_OBJECT(hbox), "Close", tw->bt_close); gtk_box_pack_end(GTK_BOX(hbox), tw->bt_close, FALSE, FALSE, 0); @@ -364,11 +360,7 @@ static void text_window_add_button(funnel_text_window_t* tw, funnel_bt_t* cbd, g_ptr_array_add(tw->buttons,cbd); button = gtk_button_new_with_label(label); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(button, TRUE); -#else - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); -#endif gtk_box_pack_start(GTK_BOX(tw->button_hbox), button, FALSE, FALSE, 0); diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c index 19a11f2fe9..9cfd7a03f9 100644 --- a/ui/gtk/graph_analysis.c +++ b/ui/gtk/graph_analysis.c @@ -1825,11 +1825,7 @@ static void create_draw_area(graph_analysis_data_t *user_data, GtkWidget *box) gtk_container_add(GTK_CONTAINER(viewport), user_data->dlg.draw_area); gtk_container_add(GTK_CONTAINER(user_data->dlg.scroll_window), viewport); gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_focus(user_data->dlg.draw_area, TRUE); -#else - GTK_WIDGET_SET_FLAGS(user_data->dlg.draw_area, GTK_CAN_FOCUS); -#endif gtk_widget_grab_focus(user_data->dlg.draw_area); /* signals needed to handle backing pixmap */ @@ -1959,11 +1955,7 @@ static void dialog_graph_create_window(graph_analysis_data_t *user_data) bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_box_pack_start(GTK_BOX(hbuttonbox), bt_close, TRUE, TRUE, 0); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(bt_close, TRUE); -#else - GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); -#endif gtk_widget_show(bt_close); gtk_widget_set_tooltip_text(bt_close, "Close this dialog"); window_set_cancel_button(user_data->dlg.window, bt_close, window_cancel_button_cb); diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c index 95676346ea..3c9ba7854e 100644 --- a/ui/gtk/iax2_analysis.c +++ b/ui/gtk/iax2_analysis.c @@ -3381,11 +3381,7 @@ static void create_iax2_dialog(user_data_t* user_data) close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add(GTK_CONTAINER(box4), close_bt); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(close_bt, TRUE); -#else - GTK_WIDGET_SET_FLAGS(close_bt, GTK_CAN_DEFAULT); -#endif gtk_widget_show(close_bt); window_set_cancel_button(window, close_bt, window_cancel_button_cb); diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c index 9d38864afb..cc75b34202 100644 --- a/ui/gtk/mcast_stream_dlg.c +++ b/ui/gtk/mcast_stream_dlg.c @@ -336,11 +336,7 @@ mcast_on_params(GtkButton *button _U_, gpointer data _U_) gtk_container_add (GTK_CONTAINER(hbuttonbox), ok_bt); cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL); gtk_container_add (GTK_CONTAINER(hbuttonbox), cancel_bt); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(cancel_bt, TRUE); -#else - GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT); -#endif gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END); gtk_box_set_spacing(GTK_BOX(hbuttonbox), 0); @@ -701,11 +697,7 @@ mcaststream_dlg_create(void) bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close); gtk_widget_set_tooltip_text (bt_close, "Close this dialog"); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(bt_close, TRUE); -#else - GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); -#endif /*g_signal_connect(bt_unselect, "clicked", G_CALLBACK(mcaststream_on_unselect), NULL);*/ g_signal_connect(bt_params, "clicked", G_CALLBACK(mcast_on_params), NULL); diff --git a/ui/gtk/old-gtk-compat.h b/ui/gtk/old-gtk-compat.h index 38816574e9..ceec1146a8 100644 --- a/ui/gtk/old-gtk-compat.h +++ b/ui/gtk/old-gtk-compat.h @@ -56,6 +56,8 @@ # define gtk_widget_get_sensitive(x) GTK_WIDGET_SENSITIVE(x) # define gtk_widget_is_drawable(x) GDK_IS_DRAWABLE(x) # define gtk_widget_set_window(x, y) (x)->window = (y) +# define gtk_widget_set_can_default(w,y) if(y==TRUE){GTK_WIDGET_SET_FLAGS (w, GTK_CAN_DEFAULT);}else{GTK_WIDGET_UNSET_FLAGS (w, GTK_CAN_DEFAULT);} +# define gtk_widget_set_can_focus(w,y) if(y==TRUE){GTK_WIDGET_SET_FLAGS (w, GTK_CAN_FOCUS);}else{GTK_WIDGET_UNSET_FLAGS (w, GTK_CAN_FOCUS);} #endif #if !GTK_CHECK_VERSION (2, 20, 0) diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c index 898c75dcd1..c7d0661e54 100644 --- a/ui/gtk/rtp_analysis.c +++ b/ui/gtk/rtp_analysis.c @@ -3548,11 +3548,7 @@ static void create_rtp_dialog(user_data_t* user_data) close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add(GTK_CONTAINER(box4), close_bt); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(close_bt, TRUE); -#else - GTK_WIDGET_SET_FLAGS(close_bt, GTK_CAN_DEFAULT); -#endif gtk_widget_show(close_bt); window_set_cancel_button(window, close_bt, window_cancel_button_cb); diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c index 46874ff1fb..c9e5653087 100644 --- a/ui/gtk/rtp_player.c +++ b/ui/gtk/rtp_player.c @@ -1788,11 +1788,7 @@ add_channel_to_window(gchar *key _U_ , rtp_channel_info_t *rci, guint *counter _ gtk_container_add(GTK_CONTAINER(rci->scroll_window), viewport); gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE); gtk_widget_add_events (rci->draw_area, GDK_BUTTON_PRESS_MASK); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_focus(rci->draw_area, TRUE); -#else - GTK_WIDGET_SET_FLAGS(rci->draw_area, GTK_CAN_FOCUS); -#endif gtk_widget_grab_focus(rci->draw_area); gtk_box_pack_start(GTK_BOX (channels_vb), rci->scroll_window, FALSE, FALSE, 0); @@ -2407,11 +2403,7 @@ rtp_player_dlg_create(void) bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(bt_close, TRUE); -#else - GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); -#endif gtk_widget_set_tooltip_text (bt_close, "Close this dialog"); window_set_cancel_button(rtp_player_dlg_w, bt_close, window_cancel_button_cb); diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c index 8c966255bc..3abcc8e82f 100644 --- a/ui/gtk/rtp_stream_dlg.c +++ b/ui/gtk/rtp_stream_dlg.c @@ -1039,11 +1039,7 @@ rtpstream_dlg_create (void) bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close); gtk_widget_set_tooltip_text (bt_close, "Close this dialog"); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(bt_close, TRUE); -#else - GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); -#endif g_signal_connect(bt_unselect, "clicked", G_CALLBACK(rtpstream_on_unselect), NULL); g_signal_connect(bt_findrev, "clicked", G_CALLBACK(rtpstream_on_findrev), NULL); diff --git a/ui/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c index 8874d739aa..cda40fc2b9 100644 --- a/ui/gtk/sctp_stat_dlg.c +++ b/ui/gtk/sctp_stat_dlg.c @@ -612,11 +612,7 @@ gtk_sctpstat_dlg(void) bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_close); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(bt_close, TRUE); -#else - GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); -#endif window_set_cancel_button( sctp_stat_dlg_w, bt_close, sctp_stat_on_close); gtk_widget_grab_focus(bt_close); gtk_widget_show (bt_close); diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c index 4b52fd6c4e..0c440ccffb 100644 --- a/ui/gtk/voip_calls_dlg.c +++ b/ui/gtk/voip_calls_dlg.c @@ -736,20 +736,12 @@ voip_calls_dlg_create(void) bt_select_all = gtk_button_new_from_stock(GTK_STOCK_SELECT_ALL); gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_select_all); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(bt_select_all, TRUE); -#else - GTK_WIDGET_SET_FLAGS(bt_select_all, GTK_CAN_DEFAULT); -#endif gtk_widget_set_tooltip_text(bt_select_all, "Select all the calls"); bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_container_add(GTK_CONTAINER (hbuttonbox), bt_close); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_can_default(bt_close, TRUE); -#else - GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT); -#endif gtk_widget_set_tooltip_text(bt_close, "Close this dialog"); /*g_signal_connect(bt_unselect, "clicked", G_CALLBACK(voip_calls_on_unselect), NULL);*/ |