Hi,

[v|h]box deprecated? Well, that's going to impact nearly any dialog I presume? Wouldn't that call for a gtk3 folder?

Thanks,
Jaap

On 2011-11-29 17:55, Anders Broman wrote:

Hi, I decided to go for gtk_box_new() as a replacement rather than the grid stuff at least to start with as that's GTK 3.0 compatible. Here's an example perhaps it would have been cleaner to #ifdef the whole file. Regards Anders -----Original Message----- From: Anders Broman Sent: den 29 november 2011 17:37 To: a.broman-cgr7CL/LOSDk1uMJSBkQmQ@public.gmane.org Subject: GTK3+ Index: gtk/about_dlg.c =================================================================== --- gtk/about_dlg.c (revision 40034) +++ gtk/about_dlg.c (working copy) <at> <at> -105,7 +105,59 <at> <at> the splash screen window gets updated. */ while (gtk_events_pending()) gtk_main_iteration(); } +#if GTK_CHECK_VERSION(3,0,0) +GtkWidget* +splash_new(const char *message) +{ + GtkWidget *win; + GtkWidget *main_lb; + GtkWidget *main_box; + GtkWidget *percentage_box; + GtkWidget *prog_bar; + GtkWidget *percentage_lb; + + win = splash_window_new(); + + /* When calling about_wireshark(), we must realize the top-level + widget for the window, otherwise GTK will throw a warning + because we don't have a colormap associated with that window and + can't handle the pixmap. */ + gtk_widget_realize(win); + + main_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); + gtk_container_set_border_width(GTK_CONTAINER(main_box), 24); + gtk_container_add(GTK_CONTAINER(win), main_box); + + about_wireshark(win, main_box); + + main_lb = gtk_label_new(message); + gtk_container_add(GTK_CONTAINER(main_box), main_lb); + g_object_set_data(G_OBJECT(win), "splash_label", main_lb); + + main_lb = gtk_label_new(""); + gtk_container_add(GTK_CONTAINER(main_box), main_lb); + g_object_set_data(G_OBJECT(win), "protocol_label", main_lb); + + percentage_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1); + gtk_box_pack_start(GTK_BOX(main_box), percentage_box, TRUE, TRUE, + 3); + + prog_bar = gtk_progress_bar_new(); + gtk_box_pack_start(GTK_BOX(percentage_box), prog_bar, TRUE, TRUE, 3); + g_object_set_data(G_OBJECT(win), "progress_bar", prog_bar); + + percentage_lb = gtk_label_new(" 0%"); + gtk_misc_set_alignment(GTK_MISC(percentage_lb), 0.0f, 0.0f); + gtk_box_pack_start(GTK_BOX(percentage_box), percentage_lb, FALSE, TRUE, 3); + g_object_set_data(G_OBJECT(win), "percentage_label", percentage_lb); + + gtk_widget_show_all(win); + + splash_update_label(win, message); + + return win; +} +#else GtkWidget* splash_new(const char *message) { <at> <at> -157,6 +209,7 <at> <at> return win; } +#endif /* GTK_CHECK_VERSION(3,0,0) */ void splash_update(register_action_e action, const char *message, gpointer client_data) <at> <at> -294,9 +347,49 <at> <at> return FALSE; } +#if GTK_CHECK_VERSION(3,0,0) static GtkWidget * about_wireshark_page_new(void) { + GtkWidget *main_box, *msg_label /*, *icon*/; + gchar *message; + + main_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); + gtk_container_set_border_width(GTK_CONTAINER(main_box), 12); + + g_object_set(gtk_widget_get_settings(main_box), + "gtk-label-select-on-focus", FALSE, NULL); + + about_wireshark(top_level, main_box); + + /* Construct the message string */ + message = g_strdup_printf( + "Version " VERSION "%s\n" + "\n" + "%s" + "\n" + "%s" + "\n" + "%s" + "\n" + "Wireshark is Open Source Software released under the GNU General Public License.\n" + "\n" + "Check the man page and http://www.wireshark.org for more information.", + wireshark_svnversion, get_copyright_info(), comp_info_str->str, + runtime_info_str->str); + + msg_label = gtk_label_new(message); + g_free(message); + gtk_label_set_justify(GTK_LABEL(msg_label), GTK_JUSTIFY_FILL); + gtk_label_set_selectable(GTK_LABEL(msg_label), TRUE); + gtk_container_add(GTK_CONTAINER(main_box), msg_label); + + return main_box; +} +#else +static GtkWidget * +about_wireshark_page_new(void) +{ GtkWidget *main_vb, *msg_label /*, *icon*/; gchar *message; <at> <at> -332,7 +425,7 <at> <at> return main_vb; } - +#endif /* GTK_CHECK_VERSION(3,0,0) */ static GtkWidget * about_authors_page_new(void) { <at> <at> -500,9 +593,88 <at> <at> return page; } +#if GTK_CHECK_VERSION(3,0,0) void about_wireshark_cb( GtkWidget *w _U_, gpointer data _U_ ) { + GtkWidget *main_box, *main_nb, *bbox, *ok_btn; + GtkWidget *page_lb, *about_page, *folders_page; + +#if defined(HAVE_PLUGINS) || defined(HAVE_LUA_5_1) + GtkWidget *plugins_page; +#endif + + GtkWidget *authors_page, *license_page; + + if (about_wireshark_w != NULL) { + /* There's already an "About Wireshark" dialog box; reactivate it. */ + reactivate_window(about_wireshark_w); + return; + } + + /* + * XXX - use GtkDialog? The GNOME 2.x GnomeAbout widget does. + * Should we use GtkDialog for simple_dialog() as well? Or + * is the GTK+ 2.x GtkDialog appropriate but the 1.2[.x] one + * not? (The GNOME 1.x GnomeAbout widget uses GnomeDialog.) + */ + about_wireshark_w = dlg_window_new("About Wireshark"); + /* set the initial position (must be done, before show is called!) */ + /* default position is not appropriate for the about dialog */ + gtk_window_set_position(GTK_WINDOW(about_wireshark_w), GTK_WIN_POS_CENTER_ON_PARENT); + gtk_window_set_default_size(GTK_WINDOW(about_wireshark_w), 600, 400); + gtk_container_set_border_width(GTK_CONTAINER(about_wireshark_w), 6); + + main_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); + gtk_container_set_border_width(GTK_CONTAINER(main_box), 6); + gtk_container_add(GTK_CONTAINER(about_wireshark_w), main_box); + + main_nb = gtk_notebook_new(); + gtk_box_pack_start(GTK_BOX(main_box), main_nb, TRUE, TRUE, 0); + + about_page = about_wireshark_page_new(); page_lb = + gtk_label_new("Wireshark"); + gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), about_page, page_lb); + + authors_page = about_authors_page_new(); page_lb = + gtk_label_new("Authors"); + gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), authors_page, + page_lb); + + folders_page = about_folders_page_new(); page_lb = + gtk_label_new("Folders"); + gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), folders_page, + page_lb); + +#if defined(HAVE_PLUGINS) || defined(HAVE_LUA_5_1) + plugins_page = about_plugins_page_new(); + page_lb = gtk_label_new("Plugins"); + gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), plugins_page, +page_lb); #endif + + license_page = about_license_page_new(); page_lb = + gtk_label_new("License"); + /* set a minmum width to avoid a lot of line breaks at the wrong + places */ gtk_widget_set_size_request(license_page, 600, -1); + gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), license_page, + page_lb); + + /* Button row */ + bbox = dlg_button_row_new(GTK_STOCK_OK, NULL); + gtk_box_pack_start(GTK_BOX(main_box), bbox, FALSE, FALSE, 0); + + ok_btn = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); + gtk_widget_grab_focus(ok_btn); gtk_widget_grab_default(ok_btn); + window_set_cancel_button(about_wireshark_w, ok_btn, + window_cancel_button_cb); + + g_signal_connect(about_wireshark_w, "delete_event", + G_CALLBACK(window_delete_event_cb), NULL); + g_signal_connect(about_wireshark_w, "destroy", + G_CALLBACK(about_wireshark_destroy_cb), NULL); + + gtk_widget_show_all(about_wireshark_w); + window_present(about_wireshark_w); +} +#else +void +about_wireshark_cb( GtkWidget *w _U_, gpointer data _U_ ) { GtkWidget *main_vb, *main_nb, *bbox, *ok_btn; GtkWidget *page_lb, *about_page, *folders_page; <at> <at> -577,6 +749,7 <at> <at> gtk_widget_show_all(about_wireshark_w); window_present(about_wireshark_w); } +#endif /*GTK_CHECK_VERSION(3,0,0)*/ static void about_wireshark_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_) ___________________________________________________________________________ Sent via: Wireshark-dev mailing list <wireshark-dev-IZ8446WsY0/dtAWm4Da02A@public.gmane.org> Archives: http://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-request-IZ8446WsY0/dtAWm4Da02A@public.gmane.org?subject=unsubscribe

hi,