osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Get rid of xor_gc altogether, I think it's a remnant from the "old" cross-hair code. 

svn path=/trunk/; revision=48140
This commit is contained in:
Anders Broman 2013-03-06 18:17:42 +00:00
parent 7990a0e4d0
commit 917661c7cb
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ui/gtk/tcp_graph.c
View File

@ -371,10 +371,6 @@ struct graph {
} gt;
};
#if !GTK_CHECK_VERSION(3,0,0)
static GdkGC *xor_gc = NULL;
#endif
static int refnum=0;
#define debug(section) if (debugging & section)
@ -734,9 +730,6 @@ static void create_drawing_area(struct graph *g)
{
#if GTK_CHECK_VERSION(3,0,0)
GtkStyleContext *context;
#else
GdkColormap *colormap;
GdkColor color;
#endif
char *display_name;
char window_title[WINDOW_TITLE_LENGTH];
@ -850,26 +843,6 @@ static void create_drawing_area(struct graph *g)
#else
g->font = gtk_widget_get_style(g->drawing_area)->font_desc;
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));
gdk_gc_set_function(xor_gc, GDK_XOR);
if (!gdk_color_parse("gray15", &color)) {
/*
* XXX - do more than just warn.
*/
simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
"Could not parse color gray15.");
}
if (!gdk_colormap_alloc_color(colormap, &color, FALSE, TRUE)) {
/*
* XXX - do more than just warn.
*/
simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
"Could not allocate color gray15.");
}
gdk_gc_set_foreground(xor_gc, &color);
}
/* this is probably quite an ugly way to get rid of the first configure
* event