diff --git a/ChangeLog b/ChangeLog index 75ea955d2..42ab6bc2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2010-09-09 Eric Wasylishen + + * Source/GSTheme.m: + * Source/NSMenu.m: + * Source/NSWindow.m: + * Source/NSObjectController.m: + * Source/NSImageView.m: + * Source/NSResponder.m: + * Source/NSApplication.m: + * Source/NSComboBox.m: + * Source/NSTextView.m: + * Source/NSDocumentController.m: + * Source/NSDocument.m: + Replace sel_eq with sel_isEqual + 2010-09-06 German Arias * Panels/Spanish.lproj/GSFindPanel.gorm: Fixed a misspelling. diff --git a/Source/GSTheme.m b/Source/GSTheme.m index c03acf32c..a26c185ba 100644 --- a/Source/GSTheme.m +++ b/Source/GSTheme.m @@ -1345,7 +1345,7 @@ typedef struct { * signature of methodSignatureForSelector:, so we hack in * the signature required manually :-( */ - if (sel_eq(aSelector, _cmd)) + if (sel_isEqual(aSelector, _cmd)) { static NSMethodSignature *sig = nil; diff --git a/Source/NSApplication.m b/Source/NSApplication.m index 26fb5db5b..fcd40c8d8 100644 --- a/Source/NSApplication.m +++ b/Source/NSApplication.m @@ -3014,13 +3014,13 @@ image.

See Also: -applicationIconImage

count = [itemArray count]; i = 0; - if (count > 0 && sel_eq([[itemArray objectAtIndex: 0] action], + if (count > 0 && sel_isEqual([[itemArray objectAtIndex: 0] action], @selector(arrangeInFront:))) i++; - if (count > i && sel_eq([[itemArray objectAtIndex: count-1] action], + if (count > i && sel_isEqual([[itemArray objectAtIndex: count-1] action], @selector(performClose:))) count--; - if (count > i && sel_eq([[itemArray objectAtIndex: count-1] action], + if (count > i && sel_isEqual([[itemArray objectAtIndex: count-1] action], @selector(performMiniaturize:))) count--; diff --git a/Source/NSComboBox.m b/Source/NSComboBox.m index 8a5448efe..060bc24a6 100644 --- a/Source/NSComboBox.m +++ b/Source/NSComboBox.m @@ -491,7 +491,7 @@ static NSNotificationCenter *nc; { if ([super textView: textView doCommandBySelector: command]) return YES; - if (sel_eq(command, @selector(moveDown:))) + if (sel_isEqual(command, @selector(moveDown:))) { [_cell _performClickWithFrame: [self bounds] inView: self]; return YES; diff --git a/Source/NSDocument.m b/Source/NSDocument.m index e6a03a09e..9f706d5ef 100644 --- a/Source/NSDocument.m +++ b/Source/NSDocument.m @@ -1457,9 +1457,9 @@ originalContentsURL: (NSURL *)orig - (BOOL) validateUserInterfaceItem: (id )anItem { - if (sel_eq([anItem action], @selector(revertDocumentToSaved:))) + if (sel_isEqual([anItem action], @selector(revertDocumentToSaved:))) return ([self fileName] != nil && [self isDocumentEdited]); - if (sel_eq([anItem action], @selector(saveDocument:))) + if (sel_isEqual([anItem action], @selector(saveDocument:))) return [self isDocumentEdited]; // FIXME should validate spa popup items; return YES if it's a native type. diff --git a/Source/NSDocumentController.m b/Source/NSDocumentController.m index bc28334d9..768405f7d 100644 --- a/Source/NSDocumentController.m +++ b/Source/NSDocumentController.m @@ -1188,11 +1188,11 @@ static BOOL _shouldClose = YES; - (BOOL) validateUserInterfaceItem: (id )anItem { - if (sel_eq([anItem action], @selector(saveAllDocuments:))) + if (sel_isEqual([anItem action], @selector(saveAllDocuments:))) { return [self hasEditedDocuments]; } - if (sel_eq([anItem action], @selector(newDocument:))) + if (sel_isEqual([anItem action], @selector(newDocument:))) { return ([self defaultType] != nil); } diff --git a/Source/NSImageView.m b/Source/NSImageView.m index 6a7dadc13..5eb702e43 100644 --- a/Source/NSImageView.m +++ b/Source/NSImageView.m @@ -230,12 +230,12 @@ static Class imageCellClass; if (_allowsCutCopyPaste) { - if (sel_eq(action, @selector(cut:)) || - sel_eq(action, @selector(copy:)) || - sel_eq(action, @selector(deleteBackward:)) || - sel_eq(action, @selector(delete:))) + if (sel_isEqual(action, @selector(cut:)) || + sel_isEqual(action, @selector(copy:)) || + sel_isEqual(action, @selector(deleteBackward:)) || + sel_isEqual(action, @selector(delete:))) return [self image] != nil; - if (sel_eq(action, @selector(paste:))) + if (sel_isEqual(action, @selector(paste:))) { return [NSImage canInitWithPasteboard: [NSPasteboard generalPasteboard]]; diff --git a/Source/NSMenu.m b/Source/NSMenu.m index eb17089a6..5c886c4d6 100644 --- a/Source/NSMenu.m +++ b/Source/NSMenu.m @@ -947,7 +947,7 @@ static BOOL menuBarVisible = YES; { NSMenuItem *menuItem = [_items objectAtIndex: i]; - if (actionSelector == 0 || sel_eq([menuItem action], actionSelector)) + if (actionSelector == 0 || sel_isEqual([menuItem action], actionSelector)) { // There are different possibilities to implement the check here if ([menuItem target] == anObject) diff --git a/Source/NSObjectController.m b/Source/NSObjectController.m index 1dca7867c..1f9536ad6 100644 --- a/Source/NSObjectController.m +++ b/Source/NSObjectController.m @@ -354,11 +354,11 @@ { SEL action = [item action]; - if (sel_eq(action, @selector(add:))) + if (sel_isEqual(action, @selector(add:))) { return [self canAdd]; } - else if (sel_eq(action, @selector(remove:))) + else if (sel_isEqual(action, @selector(remove:))) { return [self canRemove]; } diff --git a/Source/NSResponder.m b/Source/NSResponder.m index b59d971aa..d6b813ab5 100644 --- a/Source/NSResponder.m +++ b/Source/NSResponder.m @@ -280,7 +280,7 @@ - (void) noResponderFor: (SEL)eventSelector { /* Only beep for key down events */ - if (sel_eq(eventSelector, @selector(keyDown:))) + if (sel_isEqual(eventSelector, @selector(keyDown:))) NSBeep(); } diff --git a/Source/NSTextView.m b/Source/NSTextView.m index 57cad31f7..759641ad4 100644 --- a/Source/NSTextView.m +++ b/Source/NSTextView.m @@ -2932,36 +2932,36 @@ Scroll so that the beginning of the range is visible. // FIXME The list of validated actions below is far from complete - if (sel_eq(action, @selector(cut:)) || sel_eq(action, @selector(delete:))) + if (sel_isEqual(action, @selector(cut:)) || sel_isEqual(action, @selector(delete:))) return [self isEditable] && [self selectedRange].length > 0; - if (sel_eq(action, @selector(copy:))) + if (sel_isEqual(action, @selector(copy:))) return [self selectedRange].length > 0; - if (sel_eq(action, @selector(copyFont:)) - || sel_eq(action, @selector(copyRuler:))) + if (sel_isEqual(action, @selector(copyFont:)) + || sel_isEqual(action, @selector(copyRuler:))) return [self selectedRange].location != NSNotFound; - if (sel_eq(action, @selector(paste:)) - || sel_eq(action, @selector(pasteAsPlainText:)) - || sel_eq(action, @selector(pasteAsRichText:)) - || sel_eq(action, @selector(pasteFont:)) - || sel_eq(action, @selector(pasteRuler:))) + if (sel_isEqual(action, @selector(paste:)) + || sel_isEqual(action, @selector(pasteAsPlainText:)) + || sel_isEqual(action, @selector(pasteAsRichText:)) + || sel_isEqual(action, @selector(pasteFont:)) + || sel_isEqual(action, @selector(pasteRuler:))) { if ([self isEditable]) { NSArray *types = nil; NSString *available; - if (sel_eq(action, @selector(paste:))) + if (sel_isEqual(action, @selector(paste:))) types = [self readablePasteboardTypes]; - else if (sel_eq(action, @selector(pasteAsPlainText:))) + else if (sel_isEqual(action, @selector(pasteAsPlainText:))) types = [NSArray arrayWithObject: NSStringPboardType]; - else if (sel_eq(action, @selector(pasteAsRichText:))) + else if (sel_isEqual(action, @selector(pasteAsRichText:))) types = [NSArray arrayWithObject: NSRTFPboardType]; - else if (sel_eq(action, @selector(pasteFont:))) + else if (sel_isEqual(action, @selector(pasteFont:))) types = [NSArray arrayWithObject: NSFontPboardType]; - else if (sel_eq(action, @selector(pasteRuler:))) + else if (sel_isEqual(action, @selector(pasteRuler:))) types = [NSArray arrayWithObject: NSRulerPboard]; available = [[NSPasteboard generalPasteboard] @@ -2972,11 +2972,11 @@ Scroll so that the beginning of the range is visible. return NO; } - if (sel_eq(action, @selector(selectAll:)) - || sel_eq(action, @selector(centerSelectionInVisibleArea:))) + if (sel_isEqual(action, @selector(selectAll:)) + || sel_isEqual(action, @selector(centerSelectionInVisibleArea:))) return [self isSelectable]; - if (sel_eq(action, @selector(performFindPanelAction:))) + if (sel_isEqual(action, @selector(performFindPanelAction:))) { if ([self usesFindPanel] == NO) { diff --git a/Source/NSWindow.m b/Source/NSWindow.m index d029af698..ff926561e 100644 --- a/Source/NSWindow.m +++ b/Source/NSWindow.m @@ -4971,19 +4971,19 @@ current key view.
BOOL result = YES; SEL action = [anItem action]; - if (sel_eq(action, @selector(performClose:))) + if (sel_isEqual(action, @selector(performClose:))) { result = ([self styleMask] & NSClosableWindowMask) ? YES : NO; } - else if (sel_eq(action, @selector(performMiniaturize:))) + else if (sel_isEqual(action, @selector(performMiniaturize:))) { result = ([self styleMask] & NSMiniaturizableWindowMask) ? YES : NO; } - else if (sel_eq(action, @selector(performZoom:))) + else if (sel_isEqual(action, @selector(performZoom:))) { result = ([self styleMask] & NSResizableWindowMask) ? YES : NO; } - else if (sel_eq(action, @selector(undo:))) + else if (sel_isEqual(action, @selector(undo:))) { NSUndoManager *undo = [_firstResponder undoManager]; if (undo == nil) @@ -5003,7 +5003,7 @@ current key view.
} } } - else if (sel_eq(action, @selector(redo:))) + else if (sel_isEqual(action, @selector(redo:))) { NSUndoManager *undo = [_firstResponder undoManager]; if (undo == nil) @@ -5023,7 +5023,7 @@ current key view.
} } } - else if (sel_eq(action, @selector(toggleToolbarShown:))) + else if (sel_isEqual(action, @selector(toggleToolbarShown:))) { NSToolbar *toolbar = [self toolbar];