* Updated WINCE files to compile with new code sharing with other small screen devices (such as Symbian)

svn-id: r18499

6 files changed, 12 insertions, 12 deletions

diff --git a/backends/wince/CEgui/ItemAction.cpp b/backends/wince/CEgui/ItemAction.cpp
index d70da846bd..bc9dfeaec0 100644
--- a/backends/wince/CEgui/ItemAction.cpp
+++ b/backends/wince/CEgui/ItemAction.cpp
@@ -24,10 +24,10 @@
 
 namespace CEGUI {
 
-	ItemAction::ItemAction(WORD reference, ActionType action) :
+	ItemAction::ItemAction(WORD reference, GUI::ActionType action) :
 	PanelItem(reference) {
 		_action = action;
-		if (!CEActions::Instance()->isEnabled(_action))
+		if (!GUI::Actions::Instance()->isEnabled(_action))
 			_visible = false;
 	}
  
@@ -38,7 +38,7 @@ namespace CEGUI {
 	bool ItemAction::action(int x, int y, bool pushed) {
 
 		if (checkInside(x, y) && _visible && pushed) {
-			CEActions::Instance()->perform(_action);
+			GUI::Actions::Instance()->perform(_action);
 			return true;
 		}
 		else
diff --git a/backends/wince/CEgui/ItemAction.h b/backends/wince/CEgui/ItemAction.h
index 00a1ebf0f1..df38842bcb 100644
--- a/backends/wince/CEgui/ItemAction.h
+++ b/backends/wince/CEgui/ItemAction.h
@@ -26,17 +26,17 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 
-#include "CEActions.h"
-
+#include "gui/Actions.h"
+#include "CEgui/PanelItem.h"
 namespace CEGUI {
 
 	class ItemAction : public PanelItem {
 	public:
-		ItemAction(WORD reference, ActionType action);
+		ItemAction(WORD reference, GUI::ActionType action);
 		virtual ~ItemAction();
 		virtual bool action(int x, int y, bool pushed); 
 	private:
-		ActionType _action;
+		GUI::ActionType _action;
 	};
 }
 
diff --git a/backends/wince/CEgui/ItemSwitch.h b/backends/wince/CEgui/ItemSwitch.h
index 72b37f1b9f..e8377031d9 100644
--- a/backends/wince/CEgui/ItemSwitch.h
+++ b/backends/wince/CEgui/ItemSwitch.h
@@ -29,7 +29,7 @@
 #include "Panel.h"
 #include "EventsBuffer.h"
 
-using CEKEYS::Key;
+using GUI::Key;
 
 namespace CEGUI {
 
diff --git a/backends/wince/CEgui/PanelKeyboard.h b/backends/wince/CEgui/PanelKeyboard.h
index 33394dcf57..f4c48bf659 100644
--- a/backends/wince/CEgui/PanelKeyboard.h
+++ b/backends/wince/CEgui/PanelKeyboard.h
@@ -29,7 +29,7 @@
 #include "Toolbar.h"
 #include "EventsBuffer.h"
 
-using CEKEYS::Key;
+using GUI::Key;
 using CEKEYS::EventsBuffer;
 
 namespace CEGUI {
diff --git a/backends/wince/CEkeys/EventsBuffer.cpp b/backends/wince/CEkeys/EventsBuffer.cpp
index cad8e29f29..c427b02d38 100644
--- a/backends/wince/CEkeys/EventsBuffer.cpp
+++ b/backends/wince/CEkeys/EventsBuffer.cpp
@@ -24,7 +24,7 @@
 
 namespace CEKEYS {	
 
-	bool EventsBuffer::simulateKey(Key *key, bool pushed) {
+	bool EventsBuffer::simulateKey(GUI::Key *key, bool pushed) {
 		SDL_Event ev = {0};
 
 		if (!key->keycode())
diff --git a/backends/wince/CEkeys/EventsBuffer.h b/backends/wince/CEkeys/EventsBuffer.h
index 938e8cc886..f676084152 100644
--- a/backends/wince/CEkeys/EventsBuffer.h
+++ b/backends/wince/CEkeys/EventsBuffer.h
@@ -29,13 +29,13 @@
 
 #include <SDL.h>
 
-#include "Key.h"
+#include "gui/Key.h"
 
 namespace CEKEYS {
 
 	class EventsBuffer {
 	public:
-		static bool simulateKey(Key *key, bool pushed);
+		static bool simulateKey(GUI::Key *key, bool pushed);
 		static bool simulateMouseMove(int x, int y);
 		static bool simulateMouseLeftClick(int x, int y, bool pushed);
 		static bool simulateMouseRightClick(int x, int y, bool pushed);