Author: mlytwyn
Date: Wed Jul 1 00:16:24 2015
New Revision: 38727
URL: http://svn.gna.org/viewcvs/gnustep?rev=38727&view=rev
Log:
Merge Source/NSFont.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSFont.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSFont.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSFont.m?rev=38727&r1=38726&r2=38727&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSFont.m (original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSFont.m Wed Jul 1
00:16:24 2015
@@ -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 @@
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 @@
screenFont: screen]);
}
}
+#endif
if (fontInfo == nil)
{
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
