mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-04 01:21:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid warning for unused var in app.mm

Browse Source
This commit is contained in:
David Capello 2014-08-21 22:06:37 -03:00
parent dadd7443b6
commit 08d1593481
2 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/allegro/src/macosx/system.m
View File

@ -239,36 +239,24 @@ void osx_event_handler()
[NSApp sendEvent: event]; [NSApp sendEvent: event];
break; break;
} }
/* fallthrough */
buttons |= ((event_type == NSLeftMouseDown) ? 0x1 : 0);
buttons |= ((event_type == NSRightMouseDown) ? 0x2 : 0);
buttons |= ((event_type == NSOtherMouseDown) ? 0x4 : 0);
[NSApp sendEvent: event];
gotmouseevent = YES;
break;
case NSLeftMouseUp: case NSLeftMouseUp:
case NSOtherMouseUp: case NSOtherMouseUp:
case NSRightMouseUp: case NSRightMouseUp:
if (osx_emulate_mouse_buttons) { buttons &= ~((event_type == NSLeftMouseUp) ? 0x1 : 0);
if (event_type == NSLeftMouseDown) { buttons &= ~((event_type == NSRightMouseUp) ? 0x2 : 0);
if ((!osx_window) || (NSPointInRect(point, view))) { buttons &= ~((event_type == NSOtherMouseUp) ? 0x4 : 0);
buttons = 0x1;
if (key[KEY_ALT])
buttons = 0x4;
if (key[KEY_LCONTROL])
buttons = 0x2;
}
}
else if (event_type == NSLeftMouseUp)
buttons &= ~0x7;
}
else {
if ((!osx_window) || (NSPointInRect(point, view))) {
/* Deliver mouse downs only if cursor is on the window */
buttons |= ((event_type == NSLeftMouseDown) ? 0x1 : 0);
buttons |= ((event_type == NSRightMouseDown) ? 0x2 : 0);
buttons |= ((event_type == NSOtherMouseDown) ? 0x4 : 0);
}
buttons &= ~((event_type == NSLeftMouseUp) ? 0x1 : 0);
buttons &= ~((event_type == NSRightMouseUp) ? 0x2 : 0);
buttons &= ~((event_type == NSOtherMouseUp) ? 0x4 : 0);
}
gotmouseevent = YES;
[NSApp sendEvent: event]; [NSApp sendEvent: event];
gotmouseevent = YES;
break; break;
case NSLeftMouseDragged: case NSLeftMouseDragged:

2
src/she/alleg4/app.mm
View File

@ -52,6 +52,8 @@ extern "C" int allegro_main(int argc, char *argv[], NSObject* app_delegate);
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
(void*)pool;
SheAppDelegate *app_delegate = [[SheAppDelegate alloc] init]; SheAppDelegate *app_delegate = [[SheAppDelegate alloc] init];
return allegro_main(argc, argv, app_delegate); return allegro_main(argc, argv, app_delegate);
} }