[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.108,1.109

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv31105

Modified Files:
	items.cpp 
Log Message:
Implements TOGGLE_VIRTUAL_KEYBOARD

Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- items.cpp	6 Jan 2004 12:45:31 -0000	1.108
+++ items.cpp	17 Jan 2004 23:39:04 -0000	1.109
@@ -26,12 +26,6 @@
 #include "simon/simon.h"
 #include "simon/intern.h"
 
-#ifdef _WIN32_WCE
-
-extern void force_keyboard(bool);
-
-#endif
-
 namespace Simon {
 
 int SimonEngine::runScript() {
@@ -737,28 +731,22 @@
 			break;
 
 		case 132:{									/* save game */
-#ifdef _WIN32_WCE
-				force_keyboard(true);
-#endif
-
+				OSystem::Property prop;
+				prop.show_keyboard = true;
+				_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
 				o_save_game();
-
-#ifdef _WIN32_WCE
-				force_keyboard(false);
-#endif
+				prop.show_keyboard = false;
+				_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
 			}
 			break;
 
 		case 133:{									/* load game */
-#ifdef _WIN32_WCE
-				force_keyboard(true);
-#endif
-
+				OSystem::Property prop;
+				prop.show_keyboard = true;
+				_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
 				o_load_game();
-
-#ifdef _WIN32_WCE
-				force_keyboard(false);
-#endif
+				prop.show_keyboard = false;
+				_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
 			}
 			break;
 
@@ -769,15 +757,12 @@
 			break;
 
 		case 135:{									/* quit if user presses y */
-#ifdef _WIN32_WCE
-				force_keyboard(true);
-#endif
-
+				OSystem::Property prop;
+				prop.show_keyboard = true;
+				_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
 				o_quit_if_user_presses_y();
-
-#ifdef _WIN32_WCE
-				force_keyboard(false);
-#endif
+				prop.show_keyboard = false;
+				_system->property(OSystem::PROP_TOGGLE_VIRTUAL_KEYBOARD, &prop);
 			}
 			break;