gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-25 07:21:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use NSFont not isa to call class methods.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16978 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2003-06-21 03:21:33 +00:00
parent 78417b8898
commit 8309f24bee
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2003-06-20 Adam Fedor <fedor@gnu.org>
* Source/DocMakefile (after-all): Check if Gui exists before * Source/DocMakefile (after-all): Check if Gui exists before

26
Source/NSFont.m
View file

@ -1078,7 +1078,7 @@ static BOOL flip_hack;
if (self) if (self)
return self; return self;
self = [isa userFontOfSize: fontMatrix[0]]; self = [NSFont userFontOfSize: fontMatrix[0]];
NSAssert(self != nil, @"Couldn't find a valid font when decoding."); NSAssert(self != nil, @"Couldn't find a valid font when decoding.");
return self; return self;
} }
@ -1101,41 +1101,41 @@ static BOOL flip_hack;
switch (the_role >> 1) switch (the_role >> 1)
{ {
case RoleBoldSystemFont: case RoleBoldSystemFont:
new = [isa boldSystemFontOfSize: size]; new = [NSFont boldSystemFontOfSize: size];
break; break;
case RoleSystemFont: case RoleSystemFont:
new = [isa systemFontOfSize: size]; new = [NSFont systemFontOfSize: size];
break; break;
case RoleUserFixedPitchFont: case RoleUserFixedPitchFont:
new = [isa userFixedPitchFontOfSize: size]; new = [NSFont userFixedPitchFontOfSize: size];
break; break;
case RoleTitleBarFont: case RoleTitleBarFont:
new = [isa titleBarFontOfSize: size]; new = [NSFont titleBarFontOfSize: size];
break; break;
case RoleMenuFont: case RoleMenuFont:
new = [isa menuFontOfSize: size]; new = [NSFont menuFontOfSize: size];
break; break;
case RoleMessageFont: case RoleMessageFont:
new = [isa messageFontOfSize: size]; new = [NSFont messageFontOfSize: size];
break; break;
case RolePaletteFont: case RolePaletteFont:
new = [isa paletteFontOfSize: size]; new = [NSFont paletteFontOfSize: size];
break; break;
case RoleToolTipsFont: case RoleToolTipsFont:
new = [isa toolTipsFontOfSize: size]; new = [NSFont toolTipsFontOfSize: size];
break; break;
case RoleControlContentFont: case RoleControlContentFont:
new = [isa controlContentFontOfSize: size]; new = [NSFont controlContentFontOfSize: size];
break; break;
case RoleLabelFont: case RoleLabelFont:
new = [isa labelFontOfSize: size]; new = [NSFont labelFontOfSize: size];
break; break;
default: default:
NSDebugLLog(@"NSFont", @"unknown role %i", the_role); NSDebugLLog(@"NSFont", @"unknown role %i", the_role);
/* fall through */ /* fall through */
case RoleUserFont: case RoleUserFont:
new = [isa userFontOfSize: size]; new = [NSFont userFontOfSize: size];
break; break;
} }
@ -1143,7 +1143,7 @@ static BOOL flip_hack;
if (new) if (new)
return new; return new;
new = [isa userFontOfSize: size]; new = [NSFont userFontOfSize: size];
NSAssert(new != nil, @"Couldn't find a valid font when decoding."); NSAssert(new != nil, @"Couldn't find a valid font when decoding.");
return new; return new;
} }