[Gemrb-commits] gemrb: branch master updated. v0.6.6-157-g4115619

[Brad A. <br...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  411561934ed30dbf6647fd5af0c30cf131170ac0 (commit)

Summary of changes:
 gemrb/plugins/SDLVideo/SDLVideo.cpp |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
      from  96c1179cdb8cb6b206d1608152e47f30f2acc72e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=411561934ed30dbf6647fd5af0c30cf131170ac0

commit 411561934ed30dbf6647fd5af0c30cf131170ac0
Author: Brad Allred <bra...@me...>
Date:   Sat Nov 26 16:12:28 2011 -0700

    SDLVideo: correct usage of TARGET_OS_IPHONE

diff --git a/gemrb/plugins/SDLVideo/SDLVideo.cpp b/gemrb/plugins/SDLVideo/SDLVideo.cpp
index e57f40e..9662619 100644
--- a/gemrb/plugins/SDLVideo/SDLVideo.cpp
+++ b/gemrb/plugins/SDLVideo/SDLVideo.cpp
@@ -39,7 +39,7 @@
 #include <cassert>
 #include <cstdio>
 
-#ifdef TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE
 extern "C" {
 	#include "SDL_sysvideo.h"
 	#include "SDL_uikitkeyboard.h"
@@ -393,7 +393,7 @@ int SDLVideoDriver::PollEvents() {
 					key = GEM_RIGHT;
 					break;
 				case SDLK_DELETE:
-#ifndef TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE < 1
 					//iOS currently doesnt have a backspace so we use delete. 
 					//This change should be future proof in the event apple changes the delete key to a backspace.
 					key = GEM_DELETE;
@@ -647,9 +647,8 @@ This method is intended for devices with no physical keyboard or with an optiona
 */
 void SDLVideoDriver::HideSoftKeyboard()
 {
-
 	if(core->UseSoftKeyboard){
-#ifdef TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE
 		SDL_iPhoneKeyboardHide(SDL_GetFocusWindow());
 #endif
 #ifdef ANDROID
@@ -666,7 +665,7 @@ This method is intended for devices with no physical keyboard or with an optiona
 void SDLVideoDriver::ShowSoftKeyboard()
 {
 	if(core->UseSoftKeyboard){
-#ifdef TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE
 		SDL_iPhoneKeyboardShow(SDL_GetFocusWindow());
 #endif
 #ifdef ANDROID

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator