diff options
| author | Johannes Schickel | 2015-03-05 01:10:34 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2015-03-05 01:10:34 +0100 |
| commit | 4d13d44f8a2db8f887e285dbcbd3bb75ccc0ae2e (patch) | |
| tree | 9fd0cb9d8b0965a2c823e690f7d467c9ff3c5aea /backends/graphics/gph | |
| parent | cecb9a9ecc1ec1897fdd27e1bafc7f6d494cd6af (diff) | |
| parent | b5ac3ecb1f25b2d47fd99a3c4fd3b1cddcb695c6 (diff) | |
| download | scummvm-rg350-4d13d44f8a2db8f887e285dbcbd3bb75ccc0ae2e.tar.gz scummvm-rg350-4d13d44f8a2db8f887e285dbcbd3bb75ccc0ae2e.tar.bz2 scummvm-rg350-4d13d44f8a2db8f887e285dbcbd3bb75ccc0ae2e.zip | |
Merge pull request #572 from lordhoto/sdl2-support
SDL: Add experimental support for SDL2
Diffstat (limited to 'backends/graphics/gph')
| -rw-r--r-- | backends/graphics/gph/gph-graphics.cpp | 6 | ||||
| -rw-r--r-- | backends/graphics/gph/gph-graphics.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/backends/graphics/gph/gph-graphics.cpp b/backends/graphics/gph/gph-graphics.cpp index 247e5ed490..65cb3d1d65 100644 --- a/backends/graphics/gph/gph-graphics.cpp +++ b/backends/graphics/gph/gph-graphics.cpp @@ -35,8 +35,8 @@ static const OSystem::GraphicsMode s_supportedGraphicsModes[] = { {0, 0, 0} }; -GPHGraphicsManager::GPHGraphicsManager(SdlEventSource *sdlEventSource) - : SurfaceSdlGraphicsManager(sdlEventSource) { +GPHGraphicsManager::GPHGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window) + : SurfaceSdlGraphicsManager(sdlEventSource, window) { } const OSystem::GraphicsMode *GPHGraphicsManager::getSupportedGraphicsModes() const { @@ -141,7 +141,7 @@ void GPHGraphicsManager::initSize(uint w, uint h, const Graphics::PixelFormat *f if (w > 320 || h > 240) { setGraphicsMode(GFX_HALF); setGraphicsModeIntern(); - _eventSource->toggleMouseGrab(); + _window->toggleMouseGrab(); } _videoMode.overlayWidth = 320; diff --git a/backends/graphics/gph/gph-graphics.h b/backends/graphics/gph/gph-graphics.h index 4a68ea6eed..152d29ddf4 100644 --- a/backends/graphics/gph/gph-graphics.h +++ b/backends/graphics/gph/gph-graphics.h @@ -33,7 +33,7 @@ enum { class GPHGraphicsManager : public SurfaceSdlGraphicsManager { public: - GPHGraphicsManager(SdlEventSource *boss); + GPHGraphicsManager(SdlEventSource *boss, SdlWindow *window); bool hasFeature(OSystem::Feature f); void setFeatureState(OSystem::Feature f, bool enable); |
