控件名称忽略大小写

tipsyeyes · Feb 22, 2017 · 62d5879 · 62d5879
1 parent 2c61c90
commit 62d5879
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 20 deletions.
diff --git a/Demos/gamebox/ControlEx.h b/Demos/gamebox/ControlEx.h
@@ -329,10 +329,10 @@ class CDialogBuilderCallbackEx : public IDialogBuilderCallback
 public:
 	CControlUI* CreateControl(LPCTSTR pstrClass) 
 	{
-		//if( _tcsicmp(pstrClass, _T("GameList")) == 0 ) return new CGameListUI;
-		//else if( _tcsicmp(pstrClass, _T("GameItem")) == 0 ) return new CGameItemUI;
-		//else if( _tcsicmp(pstrClass, _T("ShortCut")) == 0 ) return new CShortCutUI;
-		//else if( _tcsicmp(pstrClass, _T("LabelMutiline")) == 0 ) return new CLabelMutilineUI;
+		if( _tcsicmp(pstrClass, _T("GameList")) == 0 ) return new CGameListUI;
+		else if( _tcsicmp(pstrClass, _T("GameItem")) == 0 ) return new CGameItemUI;
+		else if( _tcsicmp(pstrClass, _T("ShortCut")) == 0 ) return new CShortCutUI;
+		else if( _tcsicmp(pstrClass, _T("LabelMutiline")) == 0 ) return new CLabelMutilineUI;
 		return NULL;
 	}
 };

diff --git a/Demos/gamebox/GameBox.cpp b/Demos/gamebox/GameBox.cpp
@@ -12,18 +12,17 @@ class CGameBoxFrame : public WindowImplBase, public CWebBrowserEventHandler
 
 	}
 
-
 	CDuiString GetSkinFile()
 	{
 		return _T("skin.xml");
 	}
 
 	CControlUI* CreateControl(LPCTSTR pstrClass)
 	{
-		//if( _tcsicmp(pstrClass, _T("GameList")) == 0 ) return new CGameListUI;
-		//else if( _tcsicmp(pstrClass, _T("GameItem")) == 0 ) return new CGameItemUI;
-		//else if( _tcsicmp(pstrClass, _T("ShortCut")) == 0 ) return new CShortCutUI;
-		//else if( _tcsicmp(pstrClass, _T("LabelMutiline")) == 0 ) return new CLabelMutilineUI;
+		if( _tcsicmp(pstrClass, _T("GameList")) == 0 ) return new CGameListUI;
+		else if( _tcsicmp(pstrClass, _T("GameItem")) == 0 ) return new CGameItemUI;
+		else if( _tcsicmp(pstrClass, _T("ShortCut")) == 0 ) return new CShortCutUI;
+		else if( _tcsicmp(pstrClass, _T("LabelMutiline")) == 0 ) return new CLabelMutilineUI;
 		return NULL;
 	}
 
@@ -41,10 +40,11 @@ class CGameBoxFrame : public WindowImplBase, public CWebBrowserEventHandler
 		m_pFindList = (CHorizontalLayoutUI*)(m_pm.FindControl(_T("findlist")));
 
 
+		CDialogBuilderCallbackEx callback;
 		for (int i = 0; i < 60; i++)
 		{
 			CDialogBuilder builder;
-			CControlUI* pGameItem = static_cast<CControlUI*>(builder.Create(_T("gameitem.xml"), (UINT)0, NULL, &m_pm));
+			CControlUI* pGameItem = static_cast<CControlUI*>(builder.Create(_T("gameitem.xml"), (UINT)0, &callback, &m_pm));
 			m_pGameList->Add(pGameItem);
 			CDuiString sText;
 			sText.Format(_T("游戏%d"), i);
@@ -55,7 +55,7 @@ class CGameBoxFrame : public WindowImplBase, public CWebBrowserEventHandler
 			for (int i = 0; i < 6; i++)
 			{
 				CDialogBuilder builder;
-				CControlUI* pGameItem = static_cast<CControlUI*>(builder.Create(_T("gameitem.xml"), (UINT)0, NULL, &m_pm));
+				CControlUI* pGameItem = static_cast<CControlUI*>(builder.Create(_T("gameitem.xml"), (UINT)0, &callback, &m_pm));
 				m_pFindList->Add(pGameItem);
 
 				CDuiString sText;
@@ -450,10 +450,10 @@ void InitResource()
 
 
 	// 注册控件
-	REGIST_DUICONTROL(CLabelIconUI);
-	REGIST_DUICONTROL(CGameItemUI);
-	REGIST_DUICONTROL(CGameListUI);
-	REGIST_DUICONTROL(CLabelMutilineUI);
+	//REGIST_DUICONTROL(CLabelIconUI);
+	//REGIST_DUICONTROL(CGameItemUI);
+	//REGIST_DUICONTROL(CGameListUI);
+	//REGIST_DUICONTROL(CLabelMutilineUI);
 }
 
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPSTR /*lpCmdLine*/, int nCmdShow)

diff --git a/Demos/gamebox/SearchWnd.h b/Demos/gamebox/SearchWnd.h
@@ -13,10 +13,10 @@ class CSearchWnd : public WindowImplBase
 
 	CControlUI* CreateControl(LPCTSTR pstrClass)
 	{
-		//if( _tcsicmp(pstrClass, _T("GameList")) == 0 ) return new CGameListUI;
-		//else if( _tcsicmp(pstrClass, _T("GameItem")) == 0 ) return new CGameItemUI;
-		//else if( _tcsicmp(pstrClass, _T("ShortCut")) == 0 ) return new CShortCutUI;
-		//else if( _tcsicmp(pstrClass, _T("LabelMutiline")) == 0 ) return new CLabelMutilineUI;
+		if( _tcsicmp(pstrClass, _T("GameList")) == 0 ) return new CGameListUI;
+		else if( _tcsicmp(pstrClass, _T("GameItem")) == 0 ) return new CGameItemUI;
+		else if( _tcsicmp(pstrClass, _T("ShortCut")) == 0 ) return new CShortCutUI;
+		else if( _tcsicmp(pstrClass, _T("LabelMutiline")) == 0 ) return new CLabelMutilineUI;
 		return NULL;
 	}
 
@@ -32,8 +32,9 @@ class CSearchWnd : public WindowImplBase
 		CListUI* pGameList = static_cast<CListUI*>(m_pm.FindControl(_T("searchlist")));
 		if(pGameList != NULL)
 		{
+			CDialogBuilderCallbackEx callback;
 			CDialogBuilder builder;
-			CListContainerElementUI* pGameItem = static_cast<CListContainerElementUI*>(builder.Create(_T("searchitem.xml"), (UINT)0));
+			CListContainerElementUI* pGameItem = static_cast<CListContainerElementUI*>(builder.Create(_T("searchitem.xml"), (UINT)0, &callback));
 			pGameList->Add(pGameItem);
 			CControlUI *pText = pGameItem->FindSubControl(_T("searchitem_text"));
 			pText->SetText(sItem);

diff --git a/DuiLib/Core/ControlFactory.cpp b/DuiLib/Core/ControlFactory.cpp
@@ -62,6 +62,7 @@ namespace DuiLib
 
 	CControlUI* CControlFactory::CreateControl(CDuiString strClassName)
 	{
+		strClassName.MakeLower();
 		MAP_DUI_CTRATECLASS::iterator iter = m_mapControl.find(strClassName);
 		if ( iter == m_mapControl.end()) {
 			return NULL;
@@ -73,6 +74,7 @@ namespace DuiLib
 
 	void CControlFactory::RegistControl(CDuiString strClassName, CreateClass pFunc)
 	{
+		strClassName.MakeLower();
 		m_mapControl.insert(MAP_DUI_CTRATECLASS::value_type(strClassName, pFunc));
 	}