thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL: Remove left over traces from the time the SdlEventSource subclassed DefaultEventManager.

Browse source
This commit is contained in:
Johannes Schickel 2011-06-19 19:33:06 +02:00
parent f9f16ee358
commit 2067bec18e
2 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backends/events/sdl/sdl-events.h
View file

@ -20,13 +20,13 @@
* *
*/ */
#if !defined(BACKEND_EVENTS_SDL_H) && !defined(DISABLE_DEFAULT_EVENTMANAGER) #ifndef BACKEND_EVENTS_SDL_H
#define BACKEND_EVENTS_SDL_H #define BACKEND_EVENTS_SDL_H
#include "backends/events/default/default-events.h"
#include "backends/platform/sdl/sdl-sys.h" #include "backends/platform/sdl/sdl-sys.h"
#include "common/events.h"
/** /**
* The SDL event source. * The SDL event source.

28
backends/platform/sdl/sdl.cpp
View file

@ -172,22 +172,6 @@ void OSystem_SDL::initBackend() {
} }
} }
// Creates the backend managers, if they don't exist yet (we check
// for this to allow subclasses to provide their own).
if (_eventManager == 0)
_eventManager = new DefaultEventManager(_eventSource);
// We have to initialize the graphics manager before the event manager
// so the virtual keyboard can be initialized, but we have to add the
// graphics manager as an event observer after initializing the event
// manager.
if (graphicsManagerType == 0)
((SdlGraphicsManager *)_graphicsManager)->initEventObserver();
#ifdef USE_OPENGL
else if (graphicsManagerType == 1)
((OpenGLSdlGraphicsManager *)_graphicsManager)->initEventObserver();
#endif
if (_savefileManager == 0) if (_savefileManager == 0)
_savefileManager = new DefaultSaveFileManager(); _savefileManager = new DefaultSaveFileManager();
@ -207,6 +191,18 @@ void OSystem_SDL::initBackend() {
_inited = true; _inited = true;
ModularBackend::initBackend(); ModularBackend::initBackend();
// We have to initialize the graphics manager before the event manager
// so the virtual keyboard can be initialized, but we have to add the
// graphics manager as an event observer after initializing the event
// manager.
if (graphicsManagerType == 0)
((SdlGraphicsManager *)_graphicsManager)->initEventObserver();
#ifdef USE_OPENGL
else if (graphicsManagerType == 1)
((OpenGLSdlGraphicsManager *)_graphicsManager)->initEventObserver();
#endif
} }
void OSystem_SDL::initSDL() { void OSystem_SDL::initSDL() {