* Start of generic key configuration support for ScummVM

* Moved KeyConfigDialog, key from WinCE to gui
* Updated wince code to inherit and use new GUI::Keys and launch new dialog
* New definition SMALL_SCREEN_DEVICE when keysdialog should be inittialized from options.cpp
* Added new function to SDL\Events that handles key remapping.  LINUPY & QTOPIA remapping moved to that function. SymbianOs.cpp overrides this function to enable key remapping to events
* Compiled VC6++ project. This with warnings and errors, but NOT in the changed code. (SAGA,KYRA)
* Compiled using WCE tools 3 for X86 target and running Scummvm in emulator to test
* Compiled with UIQ target. The rest Symbian platforms might require further configuration to operate properly
* Actor.h in Saga now compiles for default VC6 setting.
* Aspect.cpp does not compile in VC6/WCE due to template problems with the kFastAndNiceAspectMode setting.
* Changed order of creation of gamedetector and mainsystem in Main.cpp
* If anything does not compile, or is totally out of order, please revert changes.

svn-id: r18498

1 files changed, 7 insertions, 6 deletions

diff --git a/backends/wince/CEActionsPocket.h b/backends/wince/CEActionsPocket.h
index a473371a60..ce5ac1499a 100644
--- a/backends/wince/CEActionsPocket.h
+++ b/backends/wince/CEActionsPocket.h
@@ -29,9 +29,9 @@
 
 #include "base/gameDetector.h"
 #include "wince-sdl.h"
-#include "Key.h"
+#include "gui/Key.h"
 
-#include "CEActions.h"
+#include "gui/Actions.h"
 
 #define POCKET_ACTION_VERSION 4 
 
@@ -53,15 +53,15 @@ enum pocketActionType {
 	POCKET_ACTION_LAST
 };
 
-class CEActionsPocket : public CEActions {
+class CEActionsPocket : public GUI::Actions {
 	public:
 		// Actions
-		bool perform(ActionType action, bool pushed = true);
-		String actionName(ActionType action);
+		bool perform(GUI::ActionType action, bool pushed = true);
+		String actionName(GUI::ActionType action);
 		int size();
 
 		static void init(GameDetector &detector);
-		void initInstanceMain(OSystem_WINCE3 *mainSystem);
+		void initInstanceMain(OSystem *mainSystem);
 		void initInstanceGame();
 
 		// Action domain
@@ -79,6 +79,7 @@ class CEActionsPocket : public CEActions {
 		bool _right_click_needed;
 		bool _hide_toolbar_needed;
 		bool _zoom_needed;
+		OSystem_WINCE3 *_CESystem;
 	};	
 
 #endif