1

DuiLib/Layout/UITileLayout.cpp

@@ -64,131 +64,116 @@ namespace DuiLib
 		CControlUI::SetPos(rc, bNeedInvalidate);
 		rc = m_rcItem;
 
+		// 内边距调整
 		RECT rcInset = GetInset();
-		// Adjust for inset
 		rc.left += rcInset.left;
 		rc.top += rcInset.top;
 		rc.right -= rcInset.right;
 		rc.bottom -= rcInset.bottom;
 
-		if( m_items.GetSize() == 0) {
+		if (m_items.GetSize() == 0)
+		{
 			ProcessScrollBar(rc, 0, 0);
 			return;
 		}
 
-		if( m_pVerticalScrollBar && m_pVerticalScrollBar->IsVisible() ) rc.right -= m_pVerticalScrollBar->GetFixedWidth();
-		if( m_pHorizontalScrollBar && m_pHorizontalScrollBar->IsVisible() ) rc.bottom -= m_pHorizontalScrollBar->GetFixedHeight();
+		// 预留滚动条空间
+		if (m_pVerticalScrollBar && m_pVerticalScrollBar->IsVisible())
+			rc.right -= m_pVerticalScrollBar->GetFixedWidth();
+		if (m_pHorizontalScrollBar && m_pHorizontalScrollBar->IsVisible())
+			rc.bottom -= m_pHorizontalScrollBar->GetFixedHeight();
 
+		// ========== 核心：固定子控件尺寸（不再动态计算） ==========
 		SIZE szItem = GetItemSize();
-		// Position the elements
-		if( szItem.cx > 0 ) m_nColumns = (rc.right - rc.left) / szItem.cx;
-		if( m_nColumns == 0 ) m_nColumns = 1;
+		// 确保ItemSize有效，避免除0
+		if (szItem.cx <= 0) szItem.cx = 100; // 兜底默认宽度
+		if (szItem.cy <= 0) szItem.cy = 100; // 兜底默认高度
 
-		int cyNeeded = 0;
-		int cxWidth = szItem.cx + m_iChildPadding;  // 固定列宽
+		// ========== 核心：固定列数计算（基于固定宽度+水平间距） ==========
+		int cxItemWithPadding = szItem.cx + m_iChildPadding; // 单个子控件占宽（含水平间距）
+		m_nColumns = (rc.right - rc.left) / cxItemWithPadding;
+		if (m_nColumns <= 0) m_nColumns = 1;
 
+		// 滚动条兼容处理
 		if (m_pHorizontalScrollBar && m_pHorizontalScrollBar->IsVisible())
 		{
-			// 考虑滚动条的情况
 			int nTotalWidth = rc.right - rc.left + m_pHorizontalScrollBar->GetScrollRange();
-			m_nColumns = nTotalWidth / cxWidth;
-			if (m_nColumns == 0) m_nColumns = 1;
+			m_nColumns = nTotalWidth / cxItemWithPadding;
+			if (m_nColumns <= 0) m_nColumns = 1;
 		}
 
-
-		int cyHeight = 0;
+		// 布局初始化
+		int cyNeeded = 0;
 		int iCount = 0;
 		POINT ptTile = { rc.left, rc.top };
-		if( m_pVerticalScrollBar && m_pVerticalScrollBar->IsVisible() ) {
+
+		// 垂直滚动条偏移
+		if (m_pVerticalScrollBar && m_pVerticalScrollBar->IsVisible())
 			ptTile.y -= m_pVerticalScrollBar->GetScrollPos();
-		}
+		// 水平滚动条偏移
 		int iPosX = rc.left;
-		if( m_pHorizontalScrollBar && m_pHorizontalScrollBar->IsVisible() ) {
+		if (m_pHorizontalScrollBar && m_pHorizontalScrollBar->IsVisible())
+		{
 			iPosX -= m_pHorizontalScrollBar->GetScrollPos();
 			ptTile.x = iPosX;
 		}
-		for( int it1 = 0; it1 < m_items.GetSize(); it1++ ) {
+
+		// ========== 遍历子控件：固定宽高+固定间距布局 ==========
+		for (int it1 = 0; it1 < m_items.GetSize(); it1++)
+		{
 			CControlUI* pControl = static_cast<CControlUI*>(m_items[it1]);
-			if( !pControl->IsVisible() ) continue;
-			if( pControl->IsFloat() ) {
+			if (!pControl->IsVisible()) continue;
+			if (pControl->IsFloat())
+			{
 				SetFloatPos(it1);
 				continue;
 			}
 
-			// Determine size
-			RECT rcTile = { ptTile.x, ptTile.y, ptTile.x + cxWidth, ptTile.y };
-			if( (iCount % m_nColumns) == 0 )
+			// ========== 核心1：固定子控件位置（无动态尺寸计算） ==========
+			RECT rcTile = {
+				ptTile.x,                  // 左
+				ptTile.y,                  // 上
+				ptTile.x + szItem.cx,      // 右（固定宽度）
+				ptTile.y + szItem.cy       // 下（固定高度）
+			};
+
+			// 忽略子控件自身padding，强制使用固定尺寸（如需保留padding可删除此段）
+			// RECT rcPadding = pControl->GetPadding();
+			// rcTile.left += rcPadding.left;
+			// rcTile.right -= rcPadding.right;
+			// rcTile.top += rcPadding.top;
+			// rcTile.bottom -= rcPadding.bottom;
+
+			// ========== 核心2：强制子控件尺寸为ItemSize（覆盖所有动态计算） ==========
+			RECT rcPos = {
+				rcTile.left,
+				rcTile.top,
+				rcTile.left + szItem.cx,
+				rcTile.top + szItem.cy
+			};
+			pControl->SetPos(rcPos, bNeedInvalidate);
+
+			// ========== 核心3：固定间距更新坐标 ==========
+			iCount++;
+			// 换行：重置X坐标，Y坐标 += 固定高度 + 垂直间距
+			if (iCount % m_nColumns == 0)
 			{
-				int iIndex = iCount;
-				for( int it2 = it1; it2 < m_items.GetSize(); it2++ ) {
-					CControlUI* pLineControl = static_cast<CControlUI*>(m_items[it2]);
-					if( !pLineControl->IsVisible() ) continue;
-					if( pLineControl->IsFloat() ) continue;
-
-					RECT rcPadding = pLineControl->GetPadding();
-					SIZE szAvailable = { rcTile.right - rcTile.left - rcPadding.left - rcPadding.right, 9999 };
-					if( iIndex == iCount || (iIndex + 1) % m_nColumns == 0 ) {
-						szAvailable.cx -= m_iChildPadding / 2;
-					}
-					else {
-						szAvailable.cx -= m_iChildPadding;
-					}
-
-					if( szAvailable.cx < pControl->GetMinWidth() ) szAvailable.cx = pControl->GetMinWidth();
-					if( szAvailable.cx > pControl->GetMaxWidth() ) szAvailable.cx = pControl->GetMaxWidth();
-
-					SIZE szTile = pLineControl->EstimateSize(szAvailable);
-					if( szTile.cx < pControl->GetMinWidth() ) szTile.cx = pControl->GetMinWidth();
-					if( szTile.cx > pControl->GetMaxWidth() ) szTile.cx = pControl->GetMaxWidth();
-					if( szTile.cy < pControl->GetMinHeight() ) szTile.cy = pControl->GetMinHeight();
-					if( szTile.cy > pControl->GetMaxHeight() ) szTile.cy = pControl->GetMaxHeight();
-
-					cyHeight = MAX(cyHeight, szTile.cy + rcPadding.top + rcPadding.bottom);
-					if( (++iIndex % m_nColumns) == 0) break;
-				}
-			}
-
-			RECT rcPadding = pControl->GetPadding();
-
-			rcTile.left += rcPadding.left + m_iChildPadding / 2;
-			rcTile.right -= rcPadding.right + m_iChildPadding / 2;
-			if( (iCount % m_nColumns) == 0 ) {
-				rcTile.left -= m_iChildPadding / 2;
-			}
-
-			if( ( (iCount + 1) % m_nColumns) == 0 ) {
-				rcTile.right += m_iChildPadding / 2;
-			}
-
-			// Set position
-			rcTile.top = ptTile.y + rcPadding.top;
-			rcTile.bottom = ptTile.y + cyHeight;
-
-			SIZE szAvailable = { rcTile.right - rcTile.left, rcTile.bottom - rcTile.top };
-			SIZE szTile = pControl->EstimateSize(szAvailable);
-			if( szTile.cx == 0 ) szTile.cx = szAvailable.cx;
-			if( szTile.cy == 0 ) szTile.cy = szAvailable.cy;
-			if( szTile.cx < pControl->GetMinWidth() ) szTile.cx = pControl->GetMinWidth();
-			if( szTile.cx > pControl->GetMaxWidth() ) szTile.cx = pControl->GetMaxWidth();
-			if( szTile.cy < pControl->GetMinHeight() ) szTile.cy = pControl->GetMinHeight();
-			if( szTile.cy > pControl->GetMaxHeight() ) szTile.cy = pControl->GetMaxHeight();
-			RECT rcPos = {(rcTile.left + rcTile.right - szTile.cx) / 2, (rcTile.top + rcTile.bottom - szTile.cy) / 2,
-				(rcTile.left + rcTile.right - szTile.cx) / 2 + szTile.cx, (rcTile.top + rcTile.bottom - szTile.cy) / 2 + szTile.cy};
-			pControl->SetPos(rcPos);
-
-			if( (++iCount % m_nColumns) == 0 ) {
 				ptTile.x = iPosX;
-				ptTile.y += cyHeight + m_iChildPadding;
-				cyHeight = 0;
+				ptTile.y += szItem.cy + m_iChildPadding; // 垂直间距 = m_iChildPadding
 			}
-			else {
-				ptTile.x += cxWidth;
+			// 不换行：X坐标 += 固定宽度 + 水平间距
+			else
+			{
+				ptTile.x += szItem.cx + m_iChildPadding; // 水平间距 = m_iChildPadding
 			}
-			cyNeeded = rcTile.bottom - rc.top;
-			if( m_pVerticalScrollBar && m_pVerticalScrollBar->IsVisible() ) cyNeeded += m_pVerticalScrollBar->GetScrollPos();
+
+			// 更新总高度（用于滚动条）
+			cyNeeded = ptTile.y - rc.top + szItem.cy;
+			if (m_pVerticalScrollBar && m_pVerticalScrollBar->IsVisible())
+				cyNeeded += m_pVerticalScrollBar->GetScrollPos();
 		}
 
-		// Process the scrollbar
+		// 处理滚动条
 		ProcessScrollBar(rc, 0, cyNeeded);
 	}
 }

bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem.xml

@@ -4,7 +4,7 @@
 	<Font id="1" name="微软雅黑" size="14" />
 	
 	<!-- 宽度130，高度90，图片高度也是130-->
-	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="130" height="230">
+	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="130" height="220">
 		<Control name="image" height="130" bkimage="file='food_image_default.png'" padding="0,0,0,0"></Control>
 		<Label name="foodname" width="130" height="64" multiline="true" endellipsis="true"></Label>
 		<Label name="price" height="26" font="daindan_price" textcolor="#FFFF7F50" align="left"></Label>

bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem_wutu.xml

@@ -4,7 +4,7 @@
 	<Font id="1" name="微软雅黑" size="14" />
 	
 	<!-- 宽度130，高度90-->
-	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,5,5">
+	<DiandanFoodItem name="diandan_fooditem" bkcolor="#FFFFFFFF" padding="0,0,0,0" width="130" height="90">
 		<Label name="foodname" width="130" height="64" multiline="true" endellipsis="true"></Label>
 		<Label name="price" height="26" font="daindan_price" textcolor="#FFFF7F50" align="left"></Label>
 		

bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml

@@ -101,12 +101,12 @@
 			
 			<VerticalLayout name="diandan_food_layout">
 				<VerticalLayout name="diandan_fenlei_layout_scrolllayout" vscrollbar="true">
-					<Container name="diandan_fenlei_layout" padding="0,0,0,0" bkcolor="#FFFFFFFF" width="fill" height="wrap" autocalcsize="true">
+					<Container name="diandan_fenlei_layout" padding="0,0,0,0" bkcolor="#FFFFFFFF">
 
 					</Container>
 				</VerticalLayout>
 				
-				<TileLayout name="diandan_foodlist" padding="0,0,0,0" inset="10,10,0,10" itemsize="140,230" childpadding="30" vscrollbar="true" hscrollbar="false">
+				<TileLayout name="diandan_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="10" vscrollbar="true" hscrollbar="false">
 				
 				</TileLayout>
 				

bin/Win32/Debug/zhipuzi_pos_windows/skin/foodtype_option.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<FoodtypeOption endellipsis="true" align="center" valign="center" width="120" height="42" float="true" padding="15,19,0,0" bkcolor="#FFECECEC" selectedtextcolor="#FFFFFFFF" selectedbkcolor="#FF3CB371">
+	<FoodtypeOption endellipsis="true" align="center" valign="center" width="130" height="42" float="true" padding="15,19,0,0" bkcolor="#FFECECEC" selectedtextcolor="#FFFFFFFF" selectedbkcolor="#FF3CB371">
 	</FoodtypeOption>
 </Window>

bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_page.xml

@@ -32,7 +32,7 @@
 					</HorizontalLayout>
 				</VerticalLayout>				
 				
-				<TileLayout name="shangpin_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="1" vscrollbar="true" hscrollbar="false">
+				<TileLayout name="shangpin_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="10" vscrollbar="true" hscrollbar="false">
 				
 				</TileLayout>
 				

bin/Win32/Debug/zhipuzi_pos_windows/skin/tabletype_option.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Window>
-	<TabletypeOption endellipsis="true" align="center" valign="center" width="120" height="42" float="true" padding="15,19,0,0" bkcolor="#FFECECEC" selectedtextcolor="#FFFFFFFF">
+	<TabletypeOption endellipsis="true" align="center" valign="center" width="120" height="42" float="true" padding="15,19,0,0" bkcolor="#FFECECEC" selectedtextcolor="#FFFFFFFF" selectedbkcolor="#FF3CB371">
 	</TabletypeOption>
 </Window>

bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_diandan_page.xml

@@ -107,7 +107,7 @@
 						</HorizontalLayout>
 					</VerticalLayout>
 					
-					<TileLayout name="diandan_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="1" vscrollbar="true" hscrollbar="false">
+					<TileLayout name="diandan_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="10" vscrollbar="true" hscrollbar="false">
 					
 					</TileLayout>
 					

zhipuzi_pos_windows/control/CDiandanNatureItemUI.cpp

@@ -88,7 +88,15 @@ void CDiandanNatureItemUI::ShowNatureValue()
 		rect.bottom = rect.top + 44;
 
 		newButton->SetFloat(true);
-		newButton->SetPos(rect);
+
+		// 强制设置固定大小和位置
+		SIZE size;
+		size.cx = rect.left;
+		size.cy = rect.top;
+
+		newButton->SetFixedXY(size);
+		newButton->SetFixedWidth(rect.right - rect.left);
+		newButton->SetFixedHeight(rect.bottom - rect.top);
 
 		value_num++;
 	}

zhipuzi_pos_windows/control/CFoodtypeOptionUI.cpp

@@ -1,7 +1,5 @@
 #include "CFoodtypeOptionUI.h"
 
-
-
 CFoodtypeOptionUI::CFoodtypeOptionUI()
 {
 }

zhipuzi_pos_windows/page/CBaobiaoPageUI.cpp

@@ -363,7 +363,15 @@ void CBaobiaoPageUI::SetPos(RECT rc, bool bNeedInvalidate)
 		rect.bottom = rect.top + 126;
 
 		curItem->SetFloat(true);
-		curItem->SetPos(rect);
+
+		// 强制设置固定大小和位置
+		SIZE size;
+		size.cx = rect.left;
+		size.cy = rect.top;
+
+		curItem->SetFixedXY(size);
+		curItem->SetFixedWidth(rect.right - rect.left);
+		curItem->SetFixedHeight(rect.bottom - rect.top);
 
 		num++;
 	}

zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -231,9 +231,10 @@ void CDiandanPageUI::UpdateFoodtypePos()
 	int num = 0;
 
 	CContainerUI* pFenleiLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("diandan_fenlei_layout")));
+
 	for (int i = 0; i < nFoodtypeNum; i++)
 	{
-		CButtonUI* curItem = static_cast<CButtonUI*>(pFenleiLayout->GetItemAt(i));
+		CFoodtypeOptionUI* curItem = static_cast<CFoodtypeOptionUI*>(pFenleiLayout->GetItemAt(i));
 
 		int curRow = num / nMeihangNum + 1;
 		int curCol = num % nMeihangNum + 1;
@@ -248,8 +249,8 @@ void CDiandanPageUI::UpdateFoodtypePos()
 		SIZE size;
 		size.cx = rect.left;
 		size.cy = rect.top;
-		curItem->SetFixedXY(size);
 
+		curItem->SetFixedXY(size);
 		curItem->SetFixedWidth(rect.right - rect.left);
 		curItem->SetFixedHeight(rect.bottom - rect.top);
 
@@ -290,15 +291,13 @@ void CDiandanPageUI::InitFoodShow()
 	m_foodLayout = static_cast<CTileLayoutUI*>(this->FindSubControl(_T("diandan_foodlist")));
 	m_foodLayout->RemoveAll();
 
-	m_foodLayout->SetChildPadding(0);
-
 	std::wstring xml_name;
 
 	if (is_youtu)
 	{
 		SIZE itemsize;
-		itemsize.cx = 140;
-		itemsize.cy = 230;
+		itemsize.cx = 130;
+		itemsize.cy = 220;
 		m_foodLayout->SetItemSize(itemsize);
 
 		xml_name = _T("diandan_fooditem.xml");
@@ -306,8 +305,8 @@ void CDiandanPageUI::InitFoodShow()
 	else
 	{
 		SIZE itemsize;
-		itemsize.cx = 140;
-		itemsize.cy = 100;
+		itemsize.cx = 130;
+		itemsize.cy = 90;
 		m_foodLayout->SetItemSize(itemsize);
 
 		xml_name = _T("diandan_fooditem_wutu.xml");

zhipuzi_pos_windows/page/CShangpinPageUI.cpp

@@ -176,8 +176,8 @@ void CShangpinPageUI::InitFoodShow()
 	if (is_youtu)
 	{
 		SIZE itemsize;
-		itemsize.cx = 140;
-		itemsize.cy = 230;
+		itemsize.cx = 130;
+		itemsize.cy = 220;
 		m_foodLayout->SetItemSize(itemsize);
 
 		xml_name = _T("shangpin_fooditem.xml");
@@ -185,8 +185,8 @@ void CShangpinPageUI::InitFoodShow()
 	else
 	{
 		SIZE itemsize;
-		itemsize.cx = 140;
-		itemsize.cy = 100;
+		itemsize.cx = 130;
+		itemsize.cy = 90;
 		m_foodLayout->SetItemSize(itemsize);
 
 		xml_name = _T("shangpin_fooditem_wutu.xml");

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.cpp

@@ -387,8 +387,8 @@ void CZhengcanDiandanPageUI::InitFoodShow()
 	if (is_youtu)
 	{
 		SIZE itemsize;
-		itemsize.cx = 140;
-		itemsize.cy = 230;
+		itemsize.cx = 130;
+		itemsize.cy = 220;
 		m_foodLayout->SetItemSize(itemsize);
 
 		xml_name = _T("diandan_fooditem.xml");
@@ -396,8 +396,8 @@ void CZhengcanDiandanPageUI::InitFoodShow()
 	else
 	{
 		SIZE itemsize;
-		itemsize.cx = 140;
-		itemsize.cy = 100;
+		itemsize.cx = 130;
+		itemsize.cy = 90;
 		m_foodLayout->SetItemSize(itemsize);
 
 		xml_name = _T("diandan_fooditem_wutu.xml");

zhipuzi_pos_windows/page/CZhengcanPageUI.cpp

@@ -233,7 +233,15 @@ void CZhengcanPageUI::UpdateTabletypePos()
 		rect.bottom = rect.top + 42;
 
 		curItem->SetFloat(true);
-		curItem->SetPos(rect);
+
+		// 强制设置固定大小和位置
+		SIZE size;
+		size.cx = rect.left;
+		size.cy = rect.top;
+
+		curItem->SetFixedXY(size);
+		curItem->SetFixedWidth(rect.right - rect.left);
+		curItem->SetFixedHeight(rect.bottom - rect.top);
 
 		num++;
 	}
@@ -414,7 +422,15 @@ void CZhengcanPageUI::UpdateTablePos()
 		rect.bottom = rect.top + 140;
 
 		curItem->SetFloat(true);
-		curItem->SetPos(rect);
+
+		// 强制设置固定大小和位置
+		SIZE size;
+		size.cx = rect.left;
+		size.cy = rect.top;
+
+		curItem->SetFixedXY(size);
+		curItem->SetFixedWidth(rect.right - rect.left);
+		curItem->SetFixedHeight(rect.bottom - rect.top);
 
 		num++;
 	}

zhipuzi_pos_windows/wnd/CAttentionWnd.cpp

@@ -16,7 +16,7 @@ LRESULT CAttentionWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CCanpaiWnd.cpp

@@ -16,7 +16,7 @@ LRESULT CCanpaiWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& b
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CChengzhongWnd.cpp

@@ -18,7 +18,7 @@ LRESULT CChengzhongWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOO
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CChufangSettingWnd.cpp

@@ -16,7 +16,7 @@ LRESULT CChufangSettingWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam,
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CDiandanNatureWnd.cpp

@@ -338,7 +338,7 @@ LRESULT CDiandanNatureWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam,
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CFulikaShoukuanWnd.cpp

@@ -476,7 +476,7 @@ LRESULT CFulikaShoukuanWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam,
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CFupingWnd.cpp

@@ -18,7 +18,7 @@ LRESULT CFupingWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& b
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CGuadanWnd.cpp

@@ -18,7 +18,7 @@ LRESULT CGuadanWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& b
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CHuiyuanAddWnd.cpp

@@ -18,7 +18,7 @@ LRESULT CHuiyuanAddWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOO
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CHuiyuanBangkaWnd.cpp

@@ -18,7 +18,7 @@ LRESULT CHuiyuanBangkaWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam,
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CHuiyuanChongzhiWnd.cpp

@@ -506,7 +506,7 @@ LRESULT CHuiyuanChongzhiWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CHuiyuanInfoShowWnd.cpp

@@ -16,7 +16,7 @@ LRESULT CHuiyuanInfoShowWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CHuiyuanShoukuanWnd.cpp

@@ -118,7 +118,7 @@ LRESULT CHuiyuanShoukuanWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CHuiyuanXiugaimimaWnd.cpp

@@ -18,7 +18,7 @@ LRESULT CHuiyuanXiugaimimaWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lPar
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CHuiyuanXiugaiziliaoWnd.cpp

@@ -18,7 +18,7 @@ LRESULT CHuiyuanXiugaiziliaoWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lP
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CImageAttentionWnd.cpp

@@ -16,7 +16,7 @@ LRESULT CImageAttentionWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam,
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CLoginWnd.cpp

@@ -224,7 +224,7 @@ LRESULT CLoginWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
             && pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
     {
         CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-        if(pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+        if(pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
         {
             return HTCAPTION;
         }

zhipuzi_pos_windows/wnd/CMainWnd.cpp

@@ -1233,6 +1233,7 @@ void CMainWnd::UpdateGongnengDaohang()
 	newOption->SetTextPadding(padding);
 
 	newOption->SetSelectedTextColor(0xFFFFFFFF);
+	newOption->SetSelectedBkColor(0xFF3CB371);
 
 	//开始设置个性化属性
 	newOption->SetName(L"main_gengduo");
@@ -1254,7 +1255,6 @@ void CMainWnd::UpdateGongnengDaohang()
 
 		//触发事件切换page
 		newOption->Selected(true, true);
-		newOption->SetBkColor(0xFF3CB371);
 	}
 	else
 	{
@@ -1266,7 +1266,6 @@ void CMainWnd::UpdateGongnengDaohang()
 
 		//已经选中更多，不用触发事件切换page
 		newOption->Selected(true, false);
-		newOption->SetBkColor(0xFF3CB371);
 	}
 }
 
@@ -1369,7 +1368,6 @@ void CMainWnd::SwitchPageByName(std::wstring name)
 	//先取消当前选中的导航
 	if (m_curOption != NULL)
 	{
-		m_curOption->SetBkColor(0x00000000);
 		m_curOption->Selected(false, false);
 	}
 
@@ -1378,7 +1376,6 @@ void CMainWnd::SwitchPageByName(std::wstring name)
 		//新的跳转属于常用操作里面的
 		COptionUI* op = static_cast<COptionUI*>(layout->GetItemAt(index));
 
-		op->SetBkColor(0xFF3CB371);
 		op->Selected(true, false);
 
 		m_curOptionName = name;

zhipuzi_pos_windows/wnd/CMemberLoginWnd.cpp

@@ -525,7 +525,7 @@ LRESULT CMemberLoginWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BO
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CMemoWnd.cpp

@@ -16,7 +16,7 @@ LRESULT CMemoWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CMessageboxWnd.cpp

@@ -16,7 +16,7 @@ LRESULT CMessageboxWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOO
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CNumInputWnd.cpp

@@ -16,7 +16,7 @@ LRESULT CNumInputWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL&
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CSaomaCikaWnd.cpp

@@ -21,7 +21,7 @@ LRESULT CSaomaCikaWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CSaomaQuanyikaWnd.cpp

@@ -21,7 +21,7 @@ LRESULT CSaomaQuanyikaWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam,
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CSaomaShangpinquanWnd.cpp

@@ -21,7 +21,7 @@ LRESULT CSaomaShangpinquanWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lPar
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CSaomaYouhuiquanWnd.cpp

@@ -21,7 +21,7 @@ LRESULT CSaomaYouhuiquanWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CShangpinNewTypeWnd.cpp

@@ -23,7 +23,7 @@ LRESULT CShangpinNewTypeWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CShangpinSaomaluruWnd.cpp

@@ -21,7 +21,7 @@ LRESULT CShangpinSaomaluruWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lPar
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CThirdDeliverySelectWnd.cpp

@@ -16,7 +16,7 @@ LRESULT CThirdDeliverySelectWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lP
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CToastWnd.cpp

@@ -18,7 +18,7 @@ LRESULT CToastWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CUpdateWnd.cpp

@@ -132,7 +132,7 @@ LRESULT CUpdateWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& b
     {
         CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
 
-        if(pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+        if(pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
         {
             return HTCAPTION;
         }

zhipuzi_pos_windows/wnd/CWaimaiOrderFailReasonWnd.cpp

@@ -16,7 +16,7 @@ LRESULT CWaimaiOrderFailReasonWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CWeixinzhifuShoukuanWnd.cpp

@@ -127,7 +127,7 @@ LRESULT CWeixinzhifuShoukuanWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lP
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CXianjinShoukuanWnd.cpp

@@ -319,7 +319,7 @@ LRESULT CXianjinShoukuanWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CYouhuiShowWnd.cpp

@@ -16,7 +16,7 @@ LRESULT CYouhuiShowWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOO
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CZhengcanKaitaiWnd.cpp

@@ -16,7 +16,7 @@ LRESULT CZhengcanKaitaiWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam,
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CZhengcanRenshuWnd.cpp

@@ -19,7 +19,7 @@ LRESULT CZhengcanRenshuWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam,
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CZhengcanSaomadiancanWnd.cpp

@@ -22,7 +22,7 @@ LRESULT CZhengcanSaomadiancanWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM l
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}

zhipuzi_pos_windows/wnd/CZidingyiShoukuanWnd.cpp

@@ -111,7 +111,7 @@ LRESULT CZidingyiShoukuanWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lPara
 		&& pt.y >= rcCaption.top && pt.y < rcCaption.bottom)
 	{
 		CControlUI* pControl = static_cast<CControlUI*>(m_pm.FindControl(pt));
-		if (pControl && _tcscmp(pControl->GetClass(), DUI_CTR_BUTTON) != 0)
+		if (pControl && _tcscmp(pControl->GetClass(), L"ButtonUI") != 0)
 		{
 			return HTCAPTION;
 		}