From b7ca49497802e9f82ad0d5871c8685bcf31dd22c Mon Sep 17 00:00:00 2001 From: Susko3 Date: Mon, 23 Jun 2025 22:15:01 +0200 Subject: [PATCH 1/3] Fix underlying enum types --- SDL3_image-CS/SDL3_image/SDL_image.cs | 2 +- SDL3_ttf-CS/SDL3_ttf/SDL_ttf.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SDL3_image-CS/SDL3_image/SDL_image.cs b/SDL3_image-CS/SDL3_image/SDL_image.cs index 275bf23..806ba13 100644 --- a/SDL3_image-CS/SDL3_image/SDL_image.cs +++ b/SDL3_image-CS/SDL3_image/SDL_image.cs @@ -7,7 +7,7 @@ namespace SDL { [Flags] [Typedef] - public enum IMG_InitFlags : int + public enum IMG_InitFlags : UInt32 { IMG_INIT_JPG = SDL3_image.IMG_INIT_JPG, IMG_INIT_PNG = SDL3_image.IMG_INIT_PNG, diff --git a/SDL3_ttf-CS/SDL3_ttf/SDL_ttf.cs b/SDL3_ttf-CS/SDL3_ttf/SDL_ttf.cs index c1a9b08..fdec2f3 100644 --- a/SDL3_ttf-CS/SDL3_ttf/SDL_ttf.cs +++ b/SDL3_ttf-CS/SDL3_ttf/SDL_ttf.cs @@ -7,7 +7,7 @@ namespace SDL { [Flags] [Typedef] - public enum TTF_SubStringFlags : int + public enum TTF_SubStringFlags : UInt32 { TTF_SUBSTRING_TEXT_START = SDL3_ttf.TTF_SUBSTRING_TEXT_START, TTF_SUBSTRING_LINE_START = SDL3_ttf.TTF_SUBSTRING_LINE_START, From 0d8e49ef645608be63225b7c18ab011ea2d90dd9 Mon Sep 17 00:00:00 2001 From: Susko3 Date: Mon, 23 Jun 2025 22:15:01 +0200 Subject: [PATCH 2/3] Add missing enum typedef in SDL_ttf --- SDL3_ttf-CS/SDL3_ttf/SDL_ttf.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/SDL3_ttf-CS/SDL3_ttf/SDL_ttf.cs b/SDL3_ttf-CS/SDL3_ttf/SDL_ttf.cs index fdec2f3..4ebb114 100644 --- a/SDL3_ttf-CS/SDL3_ttf/SDL_ttf.cs +++ b/SDL3_ttf-CS/SDL3_ttf/SDL_ttf.cs @@ -5,6 +5,17 @@ using System; namespace SDL { + [Flags] + [Typedef] + public enum TTF_FontStyleFlags : UInt32 + { + TTF_STYLE_NORMAL = SDL3_ttf.TTF_STYLE_NORMAL, + TTF_STYLE_BOLD = SDL3_ttf.TTF_STYLE_BOLD, + TTF_STYLE_ITALIC = SDL3_ttf.TTF_STYLE_ITALIC, + TTF_STYLE_UNDERLINE = SDL3_ttf.TTF_STYLE_UNDERLINE, + TTF_STYLE_STRIKETHROUGH = SDL3_ttf.TTF_STYLE_STRIKETHROUGH, + } + [Flags] [Typedef] public enum TTF_SubStringFlags : UInt32 From d93df5517fa5a1d99f67c2c36d649eeb1ea0381b Mon Sep 17 00:00:00 2001 From: Susko3 Date: Mon, 23 Jun 2025 22:15:01 +0200 Subject: [PATCH 3/3] Add missing macros for version checks --- SDL3_image-CS/SDL3_image/SDL_image.cs | 6 ++++++ SDL3_ttf-CS/SDL3_ttf/SDL_ttf.cs | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/SDL3_image-CS/SDL3_image/SDL_image.cs b/SDL3_image-CS/SDL3_image/SDL_image.cs index 806ba13..ffeb286 100644 --- a/SDL3_image-CS/SDL3_image/SDL_image.cs +++ b/SDL3_image-CS/SDL3_image/SDL_image.cs @@ -21,5 +21,11 @@ namespace SDL { [Constant] public static readonly int SDL_IMAGE_VERSION = SDL3.SDL_VERSIONNUM(SDL_IMAGE_MAJOR_VERSION, SDL_IMAGE_MINOR_VERSION, SDL_IMAGE_MICRO_VERSION); + + [Macro] + public static bool SDL_IMAGE_VERSION_ATLEAST(int X, int Y, int Z) => + ((SDL_IMAGE_MAJOR_VERSION >= X) && + (SDL_IMAGE_MAJOR_VERSION > X || SDL_IMAGE_MINOR_VERSION >= Y) && + (SDL_IMAGE_MAJOR_VERSION > X || SDL_IMAGE_MINOR_VERSION > Y || SDL_IMAGE_MICRO_VERSION >= Z)); } } diff --git a/SDL3_ttf-CS/SDL3_ttf/SDL_ttf.cs b/SDL3_ttf-CS/SDL3_ttf/SDL_ttf.cs index 4ebb114..57f2d55 100644 --- a/SDL3_ttf-CS/SDL3_ttf/SDL_ttf.cs +++ b/SDL3_ttf-CS/SDL3_ttf/SDL_ttf.cs @@ -30,5 +30,11 @@ namespace SDL { [Constant] public static readonly int SDL_TTF_VERSION = SDL3.SDL_VERSIONNUM(SDL_TTF_MAJOR_VERSION, SDL_TTF_MINOR_VERSION, SDL_TTF_MICRO_VERSION); + + [Macro] + public static bool SDL_TTF_VERSION_ATLEAST(int X, int Y, int Z) => + ((SDL_TTF_MAJOR_VERSION >= X) && + (SDL_TTF_MAJOR_VERSION > X || SDL_TTF_MINOR_VERSION >= Y) && + (SDL_TTF_MAJOR_VERSION > X || SDL_TTF_MINOR_VERSION > Y || SDL_TTF_MICRO_VERSION >= Z)); } }