diff --git a/include/wx/notifmsg.h b/include/wx/notifmsg.h index ef7c2ceda3..523af49a43 100644 --- a/include/wx/notifmsg.h +++ b/include/wx/notifmsg.h @@ -123,7 +123,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_NOTIFICATION_MESSAGE_ACTION, w #if (defined(__WXGTK__) && wxUSE_LIBNOTIFY) || \ (defined(__WXMSW__) && wxUSE_TASKBARICON && wxUSE_TASKBARICON_BALLOONS) || \ - (defined(__WXOSX_COCOA__) && (__MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8)) + defined(__WXOSX_COCOA__) #define wxHAS_NATIVE_NOTIFICATION_MESSAGE #endif diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index c59c8bb231..08921a8048 100644 --- a/include/wx/osx/cocoa/private.h +++ b/include/wx/osx/cocoa/private.h @@ -171,23 +171,13 @@ public : void SetupCoordinates(wxCoord &x, wxCoord &y, NSEvent *nsEvent); virtual bool SetupCursor(NSEvent* event); -#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10 - #ifdef API_AVAILABLE - #define WX_AVAILABLE_10_10 API_AVAILABLE(macos(10.10)) - #else - #define WX_AVAILABLE_10_10 - #endif - - WX_AVAILABLE_10_10 virtual void PanGestureEvent(NSPanGestureRecognizer *panGestureRecognizer); - WX_AVAILABLE_10_10 virtual void ZoomGestureEvent(NSMagnificationGestureRecognizer *magnificationGestureRecognizer); - WX_AVAILABLE_10_10 virtual void RotateGestureEvent(NSRotationGestureRecognizer *rotationGestureRecognizer); - WX_AVAILABLE_10_10 virtual void LongPressEvent(NSPressGestureRecognizer *pressGestureRecognizer); - WX_AVAILABLE_10_10 virtual void TouchesBegan(NSEvent *event); - WX_AVAILABLE_10_10 virtual void TouchesMoved(NSEvent *event); - WX_AVAILABLE_10_10 virtual void TouchesEnded(NSEvent *event); - - #undef WX_AVAILABLE_10_10 -#endif // __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10 + virtual void PanGestureEvent(NSPanGestureRecognizer *panGestureRecognizer); + virtual void ZoomGestureEvent(NSMagnificationGestureRecognizer *magnificationGestureRecognizer); + virtual void RotateGestureEvent(NSRotationGestureRecognizer *rotationGestureRecognizer); + virtual void LongPressEvent(NSPressGestureRecognizer *pressGestureRecognizer); + virtual void TouchesBegan(NSEvent *event); + virtual void TouchesMoved(NSEvent *event); + virtual void TouchesEnded(NSEvent *event); #if !wxOSX_USE_NATIVE_FLIPPED void SetFlipped(bool flipped);