Mercurial > sdl-ios-xcode
diff src/SDL.c @ 2678:3895761db26a gsoc2008_nds
Removed old touchscreen system, starting to implement mouse-based touchscreen. Also, more work on a non-software-rendering video driver
| author | Darren Alton <dalton@stevens.edu> |
|---|---|
| date | Thu, 10 Jul 2008 23:35:01 +0000 |
| parents | f1d07ba2e275 |
| children |
line wrap: on
line diff
--- a/src/SDL.c Wed Jul 02 13:59:30 2008 +0000 +++ b/src/SDL.c Thu Jul 10 23:35:01 2008 +0000 @@ -38,10 +38,6 @@ extern int SDL_JoystickInit(void); extern void SDL_JoystickQuit(void); #endif -#if !SDL_TOUCHSCREEN_DISABLED -extern int SDL_TouchscreenInit(void); -extern void SDL_TouchscreenQuit(void); -#endif #if !SDL_CDROM_DISABLED extern int SDL_CDROMInit(void); extern void SDL_CDROMQuit(void); @@ -127,21 +123,6 @@ } #endif -#if !SDL_TOUCHSCREEN_DISABLED - /* Initialize the touchscreen subsystem */ - if ((flags & SDL_INIT_TOUCHSCREEN) && !(SDL_initialized & SDL_INIT_TOUCHSCREEN)) { - if (SDL_TouchscreenInit() < 0) { - return (-1); - } - SDL_initialized |= SDL_INIT_TOUCHSCREEN; - } -#else - if (flags & SDL_INIT_TOUCHSCREEN) { - SDL_SetError("SDL not built with touchscreen support"); - return (-1); - } -#endif - #if !SDL_CDROM_DISABLED /* Initialize the CD-ROM subsystem */ if ((flags & SDL_INIT_CDROM) && !(SDL_initialized & SDL_INIT_CDROM)) { @@ -199,12 +180,6 @@ SDL_initialized &= ~SDL_INIT_JOYSTICK; } #endif -#if !SDL_TOUCHSCREEN_DISABLED - if ((flags & SDL_initialized & SDL_INIT_TOUCHSCREEN)) { - SDL_TouchscreenQuit(); - SDL_initialized &= ~SDL_INIT_TOUCHSCREEN; - } -#endif #if !SDL_TIMERS_DISABLED if ((flags & SDL_initialized & SDL_INIT_TIMER)) { SDL_TimerQuit();