comparison src/video/uikit/SDL_uikitview.h @ 4661:03dcb795c583

Merged changes from the main SDL codebase
author Sam Lantinga <slouken@libsdl.org>
date Mon, 12 Jul 2010 21:09:23 -0700
parents b15e7017409b 06c7423f8c60
children 3c4e0130c9b1
comparison
equal deleted inserted replaced
4660:b15e7017409b 4661:03dcb795c583
35 @interface SDL_uikitview : UIView<UITextFieldDelegate> { 35 @interface SDL_uikitview : UIView<UITextFieldDelegate> {
36 #else 36 #else
37 @interface SDL_uikitview : UIView { 37 @interface SDL_uikitview : UIView {
38 #endif 38 #endif
39 39
40 #if FIXME_MULTITOUCH
41 SDL_Mouse mice[MAX_SIMULTANEOUS_TOUCHES];
42 #endif
43
44 #if FIXED_MULTITOUCH 40 #if FIXED_MULTITOUCH
45 int touchId; 41 int touchId;
46 #endif 42 #endif
47 43
48 #if SDL_IPHONE_KEYBOARD 44 #if SDL_IPHONE_KEYBOARD