thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL: Handle icon setup in SdlWindow.

Browse source
This commit is contained in:
Johannes Schickel 2015-02-16 01:24:42 +01:00
parent 627d766325
commit 3f22c12c56
15 changed files with 201 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

15
backends/platform/maemo/maemo.cpp
View file

@ -84,6 +84,15 @@ static void registerDefaultKeyBindings(Common::KeymapperDefaultBindings *_keymap
}
#endif
void OSystem_SDL_Maemo::init() {
// Use an iconless window for Maemo
// also N900 is hit by SDL_WM_SetIcon bug (window cannot receive input)
// http://bugzilla.libsdl.org/show_bug.cgi?id=586
_window = new SdlIconlessWindow();
OSystem_POSIX::init();
}
void OSystem_SDL_Maemo::initBackend() {
ConfMan.registerDefault("fullscreen", true);
ConfMan.registerDefault("aspect_ratio", true);
@ -178,12 +187,6 @@ const Maemo::Model OSystem_SDL_Maemo::detectModel() {
return *model;
}
void OSystem_SDL_Maemo::setupIcon() {
// no Maemo version needs setupIcon
// also N900 is hit by SDL_WM_SetIcon bug (window cannot receive input)
// http://bugzilla.libsdl.org/show_bug.cgi?id=586
}
#ifdef ENABLE_KEYMAPPER
static const Common::KeyTableEntry maemoKeys[] = {
// Function keys

2
backends/platform/maemo/maemo.h
View file

@ -36,11 +36,11 @@ public:
OSystem_SDL_Maemo();
~OSystem_SDL_Maemo();
virtual void init();
virtual void initBackend();
virtual void quit();
virtual void fatalError();
virtual void setWindowCaption(const char *caption);
virtual void setupIcon();
#ifdef ENABLE_KEYMAPPER
virtual Common::HardwareInputSet *getHardwareInputSet();
virtual Common::Keymap *getGlobalKeymap();