diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-08-23 14:17:30 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-08-23 14:17:30 +0000 |
| commit | 3e95bb01ae06e35067f99e84eff4d27a7ecd613c (patch) | |
| tree | 22e27e4794b20b3f9fa6f9143cab09cdeb9d8376 /gtk/tcp_graph.c | |
| parent | 6220ee163ed9969941f9475432e6aa8bdfccd82f (diff) | |
Make colors work on GTK3 take 2
Revert tcp_graph commit by mistake, typo etc
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38689 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/tcp_graph.c')
| -rw-r--r-- | gtk/tcp_graph.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index 16718e2db5..1b86cfbded 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -58,7 +58,6 @@ #include "gtk/gui_utils.h" #include "gtk/dlg_utils.h" #include "gtk/gui_stat_menu.h" -#include "gtk/color_utils.h" #include "gtk/old-gtk-compat.h" @@ -2928,8 +2927,8 @@ static int ellipse_detect_collision (struct element *e, int x, int y) static void cross_xor (struct graph *g, int x, int y) { -//#if GTK_CHECK_VERSION(3,0,0) - //GdkColor color_gray15 = {0x0, 0x2626, 0x2626, 0x2626}; +#if GTK_CHECK_VERSION(3,0,0) + GdkColor color_gray15 = {0x0, 0x2626, 0x2626, 0x2626}; cairo_t *cr; /* XXX Fix me: lines do not disapere */ @@ -2955,16 +2954,16 @@ static void cross_xor (struct graph *g, int x, int y) cairo_destroy(cr); } -//#else -// -// if (x > g->wp.x && x < g->wp.x+g->wp.width && -// y >= g->wp.y && y < g->wp.y+g->wp.height) { -// gdk_draw_line (gtk_widget_get_window(g->drawing_area), xor_gc, g->wp.x, -// y, g->wp.x + g->wp.width, y); -// gdk_draw_line (gtk_widget_get_window(g->drawing_area), xor_gc, x, -// g->wp.y, x, g->wp.y + g->wp.height); -// } -//#endif +#else + + if (x > g->wp.x && x < g->wp.x+g->wp.width && + y >= g->wp.y && y < g->wp.y+g->wp.height) { + gdk_draw_line (gtk_widget_get_window(g->drawing_area), xor_gc, g->wp.x, + y, g->wp.x + g->wp.width, y); + gdk_draw_line (gtk_widget_get_window(g->drawing_area), xor_gc, x, + g->wp.y, x, g->wp.y + g->wp.height); + } +#endif } static void cross_draw (struct graph *g, int x, int y) |