diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2013-03-28 06:36:44 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2013-03-28 06:36:44 +0000 |
| commit | 42c71a3261581caafa1be74105e9f910559d3a52 (patch) | |
| tree | f006d9504c5e6008a48af8d8cc88356de237b1e0 /ui/gtk/fileset_dlg.c | |
| parent | aee73d6d9e101927150b1ca3a16d404b50196366 (diff) | |
| download | wireshark-42c71a3261581caafa1be74105e9f910559d3a52.tar.gz | |
Follow up on bug 8416.
Remove C++ incompatibilities in GTK+ 3 code.
svn path=/trunk/; revision=48606
Diffstat (limited to 'ui/gtk/fileset_dlg.c')
| -rw-r--r-- | ui/gtk/fileset_dlg.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/gtk/fileset_dlg.c b/ui/gtk/fileset_dlg.c index 55b7fc4fa6..fa8f6e5295 100644 --- a/ui/gtk/fileset_dlg.c +++ b/ui/gtk/fileset_dlg.c @@ -186,22 +186,22 @@ fileset_dlg_add_file(fileset_entry *entry, void *window _U_) { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (fs_rb), entry->current); } gtk_widget_set_tooltip_text(fs_rb, "Open this capture file"); - ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_rb, 0, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_rb, 0, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); g_signal_connect(fs_rb, "toggled", G_CALLBACK(fs_rb_cb), entry); gtk_widget_show(fs_rb); fs_lb = gtk_label_new(created); - ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 1, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 1, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); gtk_widget_set_sensitive(fs_lb, entry->current); gtk_widget_show(fs_lb); fs_lb = gtk_label_new(modified); - ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 2, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 2, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); gtk_widget_set_sensitive(fs_lb, entry->current); gtk_widget_show(fs_lb); fs_lb = gtk_label_new(size); - ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 3, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 3, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); gtk_widget_set_sensitive(fs_lb, entry->current); gtk_widget_show(fs_lb); @@ -257,16 +257,16 @@ fileset_init_table(GtkWidget *parent_vb) fs_first_rb = NULL; fs_lb = gtk_label_new("Filename"); - ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 0, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 0, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); fs_lb = gtk_label_new("Created"); - ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 1, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 1, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); fs_lb = gtk_label_new("Last Modified"); - ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 2, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 2, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); fs_lb = gtk_label_new("Size"); - ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 3, row, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + ws_gtk_grid_attach_extended(GTK_GRID(fs_grid), fs_lb, 3, row, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); gtk_widget_hide(fs_grid); |