From 7ff34249c753122a2ba67e78aa6e9f9b56aa4a65 Mon Sep 17 00:00:00 2001 From: Susko3 Date: Wed, 6 Mar 2024 00:27:04 +0100 Subject: [PATCH] Use specific types --- include/SDL3/SDL_events.h | 6 +++--- include/SDL3/SDL_pen.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/SDL3/SDL_events.h b/include/SDL3/SDL_events.h index c60b351e6b..44cf80303d 100644 --- a/include/SDL3/SDL_events.h +++ b/include/SDL3/SDL_events.h @@ -574,7 +574,7 @@ typedef struct SDL_PenTipEvent Uint32 type; /**< ::SDL_EVENT_PEN_DOWN or ::SDL_EVENT_PEN_UP */ Uint32 reserved; Uint64 timestamp; /**< In nanoseconds, populated using SDL_GetTicksNS() */ - Uint32 windowID; /**< The window with pen focus, if any */ + SDL_WindowID windowID; /**< The window with pen focus, if any */ SDL_PenID which; /**< The pen instance id */ Uint8 tip; /**< ::SDL_PEN_TIP_INK when using a regular pen tip, or ::SDL_PEN_TIP_ERASER if the pen is being used as an eraser (e.g., flipped to use the eraser tip) */ Uint8 state; /**< ::SDL_PRESSED on ::SDL_EVENT_PEN_DOWN and ::SDL_RELEASED on ::SDL_EVENT_PEN_UP */ @@ -594,7 +594,7 @@ typedef struct SDL_PenMotionEvent Uint32 type; /**< ::SDL_EVENT_PEN_MOTION */ Uint32 reserved; Uint64 timestamp; /**< In nanoseconds, populated using SDL_GetTicksNS() */ - Uint32 windowID; /**< The window with pen focus, if any */ + SDL_WindowID windowID; /**< The window with pen focus, if any */ SDL_PenID which; /**< The pen instance id */ Uint8 padding1; Uint8 padding2; @@ -614,7 +614,7 @@ typedef struct SDL_PenButtonEvent Uint32 type; /**< ::SDL_EVENT_PEN_BUTTON_DOWN or ::SDL_EVENT_PEN_BUTTON_UP */ Uint32 reserved; Uint64 timestamp; /**< In nanoseconds, populated using SDL_GetTicksNS() */ - Uint32 windowID; /**< The window with pen focus, if any */ + SDL_WindowID windowID; /**< The window with pen focus, if any */ SDL_PenID which; /**< The pen instance id */ Uint8 button; /**< The pen button index (1 represents the pen tip for compatibility with mouse events) */ Uint8 state; /**< ::SDL_PRESSED or ::SDL_RELEASED */ diff --git a/include/SDL3/SDL_pen.h b/include/SDL3/SDL_pen.h index 36c67b7cf7..469c04ce69 100644 --- a/include/SDL3/SDL_pen.h +++ b/include/SDL3/SDL_pen.h @@ -56,9 +56,9 @@ extern "C" { typedef Uint32 SDL_PenID; /**< SDL_PenIDs identify pens uniquely within a session */ -#define SDL_PEN_INVALID ((Uint32)0) /**< Reserved invalid ::SDL_PenID is valid */ +#define SDL_PEN_INVALID ((SDL_PenID)0) /**< Reserved invalid ::SDL_PenID is valid */ -#define SDL_PEN_MOUSEID ((Uint32)-2) /**< Device ID for mouse events triggered by pen events */ +#define SDL_PEN_MOUSEID ((SDL_PenID)-2) /**< Device ID for mouse events triggered by pen events */ #define SDL_PEN_INFO_UNKNOWN (-1) /**< Marks unknown information when querying the pen */