update the CE port to work under 0.9.0 codebase

svn-id: r22956

5 files changed, 13 insertions, 12 deletions

diff --git a/backends/wince/CEgui/Panel.cpp b/backends/wince/CEgui/Panel.cpp
index 4517c19593..73df0b394c 100644
--- a/backends/wince/CEgui/Panel.cpp
+++ b/backends/wince/CEgui/Panel.cpp
@@ -33,10 +33,10 @@ namespace CEGUI {
 
 
 	bool Panel::add(const String &name, const PanelItem *item) {
-		_itemsMap.addKey(name);
-		_itemsMap[name] = (PanelItem*)item;
-		_itemsMap[name]->move(_currentItem, _y + 10);
-		_itemsMap[name]->setPanel(this);
+		PanelItem *ni;
+		ni = _itemsMap[name] = (PanelItem*)item;
+		ni->move(_currentItem, _y + 10);
+		ni->setPanel(this);
 		_currentItem += _interleave;
 
 		return true;
diff --git a/backends/wince/CEgui/Panel.h b/backends/wince/CEgui/Panel.h
index fa1595ae42..cae2fa238f 100644
--- a/backends/wince/CEgui/Panel.h
+++ b/backends/wince/CEgui/Panel.h
@@ -26,14 +26,15 @@
 #include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
-#include "common/map.h"
+#include "common/hashmap.h"
 #include "common/str.h"
+#include "common/config-manager.h"
 
 #include "PanelItem.h"
 #include "Toolbar.h"
 
 using Common::String;
-using Common::Map;
+using Common::HashMap;
 
 namespace CEGUI {
 
@@ -52,7 +53,7 @@ namespace CEGUI {
 			  return scumm_stricmp(x.c_str(), y.c_str()); }
         };
 
-		typedef Map<String, PanelItem*, IgnoreCaseComparator> ItemMap;
+		typedef HashMap<String, PanelItem*, Common::IgnoreCase_Hash , IgnoreCaseComparator> ItemMap;
 
 		ItemMap _itemsMap;
 		int _interleave;
diff --git a/backends/wince/CEgui/Toolbar.h b/backends/wince/CEgui/Toolbar.h
index 2e7d098a7f..ae97c1c8d5 100644
--- a/backends/wince/CEgui/Toolbar.h
+++ b/backends/wince/CEgui/Toolbar.h
@@ -27,7 +27,7 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 
-#include "common/map.h"
+//#include "common/map.h"
 #include "common/str.h"
 
 #include "GUIElement.h"
diff --git a/backends/wince/CEgui/ToolbarHandler.cpp b/backends/wince/CEgui/ToolbarHandler.cpp
index 5893c6036d..1470479478 100644
--- a/backends/wince/CEgui/ToolbarHandler.cpp
+++ b/backends/wince/CEgui/ToolbarHandler.cpp
@@ -31,7 +31,6 @@ namespace CEGUI {
 
 
 	bool ToolbarHandler::add(const String &name, const Toolbar &toolbar) {
-		_toolbarMap.addKey(name);
 		_toolbarMap[name] = (Toolbar*)&toolbar;
 
 		if (!_active) {
diff --git a/backends/wince/CEgui/ToolbarHandler.h b/backends/wince/CEgui/ToolbarHandler.h
index bfd81269a5..55763d77ab 100644
--- a/backends/wince/CEgui/ToolbarHandler.h
+++ b/backends/wince/CEgui/ToolbarHandler.h
@@ -27,12 +27,13 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "common/str.h"
-#include "common/map.h"
+#include "common/hashmap.h"
+#include "common/config-manager.h"
 
 #include "Toolbar.h"
 
 using Common::String;
-using Common::Map;
+using Common::HashMap;
 
 namespace CEGUI {
 
@@ -59,7 +60,7 @@ namespace CEGUI {
 			  return scumm_stricmp(x.c_str(), y.c_str()); }
         };
 
-		Map<String, Toolbar*, IgnoreCaseComparator> _toolbarMap;
+		HashMap<String, Toolbar*, Common::IgnoreCase_Hash, IgnoreCaseComparator> _toolbarMap;
 		String _current;
 		Toolbar *_active;
 		int _offset;