gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-02-24 03:51:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small tweak for Objective-C 2 runtime API compatibility.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@31439 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Niels Grewe 2010-09-29 09:40:22 +00:00
parent bba99ed040
commit 77064296dc
2 changed files with 101 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2010-09-39 Niels Grewe <niels.grewe@halbordnung.de>
* Gorm.m: Replace calls to sel_eq() with sel_isEqual() for
compatibility with the Objective-C 2 runtime API. Whitespace
cleanup.
Small tweak for Objective-C 2 runtime API compatibility.
2010-09-17 Wolfgang Lux <wolfgang.lux@gmail.com>
* Palettes/4Data/GormTextViewAttributesInspector.h:

44
Gorm.m
View file

@ -568,7 +568,7 @@
if([item isKindOfClass: [NSMenuItem class]])
{
SEL action = [item action];
if(sel_eq(action, @selector(terminate:)))
if(sel_isEqual(action, @selector(terminate:)))
{
found = YES;
[item setTitle: _(@"Quit Test")];
@ -1117,18 +1117,18 @@
s = [selectionOwner selection];
}
if (sel_eq(action, @selector(close:))
|| sel_eq(action, @selector(miniaturize:)))
if (sel_isEqual(action, @selector(close:))
|| sel_isEqual(action, @selector(miniaturize:)))
{
if (active == nil)
return NO;
}
else if (sel_eq(action, @selector(testInterface:)))
else if (sel_isEqual(action, @selector(testInterface:)))
{
if (active == nil)
return NO;
}
else if (sel_eq(action, @selector(copy:)))
else if (sel_isEqual(action, @selector(copy:)))
{
if ([s count] == 0)
return NO;
@ -1144,7 +1144,7 @@
return [selectionOwner respondsToSelector: @selector(copySelection)];
}
else if (sel_eq(action, @selector(cut:)))
else if (sel_isEqual(action, @selector(cut:)))
{
if ([s count] == 0)
return NO;
@ -1161,7 +1161,7 @@
return ([selectionOwner respondsToSelector: @selector(copySelection)]
&& [selectionOwner respondsToSelector: @selector(deleteSelection)]);
}
else if (sel_eq(action, @selector(delete:)))
else if (sel_isEqual(action, @selector(delete:)))
{
if ([s count] == 0)
return NO;
@ -1177,7 +1177,7 @@
return [selectionOwner respondsToSelector: @selector(deleteSelection)];
}
else if (sel_eq(action, @selector(paste:)))
else if (sel_isEqual(action, @selector(paste:)))
{
if ([s count] == 0)
return NO;
@ -1193,7 +1193,7 @@
return [selectionOwner respondsToSelector: @selector(pasteInSelection)];
}
else if (sel_eq(action, @selector(setName:)))
else if (sel_isEqual(action, @selector(setName:)))
{
NSString *n;
id o;
@ -1219,12 +1219,12 @@
return NO;
}
}
else if(sel_eq(action, @selector(createSubclass:)) ||
sel_eq(action, @selector(loadClass:)) ||
sel_eq(action, @selector(createClassFiles:)) ||
sel_eq(action, @selector(instantiateClass:)) ||
sel_eq(action, @selector(addAttributeToClass:)) ||
sel_eq(action, @selector(remove:)))
else if(sel_isEqual(action, @selector(createSubclass:)) ||
sel_isEqual(action, @selector(loadClass:)) ||
sel_isEqual(action, @selector(createClassFiles:)) ||
sel_isEqual(action, @selector(instantiateClass:)) ||
sel_isEqual(action, @selector(addAttributeToClass:)) ||
sel_isEqual(action, @selector(remove:)))
{
if(active == nil)
{
@ -1236,7 +1236,7 @@
return NO;
}
if(sel_eq(action, @selector(createSubclass:)))
if(sel_isEqual(action, @selector(createSubclass:)))
{
NSArray *s = [selectionOwner selection];
id o = nil;
@ -1257,8 +1257,8 @@
return NO;
}
if(sel_eq(action, @selector(createClassFiles:)) ||
sel_eq(action, @selector(remove:)))
if(sel_isEqual(action, @selector(createClassFiles:)) ||
sel_isEqual(action, @selector(remove:)))
{
id o = nil;
NSString *name = nil;
@ -1280,7 +1280,7 @@
}
}
if(sel_eq(action, @selector(instantiateClass:)))
if(sel_isEqual(action, @selector(instantiateClass:)))
{
id o = nil;
NSString *name = nil;
@ -1308,9 +1308,9 @@
}
}
}
else if(sel_eq(action, @selector(loadSound:)) ||
sel_eq(action, @selector(loadImage:)) ||
sel_eq(action, @selector(debug:)))
else if(sel_isEqual(action, @selector(loadSound:)) ||
sel_isEqual(action, @selector(loadImage:)) ||
sel_isEqual(action, @selector(debug:)))
{
if(active == nil)
{