From 48d2fb4b81e8fe3ce735a8df6411ca9360609688 Mon Sep 17 00:00:00 2001 From: Konstantinos Chatzilygeroudis Date: Thu, 7 Nov 2019 15:05:40 +0100 Subject: [PATCH] AbstractXApplication: remove button defines that interere with GlfwApplication (and possibly with others) --- src/Magnum/Platform/AbstractXApplication.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Magnum/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h index b2a7df849..f84b4bc5a 100644 --- a/src/Magnum/Platform/AbstractXApplication.h +++ b/src/Magnum/Platform/AbstractXApplication.h @@ -44,6 +44,11 @@ #undef Convex #undef None #undef Status +#undef Button1 +#undef Button2 +#undef Button3 +#undef Button4 +#undef Button5 #include "Magnum/Magnum.h" #include "Magnum/Tags.h" @@ -588,11 +593,11 @@ class AbstractXApplication::MouseEvent: public AbstractXApplication::InputEvent * @see @ref button() */ enum class Button: unsigned int { - Left = Button1, /**< Left button */ - Middle = Button2, /**< Middle button */ - Right = Button3, /**< Right button */ - WheelUp = Button4, /**< Wheel up */ - WheelDown = Button5 /**< Wheel down */ + Left = 1, /**< Left button -- Button1*/ + Middle = 2, /**< Middle button -- Button2 */ + Right = 3, /**< Right button -- Button3 */ + WheelUp = 4, /**< Wheel up -- Button4 */ + WheelDown = 5 /**< Wheel down -- Button5 */ }; /** @brief Button */