gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 23:42:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

If a font can't be loaded, don't return the default fixed font

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@14710 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2002-10-10 23:23:21 +00:00
parent 2495cdec17
commit 26b35aab11
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Oct 11 00:47:04 2002 Nicola Pero <n.pero@mi.flashnet.it>
* Source/xlib/XGFont.m ([XGFontInfo -setupAttributes]): Return NO
if the font can't be loaded. (Patch by Georg Fleischmann
<georg@vhf.de>).
2002-10-10 Adam Fedor <fedor@gnu.org>
* GNUmakefile.postamble: Only install back.make if building

12
Source/xlib/XGFont.m
View file

@ -250,15 +250,9 @@ static BOOL XGInitAtoms(Display *dpy)
if ((xfontname == nil) ||
(font_info = XLoadQueryFont(xdpy, [xfontname cString])) == NULL)
{
NSLog(@"Selected font: %@ at %f (%@) is not available.\n"
@"Using system fixed font instead", fontName, matrix[0], xfontname);
// Try default font
if ((font_info = XLoadQueryFont(xdpy, "9x15")) == NULL)
{
NSLog(@"Unable to open fixed font");
return NO;
}
NSLog(@"XGFont: selected font: %@ at %f (%@) is not available.\n",
fontName, matrix[0], xfontname);
return NO;
}
else
NSDebugLog(@"Loaded font: %@", xfontname);