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

Ignore gdk_gc_set_font if font is a fontset. (Actually, gdk_gc_set_font

Browse Source 
is completely useless now...)
                                        -owt
This commit is contained in:
Owen Taylor
1997-12-05 04:25:52 +00:00
parent ef3f373172
commit 28de9c69b3
8 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkstyle.c: fixed a problem introduced recently in
gtk_style_detach witch crashed script_fu.

3
ChangeLog.pre-2-0
View File

@ -1,3 +1,6 @@
Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkstyle.c: fixed a problem introduced recently in
gtk_style_detach witch crashed script_fu.

3
ChangeLog.pre-2-10
View File

@ -1,3 +1,6 @@
Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkstyle.c: fixed a problem introduced recently in
gtk_style_detach witch crashed script_fu.

3
ChangeLog.pre-2-2
View File

@ -1,3 +1,6 @@
Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkstyle.c: fixed a problem introduced recently in
gtk_style_detach witch crashed script_fu.

3
ChangeLog.pre-2-4
View File

@ -1,3 +1,6 @@
Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkstyle.c: fixed a problem introduced recently in
gtk_style_detach witch crashed script_fu.

3
ChangeLog.pre-2-6
View File

@ -1,3 +1,6 @@
Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkstyle.c: fixed a problem introduced recently in
gtk_style_detach witch crashed script_fu.

3
ChangeLog.pre-2-8
View File

@ -1,3 +1,6 @@
Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
* gtk/gtkstyle.c: fixed a problem introduced recently in
gtk_style_detach witch crashed script_fu.

13
gdk/gdkgc.c
View File

@ -371,11 +371,14 @@ gdk_gc_set_font (GdkGC *gc,
g_return_if_fail (gc != NULL);
g_return_if_fail (font != NULL);
gc_private = (GdkGCPrivate*) gc;
font_private = (GdkFontPrivate*) font;
XSetFont (gc_private->xdisplay, gc_private->xgc,
((XFontStruct *) font_private->xfont)->fid);
if (font->type == GDK_FONT_FONT)
{
gc_private = (GdkGCPrivate*) gc;
font_private = (GdkFontPrivate*) font;
XSetFont (gc_private->xdisplay, gc_private->xgc,
((XFontStruct *) font_private->xfont)->fid);
}
}
void