From 426d1bc95e67c0029f96d94c4a490d412f086526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 27 May 2012 23:56:25 +0200 Subject: [PATCH] Renamed GLutContext::mouseMoveEvent() to mouseMotionEvent(). Consistency with naming in GLUT itself and also SDL2. "Mouse move event" is naming used only in Qt. --- src/Contexts/GlutContext.cpp | 2 +- src/Contexts/GlutContext.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Contexts/GlutContext.cpp b/src/Contexts/GlutContext.cpp index ed08016bb..153c7ae10 100644 --- a/src/Contexts/GlutContext.cpp +++ b/src/Contexts/GlutContext.cpp @@ -34,7 +34,7 @@ GlutContext::GlutContext(int& argc, char** argv, const std::string& title, const glutReshapeFunc(staticViewportEvent); glutSpecialFunc(staticKeyEvent); glutMouseFunc(staticMouseEvent); - glutMotionFunc(staticMouseMoveEvent); + glutMotionFunc(staticMouseMotionEvent); glutDisplayFunc(staticDrawEvent); /* Init GLEW */ diff --git a/src/Contexts/GlutContext.h b/src/Contexts/GlutContext.h index 5d897f62d..9b9c84595 100644 --- a/src/Contexts/GlutContext.h +++ b/src/Contexts/GlutContext.h @@ -162,7 +162,7 @@ class GlutContext: public AbstractContext { * when no button is pressed. Mouse tracking is disabled by default. */ inline void setMouseTracking(bool enabled) { - glutPassiveMotionFunc(enabled ? staticMouseMoveEvent : nullptr); + glutPassiveMotionFunc(enabled ? staticMouseMotionEvent : nullptr); } /** @brief Set mouse cursor */ @@ -185,14 +185,14 @@ class GlutContext: public AbstractContext { virtual inline void mouseEvent(MouseButton button, MouseState state, const Math::Vector2& position) {} /** - * @brief Mouse move event + * @brief Mouse motion event * * Called when any mouse button is pressed and mouse is moved. Default * implementation does nothing. * * @see setMouseTracking() */ - virtual inline void mouseMoveEvent(const Math::Vector2& position) {} + virtual inline void mouseMotionEvent(const Math::Vector2& position) {} /*@}*/ @@ -209,8 +209,8 @@ class GlutContext: public AbstractContext { instance->mouseEvent(static_cast(button), static_cast(state), {x, y}); } - inline static void staticMouseMoveEvent(int x, int y) { - instance->mouseMoveEvent({x, y}); + inline static void staticMouseMotionEvent(int x, int y) { + instance->mouseMotionEvent({x, y}); } inline static void staticDrawEvent() {