Merge pull request duilib#63 from wgy0323/master

Update UIControl.cpp
tommy8421 · Feb 18, 2016 · 6fb2758 · 6fb2758
2 parents 84e982c + a2e5951
commit 6fb2758
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/DuiLib/Core/UIControl.cpp b/DuiLib/Core/UIControl.cpp
@@ -969,7 +969,7 @@ CControlUI* CControlUI::ApplyAttributeList(LPCTSTR pstrList)
 
 CDuiString CControlUI::GetAttributeList()
 {
-	return "";
+	return _T("");
 }
 
 SIZE CControlUI::EstimateSize(SIZE szAvailable)
@@ -989,7 +989,7 @@ void CControlUI::Paint(HDC hDC, const RECT& rcPaint, CControlUI* pStopControl)
 
 void CControlUI::DoPaint(HDC hDC, const RECT& rcPaint, CControlUI* pStopControl)
 {
-    // 绘制循序：背景颜色->背景图->状态图->文本->边框
+    // 绘制循序：背景颜色->背景图->状态图->文本->边框
     if( m_cxyBorderRound.cx > 0 || m_cxyBorderRound.cy > 0 ) {
         CRenderClip roundClip;
         CRenderClip::GenerateRoundClip(hDC, m_rcPaint,  m_rcItem, m_cxyBorderRound.cx, m_cxyBorderRound.cy, roundClip);
@@ -1046,7 +1046,7 @@ void CControlUI::PaintText(HDC hDC)
 void CControlUI::PaintBorder(HDC hDC)
 {
 	if(m_rcBorderSize.left > 0 && (m_dwBorderColor != 0 || m_dwFocusBorderColor != 0)) {
-		if( m_cxyBorderRound.cx > 0 || m_cxyBorderRound.cy > 0 )//画圆角边框
+		if( m_cxyBorderRound.cx > 0 || m_cxyBorderRound.cy > 0 )//画圆角边框
 		{
 			if (IsFocused() && m_dwFocusBorderColor != 0)
 				CRenderEngine::DrawRoundRect(hDC, m_rcItem, m_rcBorderSize.left, m_cxyBorderRound.cx, m_cxyBorderRound.cy, GetAdjustColor(m_dwFocusBorderColor), m_nBorderStyle);