src/java.desktop/macosx/native/libosxapp/NSApplicationAWT.m
changeset 48751 54f355e65415
parent 47508 33da1153954c
equal deleted inserted replaced
48750:ffbb784a8873 48751:54f355e65415
   340     [super orderFrontStandardAboutPanelWithOptions:optionsDictionary];
   340     [super orderFrontStandardAboutPanelWithOptions:optionsDictionary];
   341 }
   341 }
   342 
   342 
   343 #define DRAGMASK (NSMouseMovedMask | NSLeftMouseDraggedMask | NSRightMouseDownMask | NSRightMouseDraggedMask | NSLeftMouseUpMask | NSRightMouseUpMask | NSFlagsChangedMask | NSKeyDownMask)
   343 #define DRAGMASK (NSMouseMovedMask | NSLeftMouseDraggedMask | NSRightMouseDownMask | NSRightMouseDraggedMask | NSLeftMouseUpMask | NSRightMouseUpMask | NSFlagsChangedMask | NSKeyDownMask)
   344 
   344 
   345 #if defined(MAC_OS_X_VERSION_10_12) && \
   345 #if defined(MAC_OS_X_VERSION_10_12) && __LP64__
   346    MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12 && \
       
   347    __LP64__
       
   348    // 10.12 changed `mask` to NSEventMask (unsigned long long) for x86_64 builds.
   346    // 10.12 changed `mask` to NSEventMask (unsigned long long) for x86_64 builds.
   349 - (NSEvent *)nextEventMatchingMask:(NSEventMask)mask
   347 - (NSEvent *)nextEventMatchingMask:(NSEventMask)mask
   350 #else
   348 #else
   351 - (NSEvent *)nextEventMatchingMask:(NSUInteger)mask
   349 - (NSEvent *)nextEventMatchingMask:(NSUInteger)mask
   352 #endif
   350 #endif