osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

More -DGSEAL_ENABLE cleanup in preparation for GTK+ 3.0 

svn path=/trunk/; revision=35848
This commit is contained in:
Stephen Fisher 2011-02-07 18:38:33 +00:00
parent 2b049e573d
commit 88ea7649d5
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/decode_as_dlg.c
View File

@ -1762,14 +1762,22 @@ 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_tooltips_set_tip(tooltips, button,
"Open a dialog showing the current settings.", NULL);
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_tooltips_set_tip(tooltips, button,
"Clear ALL settings.", NULL);

4
gtk/pixmap_save.c
View File

@ -174,7 +174,11 @@ pixmap_save_cb(GtkWidget *w, gpointer pixmap_ptr _U_)
gtk_widget_show(save_as_w);
window_present(save_as_w);
parent = gtk_widget_get_parent_window(w);
#if GTK_CHECK_VERSION(2,14,0)
gdk_window_set_transient_for(gtk_widget_get_window(save_as_w), parent);
#else
gdk_window_set_transient_for(save_as_w->window, parent);
#endif
#if 0
if(gtk_dialog_run(GTK_DIALOG(save_as_w)) == GTK_RESPONSE_ACCEPT)