Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove obsolete macOS SDK guards

Browse Source 
we need SDK 10.11 now
This commit is contained in:
Stefan Csomor
2021-04-07 16:37:58 +02:00
parent fb136cf154
commit 26bc2c015b
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/notifmsg.h
View File

@@ -123,7 +123,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_NOTIFICATION_MESSAGE_ACTION, w
#if (defined(__WXGTK__) && wxUSE_LIBNOTIFY) || \ #if (defined(__WXGTK__) && wxUSE_LIBNOTIFY) || \
(defined(__WXMSW__) && wxUSE_TASKBARICON && wxUSE_TASKBARICON_BALLOONS) || \ (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 #define wxHAS_NATIVE_NOTIFICATION_MESSAGE
#endif #endif

24
include/wx/osx/cocoa/private.h
View File

@@ -171,23 +171,13 @@ public :
void SetupCoordinates(wxCoord &x, wxCoord &y, NSEvent *nsEvent); void SetupCoordinates(wxCoord &x, wxCoord &y, NSEvent *nsEvent);
virtual bool SetupCursor(NSEvent* event); virtual bool SetupCursor(NSEvent* event);
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10 virtual void PanGestureEvent(NSPanGestureRecognizer *panGestureRecognizer);
#ifdef API_AVAILABLE virtual void ZoomGestureEvent(NSMagnificationGestureRecognizer *magnificationGestureRecognizer);
#define WX_AVAILABLE_10_10 API_AVAILABLE(macos(10.10)) virtual void RotateGestureEvent(NSRotationGestureRecognizer *rotationGestureRecognizer);
#else virtual void LongPressEvent(NSPressGestureRecognizer *pressGestureRecognizer);
#define WX_AVAILABLE_10_10 virtual void TouchesBegan(NSEvent *event);
#endif virtual void TouchesMoved(NSEvent *event);
virtual void TouchesEnded(NSEvent *event);
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
#if !wxOSX_USE_NATIVE_FLIPPED #if !wxOSX_USE_NATIVE_FLIPPED
void SetFlipped(bool flipped); void SetFlipped(bool flipped);