From e60f060ea8a889c47d9919c73181fe6879f37b52 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 7 May 2005 19:00:36 +0000 Subject: [PATCH] Get the foreground color, not the background color. 2005-05-07 Owen Taylor * gdk/gdkgc.c (gc_get_foreground): Get the foreground color, not the background color. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/gdkgc.c | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 16b3dac9a9..8f088b1729 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-05-07 Owen Taylor + + * gdk/gdkgc.c (gc_get_foreground): Get the foreground color, not + the background color. + 2005-05-07 Owen Taylor * gdk/gdkpixbuf-render.c gdk/gdkpixbuf.h (gdk_pixbuf_set_as_cairo_source): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 16b3dac9a9..8f088b1729 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-05-07 Owen Taylor + + * gdk/gdkgc.c (gc_get_foreground): Get the foreground color, not + the background color. + 2005-05-07 Owen Taylor * gdk/gdkpixbuf-render.c gdk/gdkpixbuf.h (gdk_pixbuf_set_as_cairo_source): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 16b3dac9a9..8f088b1729 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-05-07 Owen Taylor + + * gdk/gdkgc.c (gc_get_foreground): Get the foreground color, not + the background color. + 2005-05-07 Owen Taylor * gdk/gdkpixbuf-render.c gdk/gdkpixbuf.h (gdk_pixbuf_set_as_cairo_source): diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c index 8c386938cc..72115eec27 100644 --- a/gdk/gdkgc.c +++ b/gdk/gdkgc.c @@ -1079,7 +1079,7 @@ gc_get_foreground (GdkGC *gc, color->pixel = priv->bg_pixel; if (gc->colormap) - gdk_colormap_query_color (gc->colormap, priv->bg_pixel, color); + gdk_colormap_query_color (gc->colormap, priv->fg_pixel, color); else g_warning ("No colormap in gc_get_background"); } -- GitLab