admin/CSFML
1
0 Fork 0
mirror of https://github.com/SFML/CSFML.git synced 2026-10-27 13:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correctly deprecated sfMouseWheelEvent.

Browse Source 
Corrected some spacing/alignment.
This commit is contained in:
Alec Iverson committed 2016-08-12 16:57:01 -07:00
1 parent 41fa94478a
commit 470bf3d190
2 files changed
+19 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

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