From: Brendan Shanks bshanks@codeweavers.com
--- dlls/winemac.drv/cocoa_app.h | 37 ------------------------------------ dlls/winemac.drv/cocoa_app.m | 12 +----------- 2 files changed, 1 insertion(+), 48 deletions(-)
diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 9ba4d86e319..f14b31876f6 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -22,43 +22,6 @@
#include "macdrv_cocoa.h"
-#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 -/* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.12. */ -#define NSCompositingOperationSourceOver NSCompositeSourceOver -#define NSEventMaskAny NSAnyEventMask -#define NSEventMaskLeftMouseDown NSLeftMouseDownMask -#define NSEventMaskOtherMouseDown NSOtherMouseDownMask -#define NSEventMaskRightMouseDown NSRightMouseDownMask -#define NSEventModifierFlagCommand NSCommandKeyMask -#define NSEventModifierFlagControl NSControlKeyMask -#define NSEventModifierFlagOption NSAlternateKeyMask -#define NSEventModifierFlagShift NSShiftKeyMask -#define NSEventTypeAppKitDefined NSAppKitDefined -#define NSEventTypeApplicationDefined NSApplicationDefined -#define NSEventTypeFlagsChanged NSFlagsChanged -#define NSEventTypeKeyDown NSKeyDown -#define NSEventTypeKeyUp NSKeyUp -#define NSEventTypeLeftMouseDown NSLeftMouseDown -#define NSEventTypeLeftMouseDragged NSLeftMouseDragged -#define NSEventTypeLeftMouseUp NSLeftMouseUp -#define NSEventTypeMouseMoved NSMouseMoved -#define NSEventTypeOtherMouseDown NSOtherMouseDown -#define NSEventTypeOtherMouseDragged NSOtherMouseDragged -#define NSEventTypeOtherMouseUp NSOtherMouseUp -#define NSEventTypeRightMouseDown NSRightMouseDown -#define NSEventTypeRightMouseUp NSRightMouseUp -#define NSEventTypeRightMouseDragged NSRightMouseDragged -#define NSEventTypeScrollWheel NSScrollWheel -#define NSWindowStyleMaskBorderless NSBorderlessWindowMask -#define NSWindowStyleMaskClosable NSClosableWindowMask -#define NSWindowStyleMaskFullScreen NSFullScreenWindowMask -#define NSWindowStyleMaskMiniaturizable NSMiniaturizableWindowMask -#define NSWindowStyleMaskResizable NSResizableWindowMask -#define NSWindowStyleMaskTitled NSTitledWindowMask -#define NSWindowStyleMaskUtilityWindow NSUtilityWindowMask -#define NSWindowStyleMaskNonactivatingPanel NSNonactivatingPanelMask -#endif - #define ERR(...) do { if (macdrv_err_on) LogError(__func__, __VA_ARGS__); } while (false)
diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 500b933005a..4d72baadf76 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -46,15 +46,6 @@ int macdrv_err_on;
-#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 -@interface NSWindow (WineAutoTabbingExtensions) - - + (void) setAllowsAutomaticWindowTabbing:(BOOL)allows; - -@end -#endif - - #if !defined(MAC_OS_VERSION_14_0) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_VERSION_14_0 @interface NSApplication (CooperativeActivationSelectorsForOldSDKs)
@@ -145,8 +136,7 @@ + (void) initialize
[[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
- if ([NSWindow respondsToSelector:@selector(setAllowsAutomaticWindowTabbing:)]) - [NSWindow setAllowsAutomaticWindowTabbing:NO]; + [NSWindow setAllowsAutomaticWindowTabbing:NO]; } }