[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.14,1.15 dialogs.h,1.7,1.8

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv4372

Modified Files:
	dialogs.cpp dialogs.h 
Log Message:
Always check your merges :)

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dialogs.cpp	22 Oct 2002 22:41:12 -0000	1.14
+++ dialogs.cpp	22 Oct 2002 22:46:03 -0000	1.15
@@ -333,6 +333,10 @@
 {
 	switchToLoadMode();
 
+#ifdef _WIN32_WCE
+	force_keyboard(true);
+#endif
+
 	ScummDialog::open();
 }
 
@@ -389,15 +393,6 @@
 	default:
 		ScummDialog::handleCommand(sender, cmd, data);
 	}
-}
-
-void SaveLoadDialog::open() {
-
-	ScummDialog::open();
-
-#ifdef _WIN32_WCE
-	force_keyboard(true);
-#endif
 }
 
 void SaveLoadDialog::close() {

Index: dialogs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dialogs.h	22 Oct 2002 22:41:12 -0000	1.7
+++ dialogs.h	22 Oct 2002 22:46:03 -0000	1.8
@@ -50,9 +50,6 @@
 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();