callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Owen Taylor 2002-09-06 19:36:09 +00:00 committed by Owen Taylor
parent 7c7bcb243f
commit a7aa784c4a
7 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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>
* modules/input/gtkimcontextxim.c: Pass the actual input

6
ChangeLog.pre-2-10
View File

@ -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>
* modules/input/gtkimcontextxim.c: Pass the actual input

6
ChangeLog.pre-2-2
View File

@ -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>
* modules/input/gtkimcontextxim.c: Pass the actual input

6
ChangeLog.pre-2-4
View File

@ -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>
* modules/input/gtkimcontextxim.c: Pass the actual input

6
ChangeLog.pre-2-6
View File

@ -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>
* modules/input/gtkimcontextxim.c: Pass the actual input

6
ChangeLog.pre-2-8
View File

@ -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>
* modules/input/gtkimcontextxim.c: Pass the actual input

12
gdk/gdkgc.c
View File

@ -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;
}