src/video/cocoa/SDL_cocoamouse.m
changeset 12929 d6c5eb7a0afb
parent 12923 73091a9e72f7
     1.1 --- a/src/video/cocoa/SDL_cocoamouse.m	Sun Jul 07 09:10:56 2019 -0700
     1.2 +++ b/src/video/cocoa/SDL_cocoamouse.m	Mon Jul 08 13:41:01 2019 -0400
     1.3 @@ -38,8 +38,6 @@
     1.4  #define DLog(...) do { } while (0)
     1.5  #endif
     1.6  
     1.7 -#define TRACKPAD_REPORTS_TOUCH_MOUSEID 0
     1.8 -
     1.9  @implementation NSCursor (InvisibleCursor)
    1.10  + (NSCursor *)invisibleCursor
    1.11  {
    1.12 @@ -381,16 +379,6 @@
    1.13      }
    1.14  
    1.15      SDL_MouseID mouseID = mouse ? mouse->mouseID : 0;
    1.16 -    #if TRACKPAD_REPORTS_TOUCH_MOUSEID
    1.17 -    if ([event subtype] == NSEventSubtypeTouch) {  /* this is a synthetic from the OS */
    1.18 -        if (mouse->touch_mouse_events) {
    1.19 -            mouseID = SDL_TOUCH_MOUSEID;   /* Hint is set */
    1.20 -        } else {
    1.21 -            return;  /* no hint set, drop this one. */
    1.22 -        }
    1.23 -    }
    1.24 -    #endif
    1.25 -
    1.26      const SDL_bool seenWarp = driverdata->seenWarp;
    1.27      driverdata->seenWarp = NO;
    1.28  
    1.29 @@ -436,16 +424,6 @@
    1.30      }
    1.31  
    1.32      SDL_MouseID mouseID = mouse->mouseID;
    1.33 -    #if TRACKPAD_REPORTS_TOUCH_MOUSEID
    1.34 -    if ([event subtype] == NSEventSubtypeTouch) {  /* this is a synthetic from the OS */
    1.35 -        if (mouse->touch_mouse_events) {
    1.36 -            mouseID = SDL_TOUCH_MOUSEID;   /* Hint is set */
    1.37 -        } else {
    1.38 -            return;  /* no hint set, drop this one. */
    1.39 -        }
    1.40 -    }
    1.41 -    #endif
    1.42 -
    1.43      CGFloat x = -[event deltaX];
    1.44      CGFloat y = [event deltaY];
    1.45      SDL_MouseWheelDirection direction = SDL_MOUSEWHEEL_NORMAL;