Commit a7aa784c authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Only set gc->colormap if it isn't already set. (Alex Larsson, #90632)

Fri Sep  6 15:35:01 2002  Owen Taylor  <otaylor@redhat.com>
        * gdk/gdkgc.c (gdk_gc_new_with_values): Only set
        gc->colormap if it isn't already set. (Alex Larsson,
        #90632)
parent 7c7bcb24
Fri Sep 6 15:35:01 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkgc.c (gdk_gc_new_with_values): Only set
gc->colormap if it isn't already set. (Alex Larsson,
#90632)
Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
* modules/input/gtkimcontextxim.c: Pass the actual input
......
Fri Sep 6 15:35:01 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkgc.c (gdk_gc_new_with_values): Only set
gc->colormap if it isn't already set. (Alex Larsson,
#90632)
Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
* modules/input/gtkimcontextxim.c: Pass the actual input
......
Fri Sep 6 15:35:01 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkgc.c (gdk_gc_new_with_values): Only set
gc->colormap if it isn't already set. (Alex Larsson,
#90632)
Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
* modules/input/gtkimcontextxim.c: Pass the actual input
......
Fri Sep 6 15:35:01 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkgc.c (gdk_gc_new_with_values): Only set
gc->colormap if it isn't already set. (Alex Larsson,
#90632)
Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
* modules/input/gtkimcontextxim.c: Pass the actual input
......
Fri Sep 6 15:35:01 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkgc.c (gdk_gc_new_with_values): Only set
gc->colormap if it isn't already set. (Alex Larsson,
#90632)
Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
* modules/input/gtkimcontextxim.c: Pass the actual input
......
Fri Sep 6 15:35:01 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkgc.c (gdk_gc_new_with_values): Only set
gc->colormap if it isn't already set. (Alex Larsson,
#90632)
Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
* modules/input/gtkimcontextxim.c: Pass the actual input
......
......@@ -104,9 +104,15 @@ gdk_gc_new_with_values (GdkDrawable *drawable,
if (values_mask & GDK_GC_TS_Y_ORIGIN)
gc->ts_y_origin = values->ts_y_origin;
gc->colormap = gdk_drawable_get_colormap (drawable);
if (gc->colormap)
g_object_ref (G_OBJECT (gc->colormap));
/* gc->colormap will already be set if gdk_gc_new_with_values()
* recurses - as in GdkPixmap => impl object.
*/
if (!gc->colormap)
{
gc->colormap = gdk_drawable_get_colormap (drawable);
if (gc->colormap)
g_object_ref (G_OBJECT (gc->colormap));
}
return gc;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment