diff options
| author | Oystein Eftevaag | 2010-04-03 00:44:38 +0000 |
|---|---|---|
| committer | Oystein Eftevaag | 2010-04-03 00:44:38 +0000 |
| commit | 0d83045b5fcc317cbed22b194ff9cb0a6eb6c61f (patch) | |
| tree | 7b6a4467217c4c4a97848a6e33645e7310e0a110 /backends/platform | |
| parent | fe51070977e01c0ab20807acf7a30388ee74ae6e (diff) | |
| download | scummvm-rg350-0d83045b5fcc317cbed22b194ff9cb0a6eb6c61f.tar.gz scummvm-rg350-0d83045b5fcc317cbed22b194ff9cb0a6eb6c61f.tar.bz2 scummvm-rg350-0d83045b5fcc317cbed22b194ff9cb0a6eb6c61f.zip | |
Updated XCode project
svn-id: r48479
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/iphone/iphone_common.h | 6 | ||||
| -rw-r--r-- | backends/platform/iphone/iphone_keyboard.m | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/backends/platform/iphone/iphone_common.h b/backends/platform/iphone/iphone_common.h index 90d9a50aad..9f7e3e808f 100644 --- a/backends/platform/iphone/iphone_common.h +++ b/backends/platform/iphone/iphone_common.h @@ -52,13 +52,19 @@ typedef enum kUIViewSwipeRight = 8 } UIViewSwipeDirection; +#ifdef IPHONE_OFFICIAL +void iphone_main(int argc, char **argv); +#endif + // We need this to be able to call functions from/in Objective-C. #ifdef __cplusplus extern "C" { #endif // On the C++ side +#ifndef IPHONE_OFFICIAL void iphone_main(int argc, char *argv[]); +#endif // On the ObjC side void iPhone_updateScreen(); diff --git a/backends/platform/iphone/iphone_keyboard.m b/backends/platform/iphone/iphone_keyboard.m index ba19773a34..53c7376745 100644 --- a/backends/platform/iphone/iphone_keyboard.m +++ b/backends/platform/iphone/iphone_keyboard.m @@ -46,8 +46,8 @@ self = [super initWithFrame:CGRectMake(0.0f, 0.0f, 0.0f, 0.0f)]; softKeyboard = keyboard; - [[self textInputTraits] setAutocorrectionType:1]; - [[self textInputTraits] setAutocapitalizationType:0]; + [[self textInputTraits] setAutocorrectionType:(UITextAutocorrectionType)1]; + [[self textInputTraits] setAutocapitalizationType:(UITextAutocapitalizationType)0]; [[self textInputTraits] setEnablesReturnKeyAutomatically:NO]; return self; |