diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:29:09 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:29:09 +0000 |
| commit | 8112ecc321d5d2025e7b780db21f88a31d0ee472 (patch) | |
| tree | 885dc3989020530f2fcf4b82ec39284d36d43bd4 /ui/gtk/gui_utils.h | |
| parent | da1bdffa1bbd6a9574afe2e834e1ac501653f3a4 (diff) | |
| download | wireshark-8112ecc321d5d2025e7b780db21f88a31d0ee472.tar.gz | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10404
Note: The following parts of the patch had been previously done:
asn1/snmp/packet-snmp-template.c
epan/dissectors/packet-snmp.c
epan/dissectors/packet-x11.c
Also; hostlist_table.c: code under '#ifdef HAVE_GEOIP'
didn't compile and needed a few additional patches.
svn path=/trunk/; revision=48447
Diffstat (limited to 'ui/gtk/gui_utils.h')
| -rw-r--r-- | ui/gtk/gui_utils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/gui_utils.h b/ui/gtk/gui_utils.h index ad276fe597..8179d43202 100644 --- a/ui/gtk/gui_utils.h +++ b/ui/gtk/gui_utils.h @@ -602,13 +602,13 @@ typedef GtkTable GtkGrid; gtk_table_new(0, 0, FALSE) #define ws_gtk_grid_attach(grid, child, left, top, width, height) \ - gtk_table_attach(grid, child, left, left+width, top, top+height, 0, 0, 0, 0) + gtk_table_attach(grid, child, left, left+width, top, top+height, (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 0) #define ws_gtk_grid_attach_defaults(grid, child, left, top, width, height) \ gtk_table_attach_defaults(grid, child, left, left+width, top, top+height) #define ws_gtk_grid_attach_extended(grid, child, left, top, width, height, xoptions, yoptions, xpadding, ypadding) \ - gtk_table_attach(grid, child, left, left+width, top, top+height, xoptions, yoptions, xpadding, ypadding) + gtk_table_attach(grid, child, left, left+width, top, top+height, (GtkAttachOptions)(xoptions), (GtkAttachOptions)(yoptions), xpadding, ypadding) #define ws_gtk_grid_set_homogeneous(grid, homogeneous) \ gtk_table_set_homogeneous(grid, homogeneous) |