mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-24 20:49:13 +00:00
Use NSFont not isa to call class methods.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16978 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
78417b8898
commit
8309f24bee
2 changed files with 18 additions and 13 deletions
|
@ -1,3 +1,8 @@
|
|||
2003-06-20 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Source/NSFont.m ([NSFont -initWithCoder:]): Use NSFont not isa
|
||||
to call class methods.
|
||||
|
||||
2003-06-20 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Source/DocMakefile (after-all): Check if Gui exists before
|
||||
|
|
|
@ -1078,7 +1078,7 @@ static BOOL flip_hack;
|
|||
if (self)
|
||||
return self;
|
||||
|
||||
self = [isa userFontOfSize: fontMatrix[0]];
|
||||
self = [NSFont userFontOfSize: fontMatrix[0]];
|
||||
NSAssert(self != nil, @"Couldn't find a valid font when decoding.");
|
||||
return self;
|
||||
}
|
||||
|
@ -1101,41 +1101,41 @@ static BOOL flip_hack;
|
|||
switch (the_role >> 1)
|
||||
{
|
||||
case RoleBoldSystemFont:
|
||||
new = [isa boldSystemFontOfSize: size];
|
||||
new = [NSFont boldSystemFontOfSize: size];
|
||||
break;
|
||||
case RoleSystemFont:
|
||||
new = [isa systemFontOfSize: size];
|
||||
new = [NSFont systemFontOfSize: size];
|
||||
break;
|
||||
case RoleUserFixedPitchFont:
|
||||
new = [isa userFixedPitchFontOfSize: size];
|
||||
new = [NSFont userFixedPitchFontOfSize: size];
|
||||
break;
|
||||
case RoleTitleBarFont:
|
||||
new = [isa titleBarFontOfSize: size];
|
||||
new = [NSFont titleBarFontOfSize: size];
|
||||
break;
|
||||
case RoleMenuFont:
|
||||
new = [isa menuFontOfSize: size];
|
||||
new = [NSFont menuFontOfSize: size];
|
||||
break;
|
||||
case RoleMessageFont:
|
||||
new = [isa messageFontOfSize: size];
|
||||
new = [NSFont messageFontOfSize: size];
|
||||
break;
|
||||
case RolePaletteFont:
|
||||
new = [isa paletteFontOfSize: size];
|
||||
new = [NSFont paletteFontOfSize: size];
|
||||
break;
|
||||
case RoleToolTipsFont:
|
||||
new = [isa toolTipsFontOfSize: size];
|
||||
new = [NSFont toolTipsFontOfSize: size];
|
||||
break;
|
||||
case RoleControlContentFont:
|
||||
new = [isa controlContentFontOfSize: size];
|
||||
new = [NSFont controlContentFontOfSize: size];
|
||||
break;
|
||||
case RoleLabelFont:
|
||||
new = [isa labelFontOfSize: size];
|
||||
new = [NSFont labelFontOfSize: size];
|
||||
break;
|
||||
|
||||
default:
|
||||
NSDebugLLog(@"NSFont", @"unknown role %i", the_role);
|
||||
/* fall through */
|
||||
case RoleUserFont:
|
||||
new = [isa userFontOfSize: size];
|
||||
new = [NSFont userFontOfSize: size];
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -1143,7 +1143,7 @@ static BOOL flip_hack;
|
|||
if (new)
|
||||
return new;
|
||||
|
||||
new = [isa userFontOfSize: size];
|
||||
new = [NSFont userFontOfSize: size];
|
||||
NSAssert(new != nil, @"Couldn't find a valid font when decoding.");
|
||||
return new;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue