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)
This commit is contained in:
parent
7c7bcb243f
commit
a7aa784c4a
@ -1,3 +1,9 @@
|
|||||||
|
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>
|
Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* modules/input/gtkimcontextxim.c: Pass the actual input
|
* modules/input/gtkimcontextxim.c: Pass the actual input
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
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>
|
Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* modules/input/gtkimcontextxim.c: Pass the actual input
|
* modules/input/gtkimcontextxim.c: Pass the actual input
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
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>
|
Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* modules/input/gtkimcontextxim.c: Pass the actual input
|
* modules/input/gtkimcontextxim.c: Pass the actual input
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
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>
|
Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* modules/input/gtkimcontextxim.c: Pass the actual input
|
* modules/input/gtkimcontextxim.c: Pass the actual input
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
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>
|
Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* modules/input/gtkimcontextxim.c: Pass the actual input
|
* modules/input/gtkimcontextxim.c: Pass the actual input
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
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>
|
Fri Sep 6 12:41:16 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* modules/input/gtkimcontextxim.c: Pass the actual input
|
* modules/input/gtkimcontextxim.c: Pass the actual input
|
||||||
|
12
gdk/gdkgc.c
12
gdk/gdkgc.c
@ -104,9 +104,15 @@ gdk_gc_new_with_values (GdkDrawable *drawable,
|
|||||||
if (values_mask & GDK_GC_TS_Y_ORIGIN)
|
if (values_mask & GDK_GC_TS_Y_ORIGIN)
|
||||||
gc->ts_y_origin = values->ts_y_origin;
|
gc->ts_y_origin = values->ts_y_origin;
|
||||||
|
|
||||||
gc->colormap = gdk_drawable_get_colormap (drawable);
|
/* gc->colormap will already be set if gdk_gc_new_with_values()
|
||||||
if (gc->colormap)
|
* recurses - as in GdkPixmap => impl object.
|
||||||
g_object_ref (G_OBJECT (gc->colormap));
|
*/
|
||||||
|
if (!gc->colormap)
|
||||||
|
{
|
||||||
|
gc->colormap = gdk_drawable_get_colormap (drawable);
|
||||||
|
if (gc->colormap)
|
||||||
|
g_object_ref (G_OBJECT (gc->colormap));
|
||||||
|
}
|
||||||
|
|
||||||
return gc;
|
return gc;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user