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:
13
gdk/gdkgc.c
13
gdk/gdkgc.c
@ -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
|
||||
|
||||
Reference in New Issue
Block a user