aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/gui_utils.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2016-07-24 14:16:19 -0400
committerMichael Mann <mmann78@netscape.net>2016-07-24 20:03:29 +0000
commitee7f9c33f63532bc69899a0750177756be53c0c1 (patch)
tree54f64291385d28b8f013f2c869bd1aa1d2923bf1 /ui/gtk/gui_utils.c
parent688d055acd523e645c1e87267dcf4a0a9867adbd (diff)
Pacify GTK checkAPIs.pl warnings.
Add "Wireshark" macros to old-gtk-compat.h for GTK APIs that have been deprecated. The macros are setup by version number to limit their proliferation (not that I suspect much development will really be done there since GTK is deprecated). Just want to make buildbots happy for the time being. Change-Id: I095f850065166a0bc2e2456fb2e886ab64fdd97d Reviewed-on: https://code.wireshark.org/review/16635 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/gtk/gui_utils.c')
-rw-r--r--ui/gtk/gui_utils.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c
index 2e4a4b6b2a..32ba5205d7 100644
--- a/ui/gtk/gui_utils.c
+++ b/ui/gtk/gui_utils.c
@@ -383,7 +383,7 @@ window_get_geometry(GtkWidget *widget,
geom->width = gdk_window_get_width(widget_window);
geom->height = gdk_window_get_height(widget_window);
#else
- gdk_drawable_get_size(widget_window,
+ ws_gdk_drawable_get_size(widget_window,
&geom->width,
&geom->height);
#endif
@@ -1904,9 +1904,9 @@ ws_gtk_box_new(GtkOrientation orientation,
{
#if !GTK_CHECK_VERSION(3,0,0)
if (orientation == GTK_ORIENTATION_HORIZONTAL)
- return gtk_hbox_new(homogeneous, spacing);
+ return ws_gtk_hbox_new(homogeneous, spacing);
else
- return gtk_vbox_new(homogeneous, spacing);
+ return ws_gtk_vbox_new(homogeneous, spacing);
#else
GtkWidget *widget;
@@ -1922,7 +1922,7 @@ GtkWidget *
gtk_button_box_new(GtkOrientation orientation)
{
if (orientation == GTK_ORIENTATION_HORIZONTAL) {
- return gtk_hbutton_box_new();
+ return ws_gtk_hbutton_box_new();
} else {
return gtk_vbutton_box_new();
}