diff options
| author | Nicolas Bacca | 2002-10-22 22:46:03 +0000 |
|---|---|---|
| committer | Nicolas Bacca | 2002-10-22 22:46:03 +0000 |
| commit | 13cb837814cae6592cd266d4f63cd62ca89916a1 (patch) | |
| tree | 6224a938e21d972deff9a35ebab81dddb5c75736 /scumm | |
| parent | 4aaf459df3a62e5c3c3c3554f5833f3a27acca69 (diff) | |
| download | scummvm-rg350-13cb837814cae6592cd266d4f63cd62ca89916a1.tar.gz scummvm-rg350-13cb837814cae6592cd266d4f63cd62ca89916a1.tar.bz2 scummvm-rg350-13cb837814cae6592cd266d4f63cd62ca89916a1.zip | |
Always check your merges :)
svn-id: r5254
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/dialogs.cpp | 13 | ||||
| -rw-r--r-- | scumm/dialogs.h | 3 |
2 files changed, 4 insertions, 12 deletions
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp index c8bc1d3b93..51629a7bdf 100644 --- a/scumm/dialogs.cpp +++ b/scumm/dialogs.cpp @@ -333,6 +333,10 @@ void SaveLoadDialog::open() { switchToLoadMode(); +#ifdef _WIN32_WCE + force_keyboard(true); +#endif + ScummDialog::open(); } @@ -391,15 +395,6 @@ void SaveLoadDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat } } -void SaveLoadDialog::open() { - - ScummDialog::open(); - -#ifdef _WIN32_WCE - force_keyboard(true); -#endif -} - void SaveLoadDialog::close() { ScummDialog::close(); diff --git a/scumm/dialogs.h b/scumm/dialogs.h index a0a0164ade..73a9678a1e 100644 --- a/scumm/dialogs.h +++ b/scumm/dialogs.h @@ -50,9 +50,6 @@ protected: class SaveLoadDialog : public ScummDialog { public: SaveLoadDialog(NewGui *gui, Scumm *scumm); - - virtual void open(); - virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data); virtual void open(); virtual void close(); |