From 4bf8a8640ebb39707bc11be72b6bbf2ff804f20c Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Mon, 6 Feb 2023 20:22:02 +0300
Subject: [PATCH] sync with SDL3 latest headers.
---
src/sdl2_compat.c | 33 ++++++++++++++++++++++++++++++++-
src/sdl3_syms.h | 10 +++++-----
2 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/src/sdl2_compat.c b/src/sdl2_compat.c
index e2118a9..8303941 100644
--- a/src/sdl2_compat.c
+++ b/src/sdl2_compat.c
@@ -3804,7 +3804,6 @@ SDL_RenderDrawLine(SDL_Renderer *renderer, int x1, int y1, int x2, int y2)
return SDL3_RenderLines(renderer, points, 2);
}
-
DECLSPEC int SDLCALL
SDL_RenderDrawLines(SDL_Renderer *renderer, const SDL_Point *points, int count)
{
@@ -4087,6 +4086,38 @@ SDL_SetWindowFullscreen(SDL_Window *window, Uint32 flags)
return SDL3_SetWindowFullscreen(window, flags3);
}
+
+DECLSPEC void SDLCALL
+SDL_SetWindowTitle(SDL_Window *window, const char *title)
+{
+ SDL3_SetWindowTitle(window, title);
+}
+
+DECLSPEC void SDLCALL
+SDL_SetWindowIcon(SDL_Window *window, SDL_Surface *icon)
+{
+ SDL3_SetWindowIcon(window, icon);
+}
+
+DECLSPEC void SDLCALL
+SDL_SetWindowSize(SDL_Window *window, int w, int h)
+{
+ SDL3_SetWindowSize(window, w, h);
+}
+
+DECLSPEC void SDLCALL
+SDL_SetWindowMinimumSize(SDL_Window *window, int min_w, int min_h)
+{
+ SDL3_SetWindowMinimumSize(window, min_w, min_h);
+}
+
+DECLSPEC void SDLCALL
+SDL_SetWindowMaximumSize(SDL_Window *window, int max_w, int max_h)
+{
+ SDL3_SetWindowMaximumSize(window, max_w, max_h);
+}
+
+
/* SDL3 added a return value. We just throw it away for SDL2. */
DECLSPEC void SDLCALL
SDL_GL_SwapWindow(SDL_Window *window)
diff --git a/src/sdl3_syms.h b/src/sdl3_syms.h
index b42e2ae..a619778 100644
--- a/src/sdl3_syms.h
+++ b/src/sdl3_syms.h
@@ -488,18 +488,18 @@ SDL3_SYM_PASSTHROUGH(SDL_Window*,CreateWindowFrom,(const void *a),(a),return)
SDL3_SYM_PASSTHROUGH(Uint32,GetWindowID,(SDL_Window *a),(a),return)
SDL3_SYM_PASSTHROUGH(SDL_Window*,GetWindowFromID,(Uint32 a),(a),return)
SDL3_SYM(Uint32,GetWindowFlags,(SDL_Window *a),(a),return)
-SDL3_SYM_PASSTHROUGH(void,SetWindowTitle,(SDL_Window *a, const char *b),(a,b),)
SDL3_SYM_PASSTHROUGH(const char*,GetWindowTitle,(SDL_Window *a),(a),return)
-SDL3_SYM_PASSTHROUGH(void,SetWindowIcon,(SDL_Window *a, SDL_Surface *b),(a,b),)
+SDL3_SYM(int,SetWindowTitle,(SDL_Window *a, const char *b),(a,b),return)
+SDL3_SYM(int,SetWindowIcon,(SDL_Window *a, SDL_Surface *b),(a,b),return)
SDL3_SYM_PASSTHROUGH(void*,SetWindowData,(SDL_Window *a, const char *b, void *c),(a,b,c),return)
SDL3_SYM_PASSTHROUGH(void*,GetWindowData,(SDL_Window *a, const char *b),(a,b),return)
SDL3_SYM_PASSTHROUGH(void,SetWindowPosition,(SDL_Window *a, int b, int c),(a,b,c),)
SDL3_SYM_PASSTHROUGH(void,GetWindowPosition,(SDL_Window *a, int *b, int *c),(a,b,c),)
-SDL3_SYM_PASSTHROUGH(void,SetWindowSize,(SDL_Window *a, int b, int c),(a,b,c),)
SDL3_SYM_PASSTHROUGH(void,GetWindowSize,(SDL_Window *a, int *b, int *c),(a,b,c),)
-SDL3_SYM_PASSTHROUGH(void,SetWindowMinimumSize,(SDL_Window *a, int b, int c),(a,b,c),)
SDL3_SYM_PASSTHROUGH(void,GetWindowMinimumSize,(SDL_Window *a, int *b, int *c),(a,b,c),)
-SDL3_SYM_PASSTHROUGH(void,SetWindowMaximumSize,(SDL_Window *a, int b, int c),(a,b,c),)
+SDL3_SYM(int,SetWindowSize,(SDL_Window *a, int b, int c),(a,b,c),return)
+SDL3_SYM(int,SetWindowMinimumSize,(SDL_Window *a, int b, int c),(a,b,c),return)
+SDL3_SYM(int,SetWindowMaximumSize,(SDL_Window *a, int b, int c),(a,b,c),return)
SDL3_SYM_PASSTHROUGH(void,GetWindowMaximumSize,(SDL_Window *a, int *b, int *c),(a,b,c),)
SDL3_SYM_PASSTHROUGH(void,SetWindowBordered,(SDL_Window *a, SDL_bool b),(a,b),)
SDL3_SYM_PASSTHROUGH(void,ShowWindow,(SDL_Window *a),(a),)