Browse Source

Renamed SDL_HINT_GDK_TEXTINPUT_DEFAULT to SDL_HINT_GDK_TEXTINPUT_DEFAULT_TEXT

Sam Lantinga 1 year ago
parent
commit
4f628b5b62

+ 4 - 0
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

+ 1 - 0
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
 

+ 1 - 1
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.

+ 2 - 0
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

+ 1 - 1
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(