diff options
| author | Cameron Cawley | 2019-03-10 16:25:25 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2019-03-10 18:25:25 +0200 |
| commit | f426ba6c36f4d825e427535514eb68855c64c2d1 (patch) | |
| tree | 0a0ddac623be7ad58a63d52fc22d72c942436d8f /backends/graphics/surfacesdl/surfacesdl-graphics.h | |
| parent | 1c6905217e4c249a67a5ca289868e0fcc68ae9eb (diff) | |
| download | scummvm-rg350-f426ba6c36f4d825e427535514eb68855c64c2d1.tar.gz scummvm-rg350-f426ba6c36f4d825e427535514eb68855c64c2d1.tar.bz2 scummvm-rg350-f426ba6c36f4d825e427535514eb68855c64c2d1.zip | |
SDL: Move fullscreen and screenshot event handling to SdlGraphicsManager (#1522)
Diffstat (limited to 'backends/graphics/surfacesdl/surfacesdl-graphics.h')
| -rw-r--r-- | backends/graphics/surfacesdl/surfacesdl-graphics.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.h b/backends/graphics/surfacesdl/surfacesdl-graphics.h index 3315533d80..3db2ac6709 100644 --- a/backends/graphics/surfacesdl/surfacesdl-graphics.h +++ b/backends/graphics/surfacesdl/surfacesdl-graphics.h @@ -39,10 +39,6 @@ #define USE_SDL_DEBUG_FOCUSRECT #endif -#if !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) -#define USE_OSD 1 -#endif - enum { GFX_NORMAL = 0, GFX_DOUBLESIZE = 1, @@ -74,7 +70,7 @@ public: /** * SDL graphics manager */ -class SurfaceSdlGraphicsManager : public SdlGraphicsManager, public Common::EventObserver { +class SurfaceSdlGraphicsManager : public SdlGraphicsManager { public: SurfaceSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window); virtual ~SurfaceSdlGraphicsManager(); @@ -389,14 +385,13 @@ protected: virtual void setAspectRatioCorrection(bool enable); void setFilteringMode(bool enable); - virtual bool saveScreenshot(const char *filename); + virtual bool saveScreenshot(const Common::String &filename) const; virtual void setGraphicsModeIntern(); private: void setFullscreenMode(bool enable); bool handleScalerHotkeys(Common::KeyCode key); bool isScalerHotkey(const Common::Event &event); - void toggleFullScreen(); /** * Converts the given point from the overlay's coordinate space to the |