[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.117,1.118 dialogs.h,1.41,1.42

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4647

Modified Files:
	dialogs.cpp dialogs.h 
Log Message:
Only activate virtual keyboard when needed

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- dialogs.cpp	28 Nov 2004 21:23:51 -0000	1.117
+++ dialogs.cpp	6 Dec 2004 22:05:04 -0000	1.118
@@ -318,12 +318,6 @@
 	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::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();

Index: dialogs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- dialogs.h	20 Jul 2004 11:30:15 -0000	1.41
+++ dialogs.h	6 Dec 2004 22:05:04 -0000	1.42
@@ -61,8 +61,6 @@
 	MainMenuDialog(ScummEngine *scumm);
 	~MainMenuDialog();
 	virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
-	virtual void open();	
-	virtual void close();
 
 protected:
 	GUI::Dialog		*_aboutDialog;