aboutsummaryrefslogtreecommitdiff
path: root/backends/graphics/sdl
diff options
context:
space:
mode:
authorJohannes Schickel2013-10-24 00:09:17 +0200
committerJohannes Schickel2013-10-24 00:09:17 +0200
commitcfa6b1b4ae690a6712ef9b2fa6a5f21ff3c2173b (patch)
treee6190ddef067e8eb520e5aa4b7a462b83c722eef /backends/graphics/sdl
parentea6d38d5f3b123b765e5bf8e2dc4f957e4b43eb6 (diff)
downloadscummvm-rg350-cfa6b1b4ae690a6712ef9b2fa6a5f21ff3c2173b.tar.gz
scummvm-rg350-cfa6b1b4ae690a6712ef9b2fa6a5f21ff3c2173b.tar.bz2
scummvm-rg350-cfa6b1b4ae690a6712ef9b2fa6a5f21ff3c2173b.zip
SDL: Further small cleanup related to manager switching.
Diffstat (limited to 'backends/graphics/sdl')
-rw-r--r--backends/graphics/sdl/sdl-graphics.cpp4
-rw-r--r--backends/graphics/sdl/sdl-graphics.h7
2 files changed, 4 insertions, 7 deletions
diff --git a/backends/graphics/sdl/sdl-graphics.cpp b/backends/graphics/sdl/sdl-graphics.cpp
index 417f4faf54..40b97b267b 100644
--- a/backends/graphics/sdl/sdl-graphics.cpp
+++ b/backends/graphics/sdl/sdl-graphics.cpp
@@ -31,10 +31,10 @@ SdlGraphicsManager::SdlGraphicsManager(SdlEventSource *source)
SdlGraphicsManager::~SdlGraphicsManager() {
}
-void SdlGraphicsManager::initEventSource() {
+void SdlGraphicsManager::activateManager() {
_eventSource->setGraphicsManager(this);
}
-void SdlGraphicsManager::deinitEventSource() {
+void SdlGraphicsManager::deactivateManager() {
_eventSource->setGraphicsManager(0);
}
diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h
index fea743b3ca..3791961cfa 100644
--- a/backends/graphics/sdl/sdl-graphics.h
+++ b/backends/graphics/sdl/sdl-graphics.h
@@ -44,13 +44,13 @@ public:
* process inputs now. However, even without being active it should be
* able to query the supported modes and other bits.
*/
- virtual void activateManager() {}
+ virtual void activateManager();
/**
* Makes this graphics manager inactive. This should allow another
* graphics manager to become active again.
*/
- virtual void deactivateManager() {}
+ virtual void deactivateManager();
/**
* Notify the graphics manager that the graphics needs to be redrawn, since
@@ -92,9 +92,6 @@ public:
virtual void notifyMousePos(Common::Point mouse) = 0;
protected:
- void initEventSource();
- void deinitEventSource();
-
SdlEventSource *_eventSource;
};