diff options
| author | Pietro Gagliardi <[email protected]> | 2014-06-02 12:27:23 -0400 |
|---|---|---|
| committer | Pietro Gagliardi <[email protected]> | 2014-06-02 12:27:23 -0400 |
| commit | 09a5a859a00da7124076e18a366c3c25d523dc31 (patch) | |
| tree | 52a3205c0213a6240ddfb44fed7807d63b5d454c /area_darwin.m | |
| parent | c82949b8d2df44c486f6594cfe08b33d793c3214 (diff) | |
Applied the Area events change to the Mac OS X backend, restructuring a few function signatures in the process.
Diffstat (limited to 'area_darwin.m')
| -rw-r--r-- | area_darwin.m | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/area_darwin.m b/area_darwin.m index 6727415..a9a565f 100644 --- a/area_darwin.m +++ b/area_darwin.m @@ -74,31 +74,24 @@ extern NSRect dummyRect; [self retrack]; } -#define mouseEvent(m, f) \ +#define event(m, f) \ - (void)m:(NSEvent *)e \ { \ f(self, e); \ } -mouseEvent(mouseMoved, areaView_mouseMoved_mouseDragged) -mouseEvent(mouseDragged, areaView_mouseMoved_mouseDragged) -mouseEvent(rightMouseDragged, areaView_mouseMoved_mouseDragged) -mouseEvent(otherMouseDragged, areaView_mouseMoved_mouseDragged) -mouseEvent(mouseDown, areaView_mouseDown) -mouseEvent(rightMouseDown, areaView_mouseDown) -mouseEvent(otherMouseDown, areaView_mouseDown) -mouseEvent(mouseUp, areaView_mouseUp) -mouseEvent(rightMouseUp, areaView_mouseUp) -mouseEvent(otherMouseUp, areaView_mouseUp) - -#define keyEvent(m, f) \ - - (void)m:(NSEvent *)e \ - { \ - if (f(self, e) == NO) \ - [super m:e]; \ - } -keyEvent(keyDown, areaView_keyDown) -keyEvent(keyUp, areaView_keyUp) -keyEvent(flagsChanged, areaView_flagsChanged) +event(mouseMoved, areaView_mouseMoved_mouseDragged) +event(mouseDragged, areaView_mouseMoved_mouseDragged) +event(rightMouseDragged, areaView_mouseMoved_mouseDragged) +event(otherMouseDragged, areaView_mouseMoved_mouseDragged) +event(mouseDown, areaView_mouseDown) +event(rightMouseDown, areaView_mouseDown) +event(otherMouseDown, areaView_mouseDown) +event(mouseUp, areaView_mouseUp) +event(rightMouseUp, areaView_mouseUp) +event(otherMouseUp, areaView_mouseUp) +event(keyDown, areaView_keyDown) +event(keyUp, areaView_keyUp) +event(flagsChanged, areaView_flagsChanged) @end |