From 9396c2df2204e072a3d1c35ce45cefc30e89f8a3 Mon Sep 17 00:00:00 2001 From: Edward Rudd Date: Thu, 25 Apr 2013 18:05:08 -0400 Subject: [PATCH] Allow disabling SDL_IPHONE_KEYBOARD in iOS builds --- src/video/uikit/SDL_uikitvideo.m | 2 ++ src/video/uikit/SDL_uikitview.m | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/video/uikit/SDL_uikitvideo.m b/src/video/uikit/SDL_uikitvideo.m index ff025067b..486c6255a 100644 --- a/src/video/uikit/SDL_uikitvideo.m +++ b/src/video/uikit/SDL_uikitvideo.m @@ -86,10 +86,12 @@ static void UIKit_DeleteDevice(SDL_VideoDevice * device) /* !!! FIXME: implement SetWindowBordered */ +#if SDL_IPHONE_KEYBOARD device->SDL_HasScreenKeyboardSupport = UIKit_HasScreenKeyboardSupport; device->SDL_ShowScreenKeyboard = UIKit_ShowScreenKeyboard; device->SDL_HideScreenKeyboard = UIKit_HideScreenKeyboard; device->SDL_IsScreenKeyboardShown = UIKit_IsScreenKeyboardShown; +#endif /* OpenGL (ES) functions */ device->GL_MakeCurrent = UIKit_GL_MakeCurrent; diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m index 82cce3cbf..ec37f1880 100644 --- a/src/video/uikit/SDL_uikitview.m +++ b/src/video/uikit/SDL_uikitview.m @@ -30,10 +30,10 @@ #if SDL_IPHONE_KEYBOARD #include "keyinfotable.h" +#endif #include "SDL_uikitappdelegate.h" #include "SDL_uikitmodes.h" #include "SDL_uikitwindow.h" -#endif @implementation SDL_uikitview