From 88b2d16e22639ef2386af0c7a2039a3f070bc7ee Mon Sep 17 00:00:00 2001
From: Holmes Futrell <hfutrell@umail.ucsb.edu>
Date: Tue, 29 Jul 2008 17:19:23 +0000
Subject: [PATCH] Added keyboard support in view initialization and proper
 deallocation of keyboard in -(void)dealloc, if keyboard is enabled

---
 src/video/uikit/SDL_uikitview.m | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m
index 48817232c..35b25fb95 100644
--- a/src/video/uikit/SDL_uikitview.m
+++ b/src/video/uikit/SDL_uikitview.m
@@ -19,11 +19,16 @@
  Sam Lantinga
  slouken@libsdl.org
  */
+
 #import "SDL_uikitview.h"
+#import "SDL_uikitkeyboard.h"
 
 @implementation SDL_uikitview
 
 - (void)dealloc {
+#if SDL_IPHONE_KEYBOARD
+	[textField release];
+#endif
 	[super dealloc];
 }
 
@@ -31,13 +36,17 @@ - (id)initWithFrame:(CGRect)frame {
 
 	self = [super initWithFrame: frame];
 	
+#if SDL_IPHONE_KEYBOARD
+	[self initializeKeyboard];
+#endif	
+
 	int i;
 	for (i=0; i<MAX_SIMULTANEOUS_TOUCHES; i++) {
 		mice[i].driverdata = NULL;
 		SDL_AddMouse(&(mice[i]), i);
 	}
 	self.multipleTouchEnabled = YES;
-		
+			
 	return self;
 
 }
@@ -95,8 +104,8 @@ - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
 - (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event {
 	/*
 		this can happen if the user puts more than 5 touches on the screen
-		at once, or perhaps in other circumstances.  Usually all active
-		touches are canceled.
+		at once, or perhaps in other circumstances.  Usually (it seems)
+		all active touches are canceled.
 	*/
 	[self touchesEnded: touches withEvent: event];
 }
@@ -118,4 +127,6 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
 	}
 }
 
+
+
 @end