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

(-availableFonts,

Browse source 
-availableFontNamesWithTraits:, -availableMembersOfFontFamily:,
-convertFont:, convertWeight:ofFont:,
-fontWithFamily:traits:weight:size:, -fontNamed:hasTraits:)
Removed compiler warning about signed/unsigned comparision.
[setSelectedFont:isMultiple:] and [fontMenu:] changed menuItem to
type (id <NSMenuItem>).


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16891 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2003-06-08 00:31:11 +00:00
parent 95bd47d86d
commit be008a93fd
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/NSFontManager.m
View file

@ -125,7 +125,7 @@ static Class fontPanelClass = Nil;
*/ */
- (NSArray*) availableFonts - (NSArray*) availableFonts
{ {
int i; unsigned int i;
NSArray *fontsList = [_fontEnumerator availableFonts]; NSArray *fontsList = [_fontEnumerator availableFonts];
NSMutableArray *fontNames = [NSMutableArray NSMutableArray *fontNames = [NSMutableArray
arrayWithCapacity: [fontsList count]]; arrayWithCapacity: [fontsList count]];
@ -150,7 +150,7 @@ static Class fontPanelClass = Nil;
- (NSArray*) availableFontNamesWithTraits: (NSFontTraitMask)fontTraitMask - (NSArray*) availableFontNamesWithTraits: (NSFontTraitMask)fontTraitMask
{ {
int i, j; unsigned int i, j;
NSArray *fontFamilies = [self availableFontFamilies]; NSArray *fontFamilies = [self availableFontFamilies];
NSMutableArray *fontNames = [NSMutableArray array]; NSMutableArray *fontNames = [NSMutableArray array];
NSFontTraitMask traits; NSFontTraitMask traits;
@ -181,7 +181,7 @@ static Class fontPanelClass = Nil;
- (NSArray*) availableMembersOfFontFamily: (NSString*)family - (NSArray*) availableMembersOfFontFamily: (NSString*)family
{ {
int i; unsigned int i;
NSArray *fontsList = [_fontEnumerator availableMembersOfFontFamily: family]; NSArray *fontsList = [_fontEnumerator availableMembersOfFontFamily: family];
NSMutableArray *fonts = [NSMutableArray NSMutableArray *fonts = [NSMutableArray
arrayWithCapacity: [fontsList count]]; arrayWithCapacity: [fontsList count]];
@ -238,7 +238,7 @@ static Class fontPanelClass = Nil;
if (_fontMenu != nil) if (_fontMenu != nil)
{ {
NSMenuItem *menuItem; id <NSMenuItem> menuItem;
NSFontTraitMask trait = [self traitsOfFont: fontObject]; NSFontTraitMask trait = [self traitsOfFont: fontObject];
/* /*
@ -376,7 +376,7 @@ static Class fontPanelClass = Nil;
- (NSFont*) convertFont: (NSFont*)fontObject - (NSFont*) convertFont: (NSFont*)fontObject
{ {
NSFont *newFont = fontObject; NSFont *newFont = fontObject;
int i; unsigned int i;
float size; float size;
float sizes[] = {4.0, 6.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, float sizes[] = {4.0, 6.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0,
14.0, 16.0, 18.0, 24.0, 36.0, 48.0, 64.0}; 14.0, 16.0, 18.0, 24.0, 36.0, 48.0, 64.0};
@ -615,7 +615,7 @@ static Class fontPanelClass = Nil;
if (upFlag) if (upFlag)
{ {
int i; unsigned int i;
// The documentation is a bit unclear about the range of weights // The documentation is a bit unclear about the range of weights
// sometimes it says 0 to 9 and sometimes 0 to 15 // sometimes it says 0 to 9 and sometimes 0 to 15
int next_w = 15; int next_w = 15;
@ -654,7 +654,7 @@ static Class fontPanelClass = Nil;
} }
else else
{ {
int i; unsigned int i;
int next_w = 0; int next_w = 0;
for (i = 0; i < [fontDefs count]; i++) for (i = 0; i < [fontDefs count]; i++)
@ -710,7 +710,7 @@ static Class fontPanelClass = Nil;
size: (float)size size: (float)size
{ {
NSArray *fontDefs = [self availableMembersOfFontFamily: family]; NSArray *fontDefs = [self availableMembersOfFontFamily: family];
int i; unsigned int i;
//NSLog(@"Searching font %@: %i: %i", family, weight, traits); //NSLog(@"Searching font %@: %i: %i", family, weight, traits);
@ -812,7 +812,7 @@ static Class fontPanelClass = Nil;
{ {
// TODO: This method is implemented very slow, but I dont // TODO: This method is implemented very slow, but I dont
// see any use for it, so why change it? // see any use for it, so why change it?
int i, j; unsigned int i, j;
NSArray *fontFamilies = [self availableFontFamilies]; NSArray *fontFamilies = [self availableFontFamilies];
NSFontTraitMask traits; NSFontTraitMask traits;
@ -878,7 +878,7 @@ static Class fontPanelClass = Nil;
{ {
if (create && _fontMenu == nil) if (create && _fontMenu == nil)
{ {
NSMenuItem *menuItem; id <NSMenuItem> menuItem;
// As the font menu is stored in a instance variable we // As the font menu is stored in a instance variable we
// dont autorelease it // dont autorelease it