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

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

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