From cd205db81223942c2a164465c60b97c8298028fe Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Fri, 24 Jul 2015 09:42:45 +0200 Subject: [PATCH] VIEW_CONTROLS::GetMousePosition() returns VECTOR2I. --- common/view/wx_view_controls.cpp | 4 ++-- include/view/view_controls.h | 4 ++-- include/view/wx_view_controls.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/view/wx_view_controls.cpp b/common/view/wx_view_controls.cpp index 91aea39d32..c626565822 100644 --- a/common/view/wx_view_controls.cpp +++ b/common/view/wx_view_controls.cpp @@ -327,12 +327,12 @@ void WX_VIEW_CONTROLS::SetGrabMouse( bool aEnabled ) } -VECTOR2D WX_VIEW_CONTROLS::GetMousePosition() const +VECTOR2I WX_VIEW_CONTROLS::GetMousePosition() const { wxPoint msp = wxGetMousePosition(); wxPoint winp = m_parentPanel->GetScreenPosition(); - return VECTOR2D( msp.x - winp.x, msp.y - winp.y ); + return VECTOR2I( msp.x - winp.x, msp.y - winp.y ); } diff --git a/include/view/view_controls.h b/include/view/view_controls.h index e49b644bb6..43172f5af4 100644 --- a/include/view/view_controls.h +++ b/include/view/view_controls.h @@ -113,9 +113,9 @@ public: * Returns the current mouse pointer position in screen coordinates. Note, that it may be * different from the cursor position if snapping is enabled (@see GetCursorPosition()). * - * @return The current mouse pointer position in screen coordinates. + * @return The current mouse pointer position in the screen coordinates. */ - virtual VECTOR2D GetMousePosition() const = 0; + virtual VECTOR2I GetMousePosition() const = 0; /** * Function GetCursorPosition() diff --git a/include/view/wx_view_controls.h b/include/view/wx_view_controls.h index 9a4c7ad1f1..ab145e6d9b 100644 --- a/include/view/wx_view_controls.h +++ b/include/view/wx_view_controls.h @@ -86,7 +86,7 @@ public: } /// @copydoc VIEW_CONTROLS::GetMousePosition() - VECTOR2D GetMousePosition() const; + VECTOR2I GetMousePosition() const; /// @copydoc VIEW_CONTROLS::GetCursorPosition() VECTOR2D GetCursorPosition() const;