gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 04:30:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor tidyups ... nothing functional

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14587 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2002-09-27 08:26:13 +00:00
parent 3677175985
commit ab43ceed49
2 changed files with 64 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Source/NSFont.m
View file

@ -174,7 +174,11 @@ setNSFont(NSString* key, NSFont* font)
/* Getting the preferred user fonts. */
// This is deprecated in MacOSX
/**
* Return the default bold font for use in menus and heading in standard
* gui components.<br />
* This is deprecated in MacOSX
*/
+ (NSFont*) boldSystemFontOfSize: (float)fontSize
{
static NSFont *font = nil;
@ -194,7 +198,11 @@ setNSFont(NSString* key, NSFont* font)
}
}
// This is deprecated in MacOSX
/**
* Return the default font for use in menus and heading in standard
* gui components.<br />
* This is deprecated in MacOSX
*/
+ (NSFont*) systemFontOfSize: (float)fontSize
{
static NSFont *font = nil;
@ -214,6 +222,10 @@ setNSFont(NSString* key, NSFont* font)
}
}
/**
* Return the default fixed pitch font for use in locations other
* than standard gui components.
*/
+ (NSFont*) userFixedPitchFontOfSize: (float)fontSize
{
static NSFont *font = nil;
@ -233,6 +245,10 @@ setNSFont(NSString* key, NSFont* font)
}
}
/**
* Return the default font for use in locations other
* than standard gui components.
*/
+ (NSFont*) userFontOfSize: (float)fontSize
{
static NSFont *font = nil;
@ -252,7 +268,10 @@ setNSFont(NSString* key, NSFont* font)
}
}
+ (NSArray *)preferredFontNames
/**
* Return an array of the names of preferred fonts.
*/
+ (NSArray*) preferredFontNames
{
return _preferredFonts;
}
@ -269,7 +288,7 @@ setNSFont(NSString* key, NSFont* font)
setNSFont (@"NSUserFont", aFont);
}
+ (void)setPreferredFontNames:(NSArray *)fontNames
+ (void) setPreferredFontNames: (NSArray*)fontNames
{
ASSIGN(_preferredFonts, fontNames);
}
@ -582,7 +601,9 @@ setNSFont(NSString* key, NSFont* font)
{
NSFont*new_font;
if (NSShouldRetainWithZone(self, zone))
new_font = RETAIN(self);
{
new_font = RETAIN(self);
}
else
{
new_font = (NSFont*)NSCopyObject(self, 0, zone);
@ -788,9 +809,12 @@ setNSFont(NSString* key, NSFont* font)
float fontMatrix[6];
name = [aDecoder decodeObject];
[aDecoder decodeArrayOfObjCType: @encode(float) count: 6 at: fontMatrix];
[aDecoder decodeArrayOfObjCType: @encode(float)
count: 6
at: fontMatrix];
self = [self initWithName: name matrix: fontMatrix];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &matrixExplicitlySet];
[aDecoder decodeValueOfObjCType: @encode(BOOL)
at: &matrixExplicitlySet];
}
else
{
@ -798,7 +822,9 @@ setNSFont(NSString* key, NSFont* font)
float fontMatrix[6];
name = [aDecoder decodeObject];
[aDecoder decodeArrayOfObjCType: @encode(float) count: 6 at: fontMatrix];
[aDecoder decodeArrayOfObjCType: @encode(float)
count: 6
at: fontMatrix];
self = [self initWithName: name matrix: fontMatrix];
if (fontMatrix[0] == fontMatrix[3]
&& fontMatrix[1] == 0.0