Remove Cocoa code and precompiler defines targeting OS X versions prior to OS X 10.7.
This commit is contained in:
@@ -249,7 +249,7 @@ private:
|
||||
// owned by the set. Furthermore, children of the last parent are stored
|
||||
// in a linear list.
|
||||
//
|
||||
@interface wxCocoaOutlineDataSource : NSObject wxOSX_10_6_AND_LATER(<NSOutlineViewDataSource>)
|
||||
@interface wxCocoaOutlineDataSource : NSObject <NSOutlineViewDataSource>
|
||||
{
|
||||
// descriptors specifying the sorting (currently the array only holds one
|
||||
// object only)
|
||||
@@ -395,7 +395,7 @@ private:
|
||||
// wxCocoaOutlineView
|
||||
// ============================================================================
|
||||
|
||||
@interface wxCocoaOutlineView : NSOutlineView wxOSX_10_6_AND_LATER(<NSOutlineViewDelegate>)
|
||||
@interface wxCocoaOutlineView : NSOutlineView <NSOutlineViewDelegate>
|
||||
{
|
||||
@private
|
||||
// column and row of the cell being edited or -1 if none
|
||||
|
@@ -336,7 +336,7 @@ public:
|
||||
- (void) setTextField:(NSTextField*) field;
|
||||
@end
|
||||
|
||||
@interface wxNSTextField : NSTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>)
|
||||
@interface wxNSTextField : NSTextField <NSTextFieldDelegate>
|
||||
{
|
||||
wxNSTextFieldEditor* fieldEditor;
|
||||
}
|
||||
@@ -346,14 +346,14 @@ public:
|
||||
|
||||
@end
|
||||
|
||||
@interface wxNSSecureTextField : NSSecureTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>)
|
||||
@interface wxNSSecureTextField : NSSecureTextField <NSTextFieldDelegate>
|
||||
{
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
|
||||
@interface wxNSTextView : NSTextView wxOSX_10_6_AND_LATER(<NSTextViewDelegate>)
|
||||
@interface wxNSTextView : NSTextView <NSTextViewDelegate>
|
||||
{
|
||||
}
|
||||
|
||||
@@ -432,7 +432,7 @@ public:
|
||||
#ifdef __LP64__
|
||||
WXEXPORT
|
||||
#endif // 64 bit builds
|
||||
@interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER(<NSApplicationDelegate>)
|
||||
@interface wxNSAppController : NSObject <NSApplicationDelegate>
|
||||
{
|
||||
}
|
||||
|
||||
|
@@ -20,17 +20,6 @@
|
||||
#include "wx/osx/core/cfstring.h"
|
||||
#include "wx/osx/core/cfdataref.h"
|
||||
|
||||
// Define helper macros allowing to insert small snippets of code to be
|
||||
// compiled for high enough OS X version only: this shouldn't be abused for
|
||||
// anything big but it's handy for e.g. specifying OS X 10.6-only protocols in
|
||||
// the Objective C classes declarations when they're not supported under the
|
||||
// previous versions
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
|
||||
#define wxOSX_10_6_AND_LATER(x) x
|
||||
#else
|
||||
#define wxOSX_10_6_AND_LATER(x)
|
||||
#endif
|
||||
|
||||
// platform specific Clang analyzer support
|
||||
#ifndef NS_RETURNS_RETAINED
|
||||
# if WX_HAS_CLANG_FEATURE(attribute_ns_returns_retained)
|
||||
|
Reference in New Issue
Block a user