Browse Source

AbstractXApplication: remove button defines that interere with GlfwApplication.

pull/381/merge
Konstantinos Chatzilygeroudis 7 years ago committed by Vladimír Vondruš
parent
commit
270b755517
  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"
@ -600,11 +605,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 /*Button1*/, /**< Left button */
Middle = Button2, /**< Middle button */ Middle = 2 /*Button2*/, /**< Middle button */
Right = Button3, /**< Right button */ Right = 3 /*Button3*/, /**< Right button */
WheelUp = Button4, /**< Wheel up */ WheelUp = 4 /*Button4*/, /**< Wheel up */
WheelDown = Button5 /**< Wheel down */ WheelDown = 5 /*Button5*/ /**< Wheel down */
}; };
/** @brief Button */ /** @brief Button */

Loading…
Cancel
Save