fixed hashmap use

svn-id: r23007

3 files changed, 5 insertions, 15 deletions

diff --git a/backends/wince/CEgui/Panel.cpp b/backends/wince/CEgui/Panel.cpp
index 73df0b394c..8b49b5d3a7 100644
--- a/backends/wince/CEgui/Panel.cpp
+++ b/backends/wince/CEgui/Panel.cpp
@@ -33,10 +33,9 @@ namespace CEGUI {
 
 
 	bool Panel::add(const String &name, const PanelItem *item) {
-		PanelItem *ni;
-		ni = _itemsMap[name] = (PanelItem*)item;
-		ni->move(_currentItem, _y + 10);
-		ni->setPanel(this);
+		_itemsMap[name] = (PanelItem*)item;
+		_itemsMap[name]->move(_currentItem, _y + 10);
+		_itemsMap[name]->setPanel(this);
 		_currentItem += _interleave;
 
 		return true;
diff --git a/backends/wince/CEgui/Panel.h b/backends/wince/CEgui/Panel.h
index cae2fa238f..8c4f4b3c7f 100644
--- a/backends/wince/CEgui/Panel.h
+++ b/backends/wince/CEgui/Panel.h
@@ -48,12 +48,8 @@ namespace CEGUI {
 		virtual void forceRedraw();
 		virtual bool action(int x, int y, bool pushed);
 	private:
-		struct IgnoreCaseComparator {
-          int operator()(const String& x, const String& y) const {
-			  return scumm_stricmp(x.c_str(), y.c_str()); }
-        };
 
-		typedef HashMap<String, PanelItem*, Common::IgnoreCase_Hash , IgnoreCaseComparator> ItemMap;
+		typedef HashMap<String, PanelItem*, Common::IgnoreCase_Hash , Common::IgnoreCase_EqualTo> ItemMap;
 
 		ItemMap _itemsMap;
 		int _interleave;
diff --git a/backends/wince/CEgui/ToolbarHandler.h b/backends/wince/CEgui/ToolbarHandler.h
index 55763d77ab..376d536dd4 100644
--- a/backends/wince/CEgui/ToolbarHandler.h
+++ b/backends/wince/CEgui/ToolbarHandler.h
@@ -55,12 +55,7 @@ namespace CEGUI {
 		virtual ~ToolbarHandler();
 	private:
 
-		struct IgnoreCaseComparator {
-          int operator()(const String& x, const String& y) const {
-			  return scumm_stricmp(x.c_str(), y.c_str()); }
-        };
-
-		HashMap<String, Toolbar*, Common::IgnoreCase_Hash, IgnoreCaseComparator> _toolbarMap;
+		HashMap<String, Toolbar*, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _toolbarMap;
 		String _current;
 		Toolbar *_active;
 		int _offset;