diff options
| author | Stephen Kennedy | 2008-07-07 14:52:30 +0000 |
|---|---|---|
| committer | Stephen Kennedy | 2008-07-07 14:52:30 +0000 |
| commit | 7e3639e68b054c2259124d86bcd3bde0edc72d9e (patch) | |
| tree | f848e33765967d59d6f2a0eb4a70e6935d15574f /backends/events | |
| parent | 98f999f8e01c4752a771f1a8c6aec77b6efe3fb5 (diff) | |
| download | scummvm-rg350-7e3639e68b054c2259124d86bcd3bde0edc72d9e.tar.gz scummvm-rg350-7e3639e68b054c2259124d86bcd3bde0edc72d9e.tar.bz2 scummvm-rg350-7e3639e68b054c2259124d86bcd3bde0edc72d9e.zip | |
- moved VirtualKeyboard files into backends/common directory
svn-id: r32941
Diffstat (limited to 'backends/events')
| -rw-r--r-- | backends/events/default/default-events.cpp | 2 | ||||
| -rw-r--r-- | backends/events/default/default-events.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index 601e292ad0..a3630b1d73 100644 --- a/backends/events/default/default-events.cpp +++ b/backends/events/default/default-events.cpp @@ -193,7 +193,6 @@ DefaultEventManager::DefaultEventManager(OSystem *boss) : } _vk = new GUI::VirtualKeyboard(); - _vk->loadKeyboardPack("test"); } DefaultEventManager::~DefaultEventManager() { @@ -396,6 +395,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { if (_vk->isDisplaying()) { _vk->hide(); } else { + if (!_vk->isLoaded()) _vk->loadKeyboardPack("test"); bool isPaused = (g_engine) ? g_engine->isPaused() : true; if (!isPaused) g_engine->pauseEngine(true); _vk->show(); diff --git a/backends/events/default/default-events.h b/backends/events/default/default-events.h index db054b4d26..c52535adfc 100644 --- a/backends/events/default/default-events.h +++ b/backends/events/default/default-events.h @@ -28,7 +28,7 @@ #include "common/events.h" #include "common/savefile.h" -#include "gui/virtualKeyboard.h" +#include "backends/common/virtualKeyboard.h" /* At some point we will remove pollEvent from OSystem and change |