Browse Source

AbstractXApplication: remove button defines that interere with GlfwApplication (and possibly with others)

pull/389/head
Konstantinos Chatzilygeroudis 7 years ago
parent
commit
48d2fb4b81
  1. 15
      src/Magnum/Platform/AbstractXApplication.h

15
src/Magnum/Platform/AbstractXApplication.h

@ -44,6 +44,11 @@
#undef Convex #undef Convex
#undef None #undef None
#undef Status #undef Status
#undef Button1
#undef Button2
#undef Button3
#undef Button4
#undef Button5
#include "Magnum/Magnum.h" #include "Magnum/Magnum.h"
#include "Magnum/Tags.h" #include "Magnum/Tags.h"
@ -588,11 +593,11 @@ class AbstractXApplication::MouseEvent: public AbstractXApplication::InputEvent
* @see @ref button() * @see @ref button()
*/ */
enum class Button: unsigned int { enum class Button: unsigned int {
Left = Button1, /**< Left button */ Left = 1, /**< Left button -- Button1*/
Middle = Button2, /**< Middle button */ Middle = 2, /**< Middle button -- Button2 */
Right = Button3, /**< Right button */ Right = 3, /**< Right button -- Button3 */
WheelUp = Button4, /**< Wheel up */ WheelUp = 4, /**< Wheel up -- Button4 */
WheelDown = Button5 /**< Wheel down */ WheelDown = 5 /**< Wheel down -- Button5 */
}; };
/** @brief Button */ /** @brief Button */

Loading…
Cancel
Save