From 1c62788e0c25081cbdeab6d8e04aba9d47d913f7 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Thu, 26 Mar 2015 11:25:57 -0700 Subject: [PATCH] Remove third argument in onMouseMove --- lime/_backend/flash/FlashApplication.hx | 2 +- lime/_backend/html5/HTML5Window.hx | 2 +- lime/_backend/native/NativeApplication.hx | 4 ++-- lime/app/Application.hx | 10 ++++------ lime/app/IModule.hx | 6 ++---- lime/app/Module.hx | 4 ++-- lime/ui/Window.hx | 4 ++-- 7 files changed, 14 insertions(+), 18 deletions(-) diff --git a/lime/_backend/flash/FlashApplication.hx b/lime/_backend/flash/FlashApplication.hx index d4ec657d0..c407442e6 100644 --- a/lime/_backend/flash/FlashApplication.hx +++ b/lime/_backend/flash/FlashApplication.hx @@ -192,7 +192,7 @@ class FlashApplication { case "mouseMove": - parent.window.onMouseMove.dispatch (event.stageX, event.stageY, button); + parent.window.onMouseMove.dispatch (event.stageX, event.stageY); case "mouseUp", "middleMouseUp", "rightMouseUp": diff --git a/lime/_backend/html5/HTML5Window.hx b/lime/_backend/html5/HTML5Window.hx index 5b349e769..101bea46f 100644 --- a/lime/_backend/html5/HTML5Window.hx +++ b/lime/_backend/html5/HTML5Window.hx @@ -216,7 +216,7 @@ class HTML5Window { case "mousemove": - parent.onMouseMove.dispatch (x, y, event.button); + parent.onMouseMove.dispatch (x, y); default: diff --git a/lime/_backend/native/NativeApplication.hx b/lime/_backend/native/NativeApplication.hx index bb8c25fc8..4ab68db87 100644 --- a/lime/_backend/native/NativeApplication.hx +++ b/lime/_backend/native/NativeApplication.hx @@ -185,8 +185,8 @@ class NativeApplication { case MOUSE_MOVE: - parent.window.onMouseMove.dispatch (mouseEventInfo.x, mouseEventInfo.y, mouseEventInfo.button); - parent.window.onMouseMoveRelative.dispatch (mouseEventInfo.movementX, mouseEventInfo.movementY, mouseEventInfo.button); + parent.window.onMouseMove.dispatch (mouseEventInfo.x, mouseEventInfo.y); + parent.window.onMouseMoveRelative.dispatch (mouseEventInfo.movementX, mouseEventInfo.movementY); case MOUSE_WHEEL: diff --git a/lime/app/Application.hx b/lime/app/Application.hx index 086f97444..90d455be0 100644 --- a/lime/app/Application.hx +++ b/lime/app/Application.hx @@ -261,26 +261,24 @@ class Application extends Module { } - public override function onMouseMove (x:Float, y:Float, button:Int):Void { + public override function onMouseMove (x:Float, y:Float):Void { for (module in modules) { - module.onMouseMove (x, y, button); + module.onMouseMove (x, y); } } - public override function onMouseMoveRelative (x:Float, y:Float, button:Int):Void { + public override function onMouseMoveRelative (x:Float, y:Float):Void { - #if (!openfl || openfl > "3.0.0-beta.2") for (module in modules) { - module.onMouseMoveRelative (x, y, button); + module.onMouseMoveRelative (x, y); } - #end } diff --git a/lime/app/IModule.hx b/lime/app/IModule.hx index 45baf72ea..5b26d41f2 100644 --- a/lime/app/IModule.hx +++ b/lime/app/IModule.hx @@ -91,18 +91,16 @@ interface IModule { * @param y The current y coordinate of the mouse * @param button The ID of the mouse button that was pressed */ - public function onMouseMove (x:Float, y:Float, button:Int):Void; + public function onMouseMove (x:Float, y:Float):Void; - #if (!openfl || openfl > "3.0.0-beta.2") /** * Called when a mouse move relative event is fired * @param x The x movement of the mouse * @param y The y movement of the mouse * @param button The ID of the mouse button that was pressed */ - public function onMouseMoveRelative (x:Float, y:Float, button:Int):Void; - #end + public function onMouseMoveRelative (x:Float, y:Float):Void; /** diff --git a/lime/app/Module.hx b/lime/app/Module.hx index 5de0d05a6..05573667c 100644 --- a/lime/app/Module.hx +++ b/lime/app/Module.hx @@ -66,7 +66,7 @@ class Module implements IModule { * @param y The current y coordinate of the mouse * @param button The ID of the mouse button that was pressed */ - public function onMouseMove (x:Float, y:Float, button:Int):Void { } + public function onMouseMove (x:Float, y:Float):Void { } /** @@ -75,7 +75,7 @@ class Module implements IModule { * @param y The y movement of the mouse * @param button The ID of the mouse button that was pressed */ - public function onMouseMoveRelative (x:Float, y:Float, button:Int):Void { } + public function onMouseMoveRelative (x:Float, y:Float):Void { } /** diff --git a/lime/ui/Window.hx b/lime/ui/Window.hx index d865145c1..efb4b3dd0 100644 --- a/lime/ui/Window.hx +++ b/lime/ui/Window.hx @@ -24,8 +24,8 @@ class Window { public var onKeyDown = new EventKeyModifier->Void> (); public var onKeyUp = new EventKeyModifier->Void> (); public var onMouseDown = new EventFloat->Int->Void> (); - public var onMouseMove = new EventFloat->Int->Void> (); - public var onMouseMoveRelative = new EventFloat->Int->Void> (); + public var onMouseMove = new EventFloat->Void> (); + public var onMouseMoveRelative = new EventFloat->Void> (); public var onMouseUp = new EventFloat->Int->Void> (); public var onMouseWheel = new EventFloat->Void> (); public var onTouchEnd = new EventFloat->Int->Void> ();