diff options
| author | Evan Huus <eapache@gmail.com> | 2012-07-28 15:16:41 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2012-07-28 15:16:41 +0000 |
| commit | 98bbc5a3d96647170a5c9f01a8a16b6405febe7b (patch) | |
| tree | e1ff27907af4ce305d05e227e7e3c807c2f478a8 | |
| parent | f4e322cd565ee1959dcce6999cf21ad1a372919e (diff) | |
| download | wireshark-98bbc5a3d96647170a5c9f01a8a16b6405febe7b.tar.gz | |
Simply #ifdefs slightly in the graph code.
Makes cppcheck happier.
svn path=/trunk/; revision=44092
| -rw-r--r-- | ui/gtk/rlc_lte_graph.c | 3 | ||||
| -rw-r--r-- | ui/gtk/tcp_graph.c | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/ui/gtk/rlc_lte_graph.c b/ui/gtk/rlc_lte_graph.c index 513701c86c..9afd4b51ce 100644 --- a/ui/gtk/rlc_lte_graph.c +++ b/ui/gtk/rlc_lte_graph.c @@ -511,8 +511,7 @@ static void create_drawing_area(struct graph *g) NULL); #else g->font = gtk_widget_get_style(g->drawing_area)->font_desc; -#endif -#if !GTK_CHECK_VERSION(3,0,0) + colormap = gtk_widget_get_colormap(GTK_WIDGET(g->drawing_area)); if (!xor_gc) { xor_gc = gdk_gc_new(gtk_widget_get_window(g->drawing_area)); diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c index 0bc1b596c9..3e28a664e9 100644 --- a/ui/gtk/tcp_graph.c +++ b/ui/gtk/tcp_graph.c @@ -745,15 +745,14 @@ static void create_drawing_area (struct graph *g) G_CALLBACK(button_press_event), g); g_signal_connect(g->drawing_area, "button_release_event", G_CALLBACK(button_release_event), g); -#if USE_CROSSHAIR_CURSOR -#else +#if !USE_CROSSHAIR_CURSOR g_signal_connect(g->drawing_area, "motion_notify_event", G_CALLBACK(motion_notify_event), g); g_signal_connect(g->drawing_area, "leave_notify_event", G_CALLBACK(leave_notify_event), g); g_signal_connect(g->drawing_area, "enter_notify_event", G_CALLBACK(enter_notify_event), g); -#endif /* USE_CROSSHAIR_CURSOR */ +#endif /* !USE_CROSSHAIR_CURSOR */ g_signal_connect(g->toplevel, "destroy", G_CALLBACK(callback_toplevel_destroy), g); /* why doesn't drawing area send key_press_signals? */ g_signal_connect(g->toplevel, "key_press_event", G_CALLBACK(key_press_event), g); @@ -813,8 +812,7 @@ static void create_drawing_area (struct graph *g) NULL); #else g->font = gtk_widget_get_style(g->drawing_area)->font_desc; -#endif -#if !GTK_CHECK_VERSION(3,0,0) + colormap = gtk_widget_get_colormap(GTK_WIDGET(g->drawing_area)); if (!xor_gc) { xor_gc = gdk_gc_new (gtk_widget_get_window(g->drawing_area)); |