diff --git a/include/SFML/Graphics/BlendMode.h b/include/SFML/Graphics/BlendMode.h index 00782a6..8d3c144 100644 --- a/include/SFML/Graphics/BlendMode.h +++ b/include/SFML/Graphics/BlendMode.h @@ -58,7 +58,7 @@ typedef enum { sfBlendEquationAdd, ///< Pixel = Src * SrcFactor + Dst * DstFactor sfBlendEquationSubtract, ///< Pixel = Src * SrcFactor - Dst * DstFactor - sfBlendEquationReverseSubtract ///< Pixel = Dst * DstFactor - Src * SrcFactor + sfBlendEquationReverseSubtract ///< Pixel = Dst * DstFactor - Src * SrcFactor } sfBlendEquation; diff --git a/include/SFML/Window/Event.h b/include/SFML/Window/Event.h index 12354aa..c4f13d9 100644 --- a/include/SFML/Window/Event.h +++ b/include/SFML/Window/Event.h @@ -117,10 +117,13 @@ typedef struct } sfMouseButtonEvent; //////////////////////////////////////////////////////////// -/// \brief Mouse wheel events parameters (deprecated) +/// \brief Mouse wheel events parameters /// +/// \deprecated +/// Use sfMouseWheelScrollEvent instead. +/// //////////////////////////////////////////////////////////// -typedef struct +typedef struct CSFML_DEPRECATED { sfEventType type; int delta; @@ -216,19 +219,19 @@ typedef struct //////////////////////////////////////////////////////////// typedef union { - sfEventType type; ///< Type of the event - sfSizeEvent size; ///< Size event parameters - sfKeyEvent key; ///< Key event parameters - sfTextEvent text; ///< Text event parameters - sfMouseMoveEvent mouseMove; ///< Mouse move event parameters - sfMouseButtonEvent mouseButton; ///< Mouse button event parameters - sfMouseWheelEvent mouseWheel; ///< Mouse wheel event parameters (deprecated) - sfMouseWheelScrollEvent mouseWheelScroll; ///< Mouse wheel event parameters - sfJoystickMoveEvent joystickMove; ///< Joystick move event parameters - sfJoystickButtonEvent joystickButton; ///< Joystick button event parameters - sfJoystickConnectEvent joystickConnect; ///< Joystick (dis)connect event parameters - sfTouchEvent touch; ///< Touch events parameters - sfSensorEvent sensor; ///< Sensor event parameters + sfEventType type; ///< Type of the event + sfSizeEvent size; ///< Size event parameters + sfKeyEvent key; ///< Key event parameters + sfTextEvent text; ///< Text event parameters + sfMouseMoveEvent mouseMove; ///< Mouse move event parameters + sfMouseButtonEvent mouseButton; ///< Mouse button event parameters + sfMouseWheelEvent mouseWheel; ///< Mouse wheel event parameters (deprecated) + sfMouseWheelScrollEvent mouseWheelScroll; ///< Mouse wheel event parameters + sfJoystickMoveEvent joystickMove; ///< Joystick move event parameters + sfJoystickButtonEvent joystickButton; ///< Joystick button event parameters + sfJoystickConnectEvent joystickConnect; ///< Joystick (dis)connect event parameters + sfTouchEvent touch; ///< Touch events parameters + sfSensorEvent sensor; ///< Sensor event parameters } sfEvent;