diff --git a/AppKit/English.lproj/NSSpellingViewController.xib b/AppKit/English.lproj/NSSpellingViewController.xib index bd6e2ccb..48025ffa 100644 --- a/AppKit/English.lproj/NSSpellingViewController.xib +++ b/AppKit/English.lproj/NSSpellingViewController.xib @@ -30,7 +30,7 @@ YES - NSObject + NSSpellingViewController FirstResponder @@ -311,6 +311,14 @@ YES + + + view + + + + 23 + @@ -614,9 +622,1434 @@ - 22 + 23 + + + + YES + + NSActionCell + NSCell + + IBProjectSource + NSActionCell.h + + + + NSApplication + NSResponder + + YES + + YES + activateContextHelpMode: + arrangeInFront: + hide: + hideOtherApplications: + miniaturizeAll: + orderFrontCharacterPalette: + orderFrontColorPanel: + orderFrontStandardAboutPanel: + runPageLayout: + showHelp: + stop: + terminate: + unhide: + unhideAllApplications: + + + YES + id + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + activateContextHelpMode: + arrangeInFront: + hide: + hideOtherApplications: + miniaturizeAll: + orderFrontCharacterPalette: + orderFrontColorPanel: + orderFrontStandardAboutPanel: + runPageLayout: + showHelp: + stop: + terminate: + unhide: + unhideAllApplications: + + + YES + + activateContextHelpMode: + id + + + arrangeInFront: + id + + + hide: + id + + + hideOtherApplications: + id + + + miniaturizeAll: + id + + + orderFrontCharacterPalette: + id + + + orderFrontColorPanel: + id + + + orderFrontStandardAboutPanel: + id + + + runPageLayout: + id + + + showHelp: + id + + + stop: + id + + + terminate: + id + + + unhide: + id + + + unhideAllApplications: + id + + + + + IBProjectSource + NSApplication.h + + + + NSBrowser + NSControl + + YES + + YES + doClick: + doDoubleClick: + scrollViaScroller: + + + YES + id + id + NSScroller + + + + YES + + YES + doClick: + doDoubleClick: + scrollViaScroller: + + + YES + + doClick: + id + + + doDoubleClick: + id + + + scrollViaScroller: + NSScroller + + + + + IBProjectSource + NSBrowser.h + + + + NSButton + NSControl + + performClick: + id + + + performClick: + + performClick: + id + + + + IBProjectSource + NSButton.h + + + + NSButtonCell + NSActionCell + + performClick: + id + + + performClick: + + performClick: + id + + + + IBProjectSource + NSButtonCell.h + + + + NSCell + NSObject + + YES + + YES + takeFloatValueFrom: + takeIntValueFrom: + takeObjectValueFrom: + takeStringValueFrom: + + + YES + id + id + id + id + + + + YES + + YES + takeFloatValueFrom: + takeIntValueFrom: + takeObjectValueFrom: + takeStringValueFrom: + + + YES + + takeFloatValueFrom: + id + + + takeIntValueFrom: + id + + + takeObjectValueFrom: + id + + + takeStringValueFrom: + id + + + + + IBProjectSource + NSCell.h + + + + NSControl + NSView + + YES + + YES + performClick: + takeDoubleValueFrom: + takeFloatValueFrom: + takeIntValueFrom: + takeObjectValueFrom: + takeStringValueFrom: + + + YES + id + id + id + id + id + id + + + + YES + + YES + performClick: + takeDoubleValueFrom: + takeFloatValueFrom: + takeIntValueFrom: + takeObjectValueFrom: + takeStringValueFrom: + + + YES + + performClick: + id + + + takeDoubleValueFrom: + id + + + takeFloatValueFrom: + id + + + takeIntValueFrom: + id + + + takeObjectValueFrom: + id + + + takeStringValueFrom: + id + + + + + IBProjectSource + NSControl.h + + + + NSMenu + NSObject + + IBProjectSource + NSMenu.subproj/NSMenu.h + + + + NSMenuItem + NSObject + + IBProjectSource + NSMenu.subproj/NSMenuItem.h + + + + NSObject + + IBProjectSource + ../CoreGraphics/CGWindow.h + + + + NSObject + + IBProjectSource + NSAccessibility.h + + + + NSObject + + IBProjectSource + NSAlert.h + + + + NSObject + + IBProjectSource + NSAnimation/NSAnimation.h + + + + NSObject + + + + NSObject + + + + NSObject + + changeColor: + id + + + changeColor: + + changeColor: + id + + + + IBProjectSource + NSColorPanel.h + + + + NSObject + + IBProjectSource + NSComboBox.h + + + + NSObject + + IBProjectSource + NSComboBoxCell.h + + + + NSObject + + + + NSObject + + IBProjectSource + NSDatePickerCell.h + + + + NSObject + + YES + + YES + concludeDragOperation: + draggingExited: + + + YES + id + id + + + + YES + + YES + concludeDragOperation: + draggingExited: + + + YES + + concludeDragOperation: + id + + + draggingExited: + id + + + + + IBProjectSource + NSDragging.h + + + + NSObject + + IBProjectSource + NSDrawer.subproj/NSDrawer.h + + + + NSObject + + IBProjectSource + NSFontManager.h + + + + NSObject + + IBProjectSource + NSKeyValueBinding/NSObject+BindingSupport.h + + + + NSObject + + + + NSObject + + IBProjectSource + NSOutlineView.h + + + + NSObject + + pasteboardChangedOwner: + NSPasteboard + + + pasteboardChangedOwner: + + pasteboardChangedOwner: + NSPasteboard + + + + IBProjectSource + NSPasteboard.h + + + + NSObject + + IBProjectSource + NSSplitView.h + + + + NSObject + + IBProjectSource + NSTabView.h + + + + NSObject + + IBProjectSource + NSTableView.h + + + + NSObject + + IBProjectSource + NSText.h + + + + NSObject + + IBProjectSource + NSTextView.subproj/NSTextStorage.h + + + + NSObject + + IBProjectSource + NSTextView.subproj/NSTextView.h + + + + NSObject + + IBProjectSource + NSToolbar.subproj/NSToolbar.h + + + + NSObject + + IBProjectSource + NSToolbar.subproj/NSToolbarItem.h + + + + NSObject + + IBProjectSource + NSView.h + + + + NSObject + + IBProjectSource + NSWindow.h + + + + NSObject + + IBProjectSource + NSWindowAnimationContext.h + + + + NSObject + + IBProjectSource + nib.subproj/NSNibLoading.h + + + + NSPasteboard + NSObject + + + + NSPopUpButton + NSButton + + IBProjectSource + NSPopUpButton.h + + + + NSResponder + NSObject + + YES + + YES + capitalizeWord: + centerSelectionInVisibleArea: + changeCaseOfLetter: + complete: + deleteBackward: + deleteForward: + deleteToBeginningOfLine: + deleteToBeginningOfParagraph: + deleteToEndOfLine: + deleteToEndOfParagraph: + deleteToMark: + deleteWordBackward: + deleteWordForward: + indent: + insertBacktab: + insertNewline: + insertNewlineIgnoringFieldEditor: + insertParagraphSeparator: + insertTab: + insertTabIgnoringFieldEditor: + lowercaseWord: + moveBackward: + moveBackwardAndModifySelection: + moveDown: + moveDownAndModifySelection: + moveForward: + moveForwardAndModifySelection: + moveLeft: + moveLeftAndModifySelection: + moveRight: + moveRightAndModifySelection: + moveToBeginningOfDocument: + moveToBeginningOfDocumentAndModifySelection: + moveToBeginningOfLine: + moveToBeginningOfParagraph: + moveToEndOfDocument: + moveToEndOfDocumentAndModifySelection: + moveToEndOfLine: + moveToEndOfParagraph: + moveUp: + moveUpAndModifySelection: + moveWordBackward: + moveWordBackwardAndModifySelection: + moveWordForward: + moveWordForwardAndModifySelection: + moveWordLeft: + moveWordLeftAndModifySelection: + moveWordRight: + moveWordRightAndModifySelection: + noop: + pageDown: + pageUp: + scrollLineDown: + scrollLineUp: + scrollPageDown: + scrollPageUp: + selectAll: + selectLine: + selectParagraph: + selectToMark: + selectWord: + setMark: + swapWithMark: + transpose: + transposeWords: + uppercaseWord: + yank: + + + YES + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + capitalizeWord: + centerSelectionInVisibleArea: + changeCaseOfLetter: + complete: + deleteBackward: + deleteForward: + deleteToBeginningOfLine: + deleteToBeginningOfParagraph: + deleteToEndOfLine: + deleteToEndOfParagraph: + deleteToMark: + deleteWordBackward: + deleteWordForward: + indent: + insertBacktab: + insertNewline: + insertNewlineIgnoringFieldEditor: + insertParagraphSeparator: + insertTab: + insertTabIgnoringFieldEditor: + lowercaseWord: + moveBackward: + moveBackwardAndModifySelection: + moveDown: + moveDownAndModifySelection: + moveForward: + moveForwardAndModifySelection: + moveLeft: + moveLeftAndModifySelection: + moveRight: + moveRightAndModifySelection: + moveToBeginningOfDocument: + moveToBeginningOfDocumentAndModifySelection: + moveToBeginningOfLine: + moveToBeginningOfParagraph: + moveToEndOfDocument: + moveToEndOfDocumentAndModifySelection: + moveToEndOfLine: + moveToEndOfParagraph: + moveUp: + moveUpAndModifySelection: + moveWordBackward: + moveWordBackwardAndModifySelection: + moveWordForward: + moveWordForwardAndModifySelection: + moveWordLeft: + moveWordLeftAndModifySelection: + moveWordRight: + moveWordRightAndModifySelection: + noop: + pageDown: + pageUp: + scrollLineDown: + scrollLineUp: + scrollPageDown: + scrollPageUp: + selectAll: + selectLine: + selectParagraph: + selectToMark: + selectWord: + setMark: + swapWithMark: + transpose: + transposeWords: + uppercaseWord: + yank: + + + YES + + capitalizeWord: + id + + + centerSelectionInVisibleArea: + id + + + changeCaseOfLetter: + id + + + complete: + id + + + deleteBackward: + id + + + deleteForward: + id + + + deleteToBeginningOfLine: + id + + + deleteToBeginningOfParagraph: + id + + + deleteToEndOfLine: + id + + + deleteToEndOfParagraph: + id + + + deleteToMark: + id + + + deleteWordBackward: + id + + + deleteWordForward: + id + + + indent: + id + + + insertBacktab: + id + + + insertNewline: + id + + + insertNewlineIgnoringFieldEditor: + id + + + insertParagraphSeparator: + id + + + insertTab: + id + + + insertTabIgnoringFieldEditor: + id + + + lowercaseWord: + id + + + moveBackward: + id + + + moveBackwardAndModifySelection: + id + + + moveDown: + id + + + moveDownAndModifySelection: + id + + + moveForward: + id + + + moveForwardAndModifySelection: + id + + + moveLeft: + id + + + moveLeftAndModifySelection: + id + + + moveRight: + id + + + moveRightAndModifySelection: + id + + + moveToBeginningOfDocument: + id + + + moveToBeginningOfDocumentAndModifySelection: + id + + + moveToBeginningOfLine: + id + + + moveToBeginningOfParagraph: + id + + + moveToEndOfDocument: + id + + + moveToEndOfDocumentAndModifySelection: + id + + + moveToEndOfLine: + id + + + moveToEndOfParagraph: + id + + + moveUp: + id + + + moveUpAndModifySelection: + id + + + moveWordBackward: + id + + + moveWordBackwardAndModifySelection: + id + + + moveWordForward: + id + + + moveWordForwardAndModifySelection: + id + + + moveWordLeft: + id + + + moveWordLeftAndModifySelection: + id + + + moveWordRight: + id + + + moveWordRightAndModifySelection: + id + + + noop: + id + + + pageDown: + id + + + pageUp: + id + + + scrollLineDown: + id + + + scrollLineUp: + id + + + scrollPageDown: + id + + + scrollPageUp: + id + + + selectAll: + id + + + selectLine: + id + + + selectParagraph: + id + + + selectToMark: + id + + + selectWord: + id + + + setMark: + id + + + swapWithMark: + id + + + transpose: + id + + + transposeWords: + id + + + uppercaseWord: + id + + + yank: + id + + + + + IBProjectSource + NSResponder.h + + + + NSScroller + NSControl + + IBProjectSource + NSScroller.h + + + + NSSpellingViewController + NSViewController + + YES + + YES + _changeButton + _currentWord + _defineButton + _findNextButton + _guessButton + _ignoreButton + _languagesPopUp + _learnButton + _suggestionBrowser + + + YES + NSButton + NSTextField + NSButton + NSButton + NSButton + NSButton + NSPopUpButton + NSButton + NSBrowser + + + + YES + + YES + _changeButton + _currentWord + _defineButton + _findNextButton + _guessButton + _ignoreButton + _languagesPopUp + _learnButton + _suggestionBrowser + + + YES + + _changeButton + NSButton + + + _currentWord + NSTextField + + + _defineButton + NSButton + + + _findNextButton + NSButton + + + _guessButton + NSButton + + + _ignoreButton + NSButton + + + _languagesPopUp + NSPopUpButton + + + _learnButton + NSButton + + + _suggestionBrowser + NSBrowser + + + + + IBProjectSource + NSSpellingViewController.h + + + + NSTextField + NSControl + + selectText: + id + + + selectText: + + selectText: + id + + + + IBProjectSource + NSTextField.h + + + + NSTextFieldCell + NSActionCell + + IBProjectSource + NSTextFieldCell.h + + + + NSView + + IBProjectSource + NSInterfacePart/NSGraphicsStyle.h + + + + NSView + + IBProjectSource + NSRulerView.h + + + + NSView + NSResponder + + print: + id + + + print: + + print: + id + + + + + + NSViewController + NSResponder + + IBProjectSource + NSViewController.h + + + + + YES + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObjectScripting.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPortCoder.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptObjectSpecifiers.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptWhoseTests.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLDownload.h + + + - 0 IBCocoaFramework @@ -624,7 +2057,7 @@ YES - + ../AppKit.xcodeproj 3 YES diff --git a/AppKit/NSSpellChecker.m b/AppKit/NSSpellChecker.m index 9c07bc1d..b3c64b9b 100644 --- a/AppKit/NSSpellChecker.m +++ b/AppKit/NSSpellChecker.m @@ -213,6 +213,9 @@ static NSSpellChecker *shared=nil; NSView *view=[_spellingViewController view]; _spellingPanel=[[NSPanel alloc] initWithContentRect:[view frame] styleMask:NSUtilityWindowMask backing:NSBackingStoreBuffered defer:YES]; + + [_spellingPanel setContentView:view]; + [_spellingPanel center]; } diff --git a/AppKit/NSText.h b/AppKit/NSText.h index f49b12e4..2c94b761 100755 --- a/AppKit/NSText.h +++ b/AppKit/NSText.h @@ -132,6 +132,9 @@ APPKIT_EXPORT NSString * const NSTextDidChangeNotification; -(void)copyRuler:sender; -(void)pasteRuler:sender; +-(void)showGuessPanel:sender; +-(void)checkSpelling:sender; + @end @interface NSObject(NSText_delegate) diff --git a/AppKit/NSText.m b/AppKit/NSText.m index be7afc29..85f9b243 100755 --- a/AppKit/NSText.m +++ b/AppKit/NSText.m @@ -272,5 +272,13 @@ NSString * const NSTextDidChangeNotification=@"NSTextDidChangeNotification"; NSInvalidAbstractInvocation(); } +-(void)showGuessPanel:sender { + NSInvalidAbstractInvocation(); +} + +-(void)checkSpelling:sender { + NSInvalidAbstractInvocation(); +} + @end diff --git a/AppKit/NSTextView.subproj/NSTextView.m b/AppKit/NSTextView.subproj/NSTextView.m index 3da41ffe..f7b0b158 100755 --- a/AppKit/NSTextView.subproj/NSTextView.m +++ b/AppKit/NSTextView.subproj/NSTextView.m @@ -2601,6 +2601,15 @@ NSString * const NSOldSelectedCharacterRange=@"NSOldSelectedCharacterRange"; [[NSSpellChecker sharedSpellChecker] ignoreWord:[[sender selectedCell] stringValue] inSpellDocumentWithTag: [self spellCheckerDocumentTag]]; } +-(void)showGuessPanel:sender { + [[[NSSpellChecker sharedSpellChecker] spellingPanel] makeKeyAndOrderFront: self]; +} + +-(void)checkSpelling:sender { + [NSSpellChecker sharedSpellChecker]; + NSUnimplementedMethod(); +} + -(NSInteger)spellCheckerDocumentTag { /* There is no explicity invalid document tag, this is indirectly documented as zero in the full checkSpellingOfString: method. and supported by behavior. */ diff --git a/Foundation/NSSpellEngine.h b/Foundation/NSSpellEngine.h index afe97e77..ecee8875 100644 --- a/Foundation/NSSpellEngine.h +++ b/Foundation/NSSpellEngine.h @@ -14,4 +14,6 @@ } ++(void)registerEngine; + @end diff --git a/Foundation/NSSpellEngine.m b/Foundation/NSSpellEngine.m index 67b0742b..81b49875 100644 --- a/Foundation/NSSpellEngine.m +++ b/Foundation/NSSpellEngine.m @@ -8,9 +8,32 @@ #import #import +#import +#import @implementation NSSpellEngine ++(void)initialize { + if(self==[NSSpellEngine class]){ + + NSArray *allPaths=[[NSBundle bundleForClass:self] pathsForResourcesOfType:@"spellEngine" inDirectory:nil]; + int i,count=[allPaths count]; + + for(i=0;iCFBundleVersion 1 NSPrincipalClass - + NSSpellEngine_hunspell