aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2004-12-06 22:05:04 +0000
committerMax Horn2004-12-06 22:05:04 +0000
commit6dbe271a5eeec5c3474eabac5971ecede92130ce (patch)
treed01e0251209308d3713444ba490ff404b9d25f9c /scumm
parent954e16abbf8de9b37d124f0725f943c662994f95 (diff)
downloadscummvm-rg350-6dbe271a5eeec5c3474eabac5971ecede92130ce.tar.gz
scummvm-rg350-6dbe271a5eeec5c3474eabac5971ecede92130ce.tar.bz2
scummvm-rg350-6dbe271a5eeec5c3474eabac5971ecede92130ce.zip
Only activate virtual keyboard when needed
svn-id: r15998
Diffstat (limited to 'scumm')
-rw-r--r--scumm/dialogs.cpp14
-rw-r--r--scumm/dialogs.h2
2 files changed, 2 insertions, 14 deletions
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp
index 292301a615..5a003c8955 100644
--- a/scumm/dialogs.cpp
+++ b/scumm/dialogs.cpp
@@ -318,12 +318,6 @@ MainMenuDialog::~MainMenuDialog() {
delete _loadDialog;
}
-void MainMenuDialog::open() {
- g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
-
- ScummDialog::open();
-}
-
void MainMenuDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
switch (cmd) {
case kSaveCmd:
@@ -355,15 +349,11 @@ void MainMenuDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
}
}
-void MainMenuDialog::close() {
- ScummDialog::close();
-
- g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
-}
-
void MainMenuDialog::save() {
int idx;
+ g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
_saveDialog->setList(generateSavegameList(_vm, true));
+ g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
idx = _saveDialog->runModal();
if (idx >= 0) {
const String &result = _saveDialog->getResultString();
diff --git a/scumm/dialogs.h b/scumm/dialogs.h
index ad0cdcc541..41e679158d 100644
--- a/scumm/dialogs.h
+++ b/scumm/dialogs.h
@@ -61,8 +61,6 @@ public:
MainMenuDialog(ScummEngine *scumm);
~MainMenuDialog();
virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
- virtual void open();
- virtual void close();
protected:
GUI::Dialog *_aboutDialog;