diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-07-24 14:16:19 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-07-24 20:03:29 +0000 |
| commit | ee7f9c33f63532bc69899a0750177756be53c0c1 (patch) | |
| tree | 54f64291385d28b8f013f2c869bd1aa1d2923bf1 /ui/gtk/sctp_graph_dlg.c | |
| parent | 688d055acd523e645c1e87267dcf4a0a9867adbd (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/sctp_graph_dlg.c')
| -rw-r--r-- | ui/gtk/sctp_graph_dlg.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c index b0ddcc5dfc..cc3b2cc013 100644 --- a/ui/gtk/sctp_graph_dlg.c +++ b/ui/gtk/sctp_graph_dlg.c @@ -37,6 +37,7 @@ #include "ui/gtk/sctp_stat_gtk.h" #include "ui/gtk/gui_utils.h" #include "ui/gtk/stock_icons.h" +#include "ui/gtk/old-gtk-compat.h" #define DEFAULT_PIXELS_PER_TICK 2 #define MAX_PIXELS_PER_TICK 4 @@ -1088,7 +1089,7 @@ sctp_graph_redraw(struct sctp_udata *u_data) #if GTK_CHECK_VERSION(2,22,0) cairo_set_source_surface (cr, ios->surface, 0, 0); #else - gdk_cairo_set_source_pixmap (cr, ios->pixmap, 0, 0); + ws_gdk_cairo_set_source_pixmap (cr, ios->pixmap, 0, 0); #endif gtk_widget_get_allocation(u_data->io->draw_area, &widget_alloc); cairo_rectangle (cr, 0, 0, widget_alloc.width, widget_alloc.height); @@ -1211,7 +1212,7 @@ expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer user_data) #if GTK_CHECK_VERSION(2,22,0) cairo_set_source_surface (cr, ios->surface, 0, 0); #else - gdk_cairo_set_source_pixmap (cr, ios->pixmap, 0, 0); + ws_gdk_cairo_set_source_pixmap (cr, ios->pixmap, 0, 0); #endif cairo_rectangle (cr, event->area.x, event->area.y, event->area.width, event->area.height); cairo_fill (cr); @@ -1378,7 +1379,7 @@ on_button_press_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer us #if GTK_CHECK_VERSION(2,22,0) cairo_set_source_surface (cr, ios->surface, 0, 0); #else - gdk_cairo_set_source_pixmap (cr, ios->pixmap, 0, 0); + ws_gdk_cairo_set_source_pixmap (cr, ios->pixmap, 0, 0); #endif cairo_rectangle (cr, 0, 0, abs((int)(u_data->io->x_new-u_data->io->x_old)), abs((int)(u_data->io->y_new-u_data->io->y_old))); cairo_fill (cr); @@ -1454,7 +1455,7 @@ on_button_release_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer #if GTK_CHECK_VERSION(2,22,0) cairo_set_source_surface (cr, ios->surface, 0, 0); #else - gdk_cairo_set_source_pixmap (cr, ios->pixmap, 0, 0); + ws_gdk_cairo_set_source_pixmap (cr, ios->pixmap, 0, 0); #endif gtk_widget_get_allocation(u_data->io->draw_area, &widget_alloc); cairo_rectangle (cr, 0, 0, widget_alloc.width, widget_alloc.height); @@ -1647,7 +1648,7 @@ on_button_release_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer #if GTK_CHECK_VERSION(2,22,0) cairo_set_source_surface (cr, ios->surface, 0, 0); #else - gdk_cairo_set_source_pixmap (cr, ios->pixmap, 0, 0); + ws_gdk_cairo_set_source_pixmap (cr, ios->pixmap, 0, 0); #endif gtk_widget_get_allocation(u_data->io->draw_area, &widget_alloc); cairo_rectangle (cr, 0, 0, widget_alloc.width, widget_alloc.height); |