* Headers/AppKit/NSAnimation.h

* Headers/AppKit/NSApplication.h
        * Headers/AppKit/NSControl.h
        * Headers/AppKit/NSPopover.h
        * Headers/AppKit/NSSavePanel.h
        * Headers/AppKit/NSTableView.h
        * Headers/AppKit/NSTextView.h
        * Headers/AppKit/NSWindow.h: Use GS_PROTOCOLS_HAVE_OPTIONAL to
        protect the @optional keyword in protocol definitions.
        Based on base patch by Marcus Mueller <znek@mulle-kybernetik.com>.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@37530 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2013-12-31 18:30:46 +00:00
parent dc50232e07
commit 4c0f9fbc97
9 changed files with 24 additions and 9 deletions

View file

@ -1,3 +1,16 @@
2013-12-31 Fred Kiefer <FredKiefer@gmx.de>
* Headers/AppKit/NSAnimation.h
* Headers/AppKit/NSApplication.h
* Headers/AppKit/NSControl.h
* Headers/AppKit/NSPopover.h
* Headers/AppKit/NSSavePanel.h
* Headers/AppKit/NSTableView.h
* Headers/AppKit/NSTextView.h
* Headers/AppKit/NSWindow.h: Use GS_PROTOCOLS_HAVE_OPTIONAL to
protect the @optional keyword in protocol definitions.
Based on base patch by Marcus Mueller <znek@mulle-kybernetik.com>.
2013-12-26 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSImage.m: Add description method.

View file

@ -264,7 +264,7 @@ APPKIT_EXPORT NSString *NSAnimationTriggerOrderOut;
@end
@protocol NSAnimationDelegate <NSObject>
#ifdef __OBJC2__
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST) && GS_PROTOCOLS_HAVE_OPTIONAL
@optional
#else
@end

View file

@ -446,7 +446,7 @@ APPKIT_EXPORT NSString *NSEventTrackingRunLoopMode;
* <code>NSApp</code> to use default implementations in other cases.
*/
@protocol NSApplicationDelegate <NSObject>
#ifdef __OBJC2__
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST) && GS_PROTOCOLS_HAVE_OPTIONAL
@optional
#else
@end

View file

@ -201,7 +201,7 @@ APPKIT_EXPORT NSString *NSControlTextDidChangeNotification;
// Methods Implemented by the Delegate
//
@protocol NSControlTextEditingDelegate <NSObject>
#ifdef __OBJC2__
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST) && GS_PROTOCOLS_HAVE_OPTIONAL
@optional
#else
@end

View file

@ -33,6 +33,7 @@
#import <AppKit/NSNibDeclarations.h>
#import <AppKit/NSResponder.h>
#if OS_API_VERSION(MAC_OS_X_VERSION_10_7, GS_API_LATEST)
/* Keys */
APPKIT_EXPORT NSString *NSPopoverCloseReasonKey;
APPKIT_EXPORT NSString *NSPopoverCloseReasonStandard;
@ -104,7 +105,7 @@ typedef NSInteger NSPopoverBehavior;
/* Delegate */
@protocol NSPopoverDelegate
#ifdef __OBJC2__
#if GS_PROTOCOLS_HAVE_OPTIONAL
@optional
#else
@end
@ -119,3 +120,4 @@ typedef NSInteger NSPopoverBehavior;
@end
#endif
#endif

View file

@ -59,7 +59,7 @@ enum {
};
@protocol NSOpenSavePanelDelegate <NSObject>
#ifdef __OBJC2__
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST) && GS_PROTOCOLS_HAVE_OPTIONAL
@optional
#else
@end

View file

@ -352,7 +352,7 @@ typedef enum _NSTableViewColumnAutoresizingStyle
*/
@protocol NSTableViewDataSource
#ifdef __OBJC2__
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST) && GS_PROTOCOLS_HAVE_OPTIONAL
@optional
#else
@end
@ -409,7 +409,7 @@ APPKIT_EXPORT NSString *NSTableViewSelectionIsChangingNotification;
*/
@protocol NSTableViewDelegate <NSObject>
#ifdef __OBJC2__
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST) && GS_PROTOCOLS_HAVE_OPTIONAL
@optional
#else
@end

View file

@ -655,7 +655,7 @@ layout manager. */
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
@protocol NSTextViewDelegate <NSObject>
#ifdef __OBJC2__
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST) && GS_PROTOCOLS_HAVE_OPTIONAL
@optional
#else
@end

View file

@ -827,7 +827,7 @@ PACKAGE_SCOPE
#ifdef GNUSTEP
@protocol NSWindowDelegate <NSObject>
#ifdef __OBJC2__
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST) && GS_PROTOCOLS_HAVE_OPTIONAL
@optional
#else
@end