diff options
| -rw-r--r-- | backends/events/maemosdl/maemosdl-events.cpp | 1 | ||||
| -rw-r--r-- | backends/events/maemosdl/maemosdl-events.h | 2 | ||||
| -rw-r--r-- | backends/graphics/maemosdl/maemosdl-graphics.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/maemo/maemo.cpp | 5 | ||||
| -rw-r--r-- | backends/platform/maemo/main.cpp | 4 |
5 files changed, 4 insertions, 12 deletions
diff --git a/backends/events/maemosdl/maemosdl-events.cpp b/backends/events/maemosdl/maemosdl-events.cpp index e864c7d81c..13677a6d90 100644 --- a/backends/events/maemosdl/maemosdl-events.cpp +++ b/backends/events/maemosdl/maemosdl-events.cpp @@ -25,6 +25,7 @@ #include "common/scummsys.h" #include "backends/events/maemosdl/maemosdl-events.h" +#include "backends/platform/maemo/maemo.h" #include "common/translation.h" namespace Maemo { diff --git a/backends/events/maemosdl/maemosdl-events.h b/backends/events/maemosdl/maemosdl-events.h index 6024031249..d2df05ad89 100644 --- a/backends/events/maemosdl/maemosdl-events.h +++ b/backends/events/maemosdl/maemosdl-events.h @@ -26,8 +26,6 @@ #define BACKEND_EVENTS_SDL_MAEMO_H #include "backends/events/sdl/sdl-events.h" -#include "backends/platform/maemo/maemo.h" -#include "backends/graphics/surfacesdl/surfacesdl-graphics.h" namespace Maemo { diff --git a/backends/graphics/maemosdl/maemosdl-graphics.cpp b/backends/graphics/maemosdl/maemosdl-graphics.cpp index d954333537..588e7259d6 100644 --- a/backends/graphics/maemosdl/maemosdl-graphics.cpp +++ b/backends/graphics/maemosdl/maemosdl-graphics.cpp @@ -24,7 +24,6 @@ #include "common/scummsys.h" #include "backends/platform/maemo/maemo.h" -#include "backends/events/maemosdl/maemosdl-events.h" #include "backends/graphics/maemosdl/maemosdl-graphics.h" MaemoSdlGraphicsManager::MaemoSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window) @@ -36,8 +35,7 @@ bool MaemoSdlGraphicsManager::loadGFXMode() { // fix the problematic zoom key capture in Maemo5/N900 SDL_SysWMinfo info; - SDL_VERSION(&info.version); - if (SDL_GetWMInfo(&info)) { + if (_window->getSDLWMInformation(&info)) { Display *dpy = info.info.x11.display; Window win; unsigned long val = 1; diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp index 326c35a28f..836102e2b9 100644 --- a/backends/platform/maemo/maemo.cpp +++ b/backends/platform/maemo/maemo.cpp @@ -129,8 +129,7 @@ void OSystem_SDL_Maemo::fatalError() { void OSystem_SDL_Maemo::setXWindowName(const char *caption) { SDL_SysWMinfo info; - SDL_VERSION(&info.version); - if (SDL_GetWMInfo(&info)) { + if (_window->getSDLWMInformation(&info)) { Display *dpy = info.info.x11.display; Window win; win = info.info.x11.fswindow; @@ -155,7 +154,7 @@ void OSystem_SDL_Maemo::setWindowCaption(const char *caption) { } } - SDL_WM_SetCaption(cap.c_str(), cap.c_str()); + _window->setWindowCaption(cap); Common::String cap2("ScummVM - "); // 2 lines in OS2008 task switcher, set first line cap = cap2 + cap; diff --git a/backends/platform/maemo/main.cpp b/backends/platform/maemo/main.cpp index 9d8b0f2e84..72253bb32c 100644 --- a/backends/platform/maemo/main.cpp +++ b/backends/platform/maemo/main.cpp @@ -22,14 +22,10 @@ #if defined(MAEMO) -#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h - #include "backends/platform/maemo/maemo.h" #include "backends/plugins/sdl/sdl-provider.h" #include "base/main.h" -#include <unistd.h> - int main(int argc, char* argv[]) { g_system = new Maemo::OSystem_SDL_Maemo(); assert(g_system); |