Commit d1e4367f58f59747de69787e6f33c7252fda63d8
2022-03-15T21:41:02
SDL_windowskeyboard.c: fix build with SDL_DISABLE_WINDOWS_IME defined. Fixes https://github.com/libsdl-org/SDL/issues/5408
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
diff --git a/src/video/windows/SDL_windowskeyboard.c b/src/video/windows/SDL_windowskeyboard.c
index deea44b..626e876 100644
--- a/src/video/windows/SDL_windowskeyboard.c
+++ b/src/video/windows/SDL_windowskeyboard.c
@@ -276,27 +276,18 @@ WIN_SetTextInputRect(_THIS, SDL_Rect *rect)
}
}
+
+#ifdef SDL_DISABLE_WINDOWS_IME
+
void WIN_ClearComposition(_THIS)
{
- SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata;
- IME_ClearComposition(videodata);
}
SDL_bool WIN_IsTextInputShown(_THIS)
{
- SDL_VideoData* videodata = (SDL_VideoData*)_this->driverdata;
- return IME_IsTextInputShown(videodata);
-}
-
-static SDL_bool
-WIN_ShouldShowNativeUI()
-{
- return SDL_GetHintBoolean(SDL_HINT_IME_SHOW_UI, SDL_FALSE);
+ return SDL_FALSE;
}
-#ifdef SDL_DISABLE_WINDOWS_IME
-
-
SDL_bool
IME_HandleMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM *lParam, SDL_VideoData *videodata)
{
@@ -378,6 +369,12 @@ static void UILess_ReleaseSinks(SDL_VideoData *videodata);
static void UILess_EnableUIUpdates(SDL_VideoData *videodata);
static void UILess_DisableUIUpdates(SDL_VideoData *videodata);
+static SDL_bool
+WIN_ShouldShowNativeUI()
+{
+ return SDL_GetHintBoolean(SDL_HINT_IME_SHOW_UI, SDL_FALSE);
+}
+
static void
IME_Init(SDL_VideoData *videodata, HWND hwnd)
{
@@ -1714,6 +1711,18 @@ void IME_Present(SDL_VideoData *videodata)
/* FIXME: Need to show the IME bitmap */
}
+SDL_bool WIN_IsTextInputShown(_THIS)
+{
+ SDL_VideoData* videodata = (SDL_VideoData*)_this->driverdata;
+ return IME_IsTextInputShown(videodata);
+}
+
+void WIN_ClearComposition(_THIS)
+{
+ SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata;
+ IME_ClearComposition(videodata);
+}
+
#endif /* SDL_DISABLE_WINDOWS_IME */
#endif /* SDL_VIDEO_DRIVER_WINDOWS */