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

Fixes to NSOpenSavePanelDelegate and NSTextFieldDelegate definitions

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@35243 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2012-06-28 19:40:57 +00:00
parent d888d2ec77
commit 36dd211066
2 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Headers/AppKit/NSControl.h
View file

@ -44,23 +44,6 @@
@class NSEvent; @class NSEvent;
@class NSTextView; @class NSTextView;
@protocol NSControlTextEditingDelegate <NSObject>
#if defined(__OBJC2__)
@optional
- (BOOL)control:(NSControl*)control didFailToFormatString:(NSString*)formatString errorDescription:(NSString*)error;
- (void)control:(NSControl*)control didFailToValidatePartialString:(NSString*)string errorDescription:(NSString*)error;
- (BOOL)control:(NSControl*)control isValidObject:(id)object;
- (BOOL)control:(NSControl*)control textShouldBeginEditing:(NSText*)fieldEditor;
- (BOOL)control:(NSControl*)control textShouldEndEditing:(NSText*)fieldEditor;
- (NSArray*)control:(NSControl*)control textView:(NSTextView*)textView
completions:(NSArray*)words
forPartialWordRange:(NSRange)charRange
indexOfSelectedItem:(NSInteger*)index;
- (BOOL)control:(NSControl*)control textView:(NSTextView*)textView doCommandBySelector:(SEL)command;
#endif
@end
@interface NSControl : NSView @interface NSControl : NSView
{ {
// Attributes // Attributes
@ -217,7 +200,13 @@ APPKIT_EXPORT NSString *NSControlTextDidChangeNotification;
// //
// Methods Implemented by the Delegate // Methods Implemented by the Delegate
// //
@interface NSObject (NSControlDelegate) @protocol NSControlTextEditingDelegate <NSObject>
#ifdef __OBJC2__
@optional
#else
@end
@interface NSObject (NSControlTextEditingDelegate)
#endif
- (BOOL) control: (NSControl *)control isValidObject:(id)object; - (BOOL) control: (NSControl *)control isValidObject:(id)object;
- (BOOL) control: (NSControl *)control - (BOOL) control: (NSControl *)control
@ -227,9 +216,7 @@ APPKIT_EXPORT NSString *NSControlTextDidChangeNotification;
textShouldEndEditing: (NSText *)fieldEditor; textShouldEndEditing: (NSText *)fieldEditor;
- (void) controlTextDidBeginEditing: (NSNotification *)aNotification; - (void) controlTextDidBeginEditing: (NSNotification *)aNotification;
- (void) controlTextDidEndEditing: (NSNotification *)aNotification; - (void) controlTextDidEndEditing: (NSNotification *)aNotification;
- (void) controlTextDidChange: (NSNotification *)aNotification; - (void) controlTextDidChange: (NSNotification *)aNotification;
- (BOOL) control: (NSControl *)control - (BOOL) control: (NSControl *)control
@ -254,5 +241,10 @@ APPKIT_EXPORT NSString *NSControlTextDidChangeNotification;
@end @end
@interface NSObject (NSControlDelegate)
- (void) controlTextDidBeginEditing: (NSNotification *)aNotification;
- (void) controlTextDidEndEditing: (NSNotification *)aNotification;
- (void) controlTextDidChange: (NSNotification *)aNotification;
@end
#endif // _GNUstep_H_NSControl #endif // _GNUstep_H_NSControl

7
Headers/AppKit/NSSavePanel.h
View file

@ -58,8 +58,12 @@ enum {
}; };
@protocol NSOpenSavePanelDelegate <NSObject> @protocol NSOpenSavePanelDelegate <NSObject>
#if defined(__OBJC2__) #ifdef __OBJC2__
@optional @optional
#else
@end
@interface NSObject (NSOpenSavePanelDelegate)
#endif
- (BOOL)panel:(id)sender shouldEnableURL:(NSURL*)url; - (BOOL)panel:(id)sender shouldEnableURL:(NSURL*)url;
- (BOOL)panel:(id)sender validateURL:(NSURL*)url error:(NSError **)error; - (BOOL)panel:(id)sender validateURL:(NSURL*)url error:(NSError **)error;
- (void)panel:(id)sender didChangeToDirectoryURL:(NSURL*)url; - (void)panel:(id)sender didChangeToDirectoryURL:(NSURL*)url;
@ -75,7 +79,6 @@ enum {
with:(NSString*)name2 with:(NSString*)name2
caseSensitive:(BOOL)caseSensitive; caseSensitive:(BOOL)caseSensitive;
- (BOOL)panel:(id)sender shouldShowFilename:(NSString*)filename; - (BOOL)panel:(id)sender shouldShowFilename:(NSString*)filename;
#endif
@end @end