From a5af0165ba7fb93da647622336e7c8c7b429ce00 Mon Sep 17 00:00:00 2001
From: Lars Persson
Date: Tue, 5 Jul 2005 20:27:14 +0000
Subject: * Updated WINCE files to compile with new code sharing with other
 small screen devices (such as Symbian)

svn-id: r18499
---
 backends/wince/CEgui/ItemAction.cpp  | 6 +++---
 backends/wince/CEgui/ItemAction.h    | 8 ++++----
 backends/wince/CEgui/ItemSwitch.h    | 2 +-
 backends/wince/CEgui/PanelKeyboard.h | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'backends/wince/CEgui')

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 {
-- 
cgit v1.2.3