diff options
| author | Johannes Schickel | 2013-10-24 00:03:09 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2013-10-24 00:03:09 +0200 |
| commit | 281672e1718d5f960061b714f79924125922e1e5 (patch) | |
| tree | e75166443a07dd3aecc818c95e929af951c5ee71 /backends/graphics/sdl | |
| parent | 1fc5d52e906186bdde6e5c46e84268b9c958691c (diff) | |
| download | scummvm-rg350-281672e1718d5f960061b714f79924125922e1e5.tar.gz scummvm-rg350-281672e1718d5f960061b714f79924125922e1e5.tar.bz2 scummvm-rg350-281672e1718d5f960061b714f79924125922e1e5.zip | |
SDL: Let SdlGraphicsManager inherit from GraphicsManager.
Diffstat (limited to 'backends/graphics/sdl')
| -rw-r--r-- | backends/graphics/sdl/sdl-graphics.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h index 4d4338af16..ebf8078f23 100644 --- a/backends/graphics/sdl/sdl-graphics.h +++ b/backends/graphics/sdl/sdl-graphics.h @@ -23,6 +23,8 @@ #ifndef BACKENDS_GRAPHICS_SDL_SDLGRAPHICS_H #define BACKENDS_GRAPHICS_SDL_SDLGRAPHICS_H +#include "backends/graphics/graphics.h" + #include "common/rect.h" class SdlEventSource; @@ -31,11 +33,8 @@ class SdlEventSource; * Base class for a SDL based graphics manager. * * It features a few extra a few extra features required by SdlEventSource. - * FIXME/HACK: - * Note it does not inherit from GraphicsManager to avoid a diamond inheritance - * in the current OpenGLSdlGraphicsManager. */ -class SdlGraphicsManager { +class SdlGraphicsManager : virtual public GraphicsManager { public: SdlGraphicsManager(SdlEventSource *source); virtual ~SdlGraphicsManager(); |