From ce44eff3d2178446862636410616df3933dc5d80 Mon Sep 17 00:00:00 2001 From: Susko3 Date: Sun, 3 Mar 2024 19:25:13 +0100 Subject: [PATCH] Use `SDL_WindowFlags` in public headers --- include/SDL3/SDL_render.h | 2 +- include/SDL3/SDL_test_common.h | 2 +- include/SDL3/SDL_video.h | 6 +++--- src/video/SDL_video.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/SDL3/SDL_render.h b/include/SDL3/SDL_render.h index 2c65ca59e..9793d8874 100644 --- a/include/SDL3/SDL_render.h +++ b/include/SDL3/SDL_render.h @@ -192,7 +192,7 @@ extern DECLSPEC const char *SDLCALL SDL_GetRenderDriver(int index); * \sa SDL_CreateRenderer * \sa SDL_CreateWindow */ -extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer(int width, int height, Uint32 window_flags, SDL_Window **window, SDL_Renderer **renderer); +extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer(int width, int height, SDL_WindowFlags window_flags, SDL_Window **window, SDL_Renderer **renderer); /** * Create a 2D rendering context for a window. diff --git a/include/SDL3/SDL_test_common.h b/include/SDL3/SDL_test_common.h index 74eb46ac3..5697c5648 100644 --- a/include/SDL3/SDL_test_common.h +++ b/include/SDL3/SDL_test_common.h @@ -65,7 +65,7 @@ typedef struct SDL_DisplayID displayID; const char *window_title; const char *window_icon; - Uint32 window_flags; + SDL_WindowFlags window_flags; SDL_bool flash_on_focus_loss; int window_x; int window_y; diff --git a/include/SDL3/SDL_video.h b/include/SDL3/SDL_video.h index 11f96d28b..e6dbf72f1 100644 --- a/include/SDL3/SDL_video.h +++ b/include/SDL3/SDL_video.h @@ -786,7 +786,7 @@ extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window *window); * \sa SDL_CreateWindowWithProperties * \sa SDL_DestroyWindow */ -extern DECLSPEC SDL_Window *SDLCALL SDL_CreateWindow(const char *title, int w, int h, Uint32 flags); +extern DECLSPEC SDL_Window *SDLCALL SDL_CreateWindow(const char *title, int w, int h, SDL_WindowFlags flags); /** * Create a child popup window of the specified parent window. @@ -841,7 +841,7 @@ extern DECLSPEC SDL_Window *SDLCALL SDL_CreateWindow(const char *title, int w, i * \sa SDL_DestroyWindow * \sa SDL_GetWindowParent */ -extern DECLSPEC SDL_Window *SDLCALL SDL_CreatePopupWindow(SDL_Window *parent, int offset_x, int offset_y, int w, int h, Uint32 flags); +extern DECLSPEC SDL_Window *SDLCALL SDL_CreatePopupWindow(SDL_Window *parent, int offset_x, int offset_y, int w, int h, SDL_WindowFlags flags); /** * Create a window with the specified properties. @@ -1180,7 +1180,7 @@ extern DECLSPEC SDL_PropertiesID SDLCALL SDL_GetWindowProperties(SDL_Window *win * \sa SDL_SetWindowGrab * \sa SDL_ShowWindow */ -extern DECLSPEC Uint32 SDLCALL SDL_GetWindowFlags(SDL_Window *window); +extern DECLSPEC SDL_WindowFlags SDLCALL SDL_GetWindowFlags(SDL_Window *window); /** * Set the title of a window. diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c index 0f1c14019..ebbbdf136 100644 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c @@ -2218,7 +2218,7 @@ SDL_Window *SDL_CreateWindowWithProperties(SDL_PropertiesID props) return window; } -SDL_Window *SDL_CreateWindow(const char *title, int w, int h, Uint32 flags) +SDL_Window *SDL_CreateWindow(const char *title, int w, int h, SDL_WindowFlags flags) { SDL_Window *window; SDL_PropertiesID props = SDL_CreateProperties(); @@ -2233,7 +2233,7 @@ SDL_Window *SDL_CreateWindow(const char *title, int w, int h, Uint32 flags) return window; } -SDL_Window *SDL_CreatePopupWindow(SDL_Window *parent, int offset_x, int offset_y, int w, int h, Uint32 flags) +SDL_Window *SDL_CreatePopupWindow(SDL_Window *parent, int offset_x, int offset_y, int w, int h, SDL_WindowFlags flags) { SDL_Window *window; SDL_PropertiesID props = SDL_CreateProperties(); @@ -2450,7 +2450,7 @@ SDL_PropertiesID SDL_GetWindowProperties(SDL_Window *window) return window->props; } -Uint32 SDL_GetWindowFlags(SDL_Window *window) +SDL_WindowFlags SDL_GetWindowFlags(SDL_Window *window) { CHECK_WINDOW_MAGIC(window, 0);