From 4f628b5b62c8438cfa4d94dd1cae6250e9cb2123 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 11 Feb 2024 17:53:47 -0800 Subject: [PATCH] Renamed SDL_HINT_GDK_TEXTINPUT_DEFAULT to SDL_HINT_GDK_TEXTINPUT_DEFAULT_TEXT --- build-scripts/SDL_migration.cocci | 4 ++++ docs/README-migration.md | 1 + include/SDL3/SDL_hints.h | 2 +- include/SDL3/SDL_oldnames.h | 2 ++ src/video/gdk/SDL_gdktextinput.cpp | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build-scripts/SDL_migration.cocci b/build-scripts/SDL_migration.cocci index 265b17385..90e6ed1e4 100644 --- a/build-scripts/SDL_migration.cocci +++ b/build-scripts/SDL_migration.cocci @@ -3016,3 +3016,7 @@ typedef SDL_version, SDL_Version; @@ - SDL_HINT_DIRECTINPUT_ENABLED + SDL_HINT_JOYSTICK_DIRECTINPUT +@@ +@@ +- SDL_HINT_GDK_TEXTINPUT_DEFAULT ++ SDL_HINT_GDK_TEXTINPUT_DEFAULT_TEXT diff --git a/docs/README-migration.md b/docs/README-migration.md index a9f4f0b39..b3b4b7d4c 100644 --- a/docs/README-migration.md +++ b/docs/README-migration.md @@ -727,6 +727,7 @@ The following hints have been removed: The following hints have been renamed: * SDL_HINT_ALLOW_TOPMOST => SDL_HINT_WINDOW_ALLOW_TOPMOST * SDL_HINT_DIRECTINPUT_ENABLED => SDL_HINT_JOYSTICK_DIRECTINPUT +* SDL_HINT_GDK_TEXTINPUT_DEFAULT => SDL_HINT_GDK_TEXTINPUT_DEFAULT_TEXT ## SDL_init.h diff --git a/include/SDL3/SDL_hints.h b/include/SDL3/SDL_hints.h index efbf75e18..c9ae703a4 100644 --- a/include/SDL3/SDL_hints.h +++ b/include/SDL3/SDL_hints.h @@ -564,7 +564,7 @@ extern "C" { * * This hint should be set before calling SDL_StartTextInput() */ -#define SDL_HINT_GDK_TEXTINPUT_DEFAULT "SDL_GDK_TEXTINPUT_DEFAULT" +#define SDL_HINT_GDK_TEXTINPUT_DEFAULT_TEXT "SDL_GDK_TEXTINPUT_DEFAULT_TEXT" /** * This variable sets the description of the TextInput window on GDK platforms. diff --git a/include/SDL3/SDL_oldnames.h b/include/SDL3/SDL_oldnames.h index a74573de0..7e0d25e5c 100644 --- a/include/SDL3/SDL_oldnames.h +++ b/include/SDL3/SDL_oldnames.h @@ -282,6 +282,7 @@ /* ##SDL_hints.h */ #define SDL_HINT_ALLOW_TOPMOST SDL_HINT_WINDOW_ALLOW_TOPMOST #define SDL_HINT_DIRECTINPUT_ENABLED SDL_HINT_JOYSTICK_DIRECTINPUT +#define SDL_HINT_GDK_TEXTINPUT_DEFAULT SDL_HINT_GDK_TEXTINPUT_DEFAULT_TEXT /* ##SDL_joystick.h */ #define SDL_JOYSTICK_TYPE_GAMECONTROLLER SDL_JOYSTICK_TYPE_GAMEPAD @@ -758,6 +759,7 @@ /* ##SDL_hints.h */ #define SDL_HINT_ALLOW_TOPMOST SDL_HINT_ALLOW_TOPMOST_renamed_SDL_HINT_WINDOW_ALLOW_TOPMOST #define SDL_HINT_DIRECTINPUT_ENABLED SDL_HINT_DIRECTINPUT_ENABLED_renamed_SDL_HINT_JOYSTICK_DIRECTINPUT +#define SDL_HINT_GDK_TEXTINPUT_DEFAULT SDL_HINT_GDK_TEXTINPUT_DEFAULT_renamed_SDL_HINT_GDK_TEXTINPUT_DEFAULT_TEXT /* ##SDL_joystick.h */ #define SDL_JOYSTICK_TYPE_GAMECONTROLLER SDL_JOYSTICK_TYPE_GAMECONTROLLER_renamed_SDL_JOYSTICK_TYPE_GAMEPAD diff --git a/src/video/gdk/SDL_gdktextinput.cpp b/src/video/gdk/SDL_gdktextinput.cpp index 29ffcc0d6..9751bed35 100644 --- a/src/video/gdk/SDL_gdktextinput.cpp +++ b/src/video/gdk/SDL_gdktextinput.cpp @@ -163,7 +163,7 @@ void GDK_EnsureHints(void) GDK_InternalHintCallback, &g_DescriptionText); SDL_AddHintCallback( - SDL_HINT_GDK_TEXTINPUT_DEFAULT, + SDL_HINT_GDK_TEXTINPUT_DEFAULT_TEXT, GDK_InternalHintCallback, &g_DefaultText); SDL_AddHintCallback(