Add wxCFStringRef::AsStringWithNormalizationFormC() Cocoa overload.

[wxWidgets.git] / include / wx / osx / core / private.h

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index 9d819143dd626cdae19db7df44df138b284b52b4..9961aaab05fa62d52c8a6ec5fe411e3d0c3241f3 100644 (file)
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -32,29 +32,23 @@
     #define wxOSX_10_6_AND_LATER(x)
 #endif
 
     #define wxOSX_10_6_AND_LATER(x)
 #endif
 

-// common defs for clang analyzer support
-
-#ifndef __has_feature      // Optional.
-    #define __has_feature(x) 0 // Compatibility with non-clang compilers.
-#endif
-
+// platform specific Clang analyzer support

 #ifndef NS_RETURNS_RETAINED
 #ifndef NS_RETURNS_RETAINED

-    #if __has_feature(attribute_ns_returns_retained)
-        #define NS_RETURNS_RETAINED __attribute__((ns_returns_retained))
-    #else
-        #define NS_RETURNS_RETAINED
-    #endif
+#   if WX_HAS_CLANG_FEATURE(attribute_ns_returns_retained)
+#       define NS_RETURNS_RETAINED __attribute__((ns_returns_retained))
+#   else
+#       define NS_RETURNS_RETAINED
+#   endif

 #endif
 
 #ifndef CF_RETURNS_RETAINED
 #endif
 
 #ifndef CF_RETURNS_RETAINED

-    #if __has_feature(attribute_cf_returns_retained)
-        #define CF_RETURNS_RETAINED __attribute__((cf_returns_retained))
-    #else
-        #define CF_RETURNS_RETAINED
-    #endif
+#   if WX_HAS_CLANG_FEATURE(attribute_cf_returns_retained)
+#       define CF_RETURNS_RETAINED __attribute__((cf_returns_retained))
+#   else
+#       define CF_RETURNS_RETAINED
+#   endif

 #endif
 
 #endif
 

-

 #if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_COCOA_OR_CARBON
 
 // Carbon functions are currently still used in wxOSX/Cocoa too (including
 #if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_COCOA_OR_CARBON
 
 // Carbon functions are currently still used in wxOSX/Cocoa too (including


@@ -307,6 +301,8 @@ public :
     virtual void        SetCursor( const wxCursor & cursor ) = 0;
     virtual void        CaptureMouse() = 0;
     virtual void        ReleaseMouse() = 0;
     virtual void        SetCursor( const wxCursor & cursor ) = 0;
     virtual void        CaptureMouse() = 0;
     virtual void        ReleaseMouse() = 0;

+    
+    virtual void        SetDropTarget( wxDropTarget * WXUNUSED(dropTarget) ) {}

 
     virtual wxInt32     GetValue() const = 0;
     virtual void        SetValue( wxInt32 v ) = 0;
 
     virtual wxInt32     GetValue() const = 0;
     virtual void        SetValue( wxInt32 v ) = 0;