forked from osmocom/wireshark
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:
parent
7990a0e4d0
commit
917661c7cb
|
@ -371,10 +371,6 @@ struct graph {
|
||||||
} gt;
|
} gt;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#if !GTK_CHECK_VERSION(3,0,0)
|
|
||||||
static GdkGC *xor_gc = NULL;
|
|
||||||
#endif
|
|
||||||
static int refnum=0;
|
static int refnum=0;
|
||||||
|
|
||||||
#define debug(section) if (debugging & section)
|
#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)
|
#if GTK_CHECK_VERSION(3,0,0)
|
||||||
GtkStyleContext *context;
|
GtkStyleContext *context;
|
||||||
#else
|
|
||||||
GdkColormap *colormap;
|
|
||||||
GdkColor color;
|
|
||||||
#endif
|
#endif
|
||||||
char *display_name;
|
char *display_name;
|
||||||
char window_title[WINDOW_TITLE_LENGTH];
|
char window_title[WINDOW_TITLE_LENGTH];
|
||||||
|
@ -850,26 +843,6 @@ static void create_drawing_area(struct graph *g)
|
||||||
#else
|
#else
|
||||||
g->font = gtk_widget_get_style(g->drawing_area)->font_desc;
|
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
|
/* this is probably quite an ugly way to get rid of the first configure
|
||||||
* event
|
* event
|
||||||
|
|
Loading…
Reference in New Issue