Always check your merges :)

svn-id: r5254
This commit is contained in:
Nicolas Bacca 2002-10-22 22:46:03 +00:00
parent 4aaf459df3
commit 13cb837814
2 changed files with 4 additions and 12 deletions

View File

@ -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();

View File

@ -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();