Skip to content

Commit 11b312e

Browse files
committed
Consistently use SDL hint constants from SDL_hints.h
1 parent 923859f commit 11b312e

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

src/engine/client/client.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4901,32 +4901,34 @@ int main(int argc, const char **argv)
49014901
#endif
49024902

49034903
// Do not automatically translate touch events to mouse events and vice versa.
4904-
SDL_SetHint("SDL_TOUCH_MOUSE_EVENTS", "0");
4905-
SDL_SetHint("SDL_MOUSE_TOUCH_EVENTS", "0");
4904+
SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0");
4905+
SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0");
49064906

49074907
// Support longer IME composition strings (enables SDL_TEXTEDITING_EXT).
49084908
#if SDL_VERSION_ATLEAST(2, 0, 22)
49094909
SDL_SetHint(SDL_HINT_IME_SUPPORT_EXTENDED_TEXT, "1");
49104910
#endif
49114911

4912-
#if defined(CONF_PLATFORM_MACOS)
4912+
#if defined(CONF_PLATFORM_MACOS) && SDL_VERSION_ATLEAST(2, 24, 0)
49134913
// Hints will not be set if there is an existing override hint or environment variable that takes precedence.
49144914
// So this respects cli environment overrides.
4915-
SDL_SetHint("SDL_MAC_OPENGL_ASYNC_DISPATCH", "1");
4915+
SDL_SetHint(SDL_HINT_MAC_OPENGL_ASYNC_DISPATCH, "1");
49164916
#endif
49174917

4918+
#if SDL_VERSION_ATLEAST(2, 0, 18)
49184919
#if defined(CONF_FAMILY_WINDOWS)
4919-
SDL_SetHint("SDL_IME_SHOW_UI", g_Config.m_InpImeNativeUi ? "1" : "0");
4920+
SDL_SetHint(SDL_HINT_IME_SHOW_UI, g_Config.m_InpImeNativeUi ? "1" : "0");
49204921
#else
4921-
SDL_SetHint("SDL_IME_SHOW_UI", "1");
4922+
SDL_SetHint(SDL_HINT_IME_SHOW_UI, "1");
4923+
#endif
49224924
#endif
49234925

49244926
#if defined(CONF_PLATFORM_ANDROID)
49254927
// Trap the Android back button so it can be handled in our code reliably
49264928
// instead of letting the system handle it.
4927-
SDL_SetHint("SDL_ANDROID_TRAP_BACK_BUTTON", "1");
4929+
SDL_SetHint(SDL_HINT_ANDROID_TRAP_BACK_BUTTON, "1");
49284930
// Force landscape screen orientation.
4929-
SDL_SetHint("SDL_IOS_ORIENTATIONS", "LandscapeLeft LandscapeRight");
4931+
SDL_SetHint(SDL_HINT_ORIENTATIONS, "LandscapeLeft LandscapeRight");
49304932
#endif
49314933

49324934
// init SDL

0 commit comments

Comments
 (0)