From 95c698c4428ecfb443f7edfee38328e9582a598a Mon Sep 17 00:00:00 2001 From: jmayer Date: Thu, 14 Jul 2011 00:04:37 +0000 Subject: Fix some compiler errors with -DGTK_DISABLE_DEPRECATED git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38006 f5534014-38df-0310-8fa8-9805f1628bb7 --- gtk/mcast_stream_dlg.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gtk/mcast_stream_dlg.c') diff --git a/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c index 736bfc2c4b..95bad12ade 100644 --- a/gtk/mcast_stream_dlg.c +++ b/gtk/mcast_stream_dlg.c @@ -336,7 +336,11 @@ 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); @@ -696,7 +700,11 @@ 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); -- cgit v1.2.3