gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 06:51:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge Source/NSFont.m

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38727 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2015-06-30 22:16:24 +00:00
parent 6c4ad9ef8d
commit f59bd5478c
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Source/NSFont.m
View file

@ -46,7 +46,11 @@
#import "AppKit/NSView.h"
#import "GNUstepGUI/GSFontInfo.h"
#if 0
// Testplant-MAL-2015-06-30: Certain missing fonts would cause GUI problems...
// Is this still needed??? Omitting for testing...
#include <GNUstepGUI/GSDisplayServer.h>
#endif
@interface NSFont (Private)
- (id) initWithName: (NSString*)name
@ -859,6 +863,10 @@ static void setNSFont(NSString *key, NSFont *font)
screenFont: screen]);
}
}
#if 0
// Testplant-MAL-2015-06-30: Certain missing fonts would cause GUI problems...
// Is this still needed??? Omitting for testing...
if (fontInfo == nil)
{
Class cls = NSClassFromString(@"WIN32Server");
@ -870,6 +878,7 @@ static void setNSFont(NSString *key, NSFont *font)
screenFont: screen]);
}
}
#endif
if (fontInfo == nil)
{