commit fe7d46a22129c65d68a0f799c6c73572009055e2
author Martin Fuchs <martin-fuchs@gmx.net> Fri Oct 18 00:20:04 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Oct 18 00:20:04 2002 +0000
tree 4fd9c2120e1d15086ee857d320c32922965b7541
parent c18c7332b839a561bacd2ca8f255f98c20e32e30

pszText is stored as Unicode, so call DrawTextW() instead of
DrawTextA().

dlls/comctl32/header.c

diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index 613938c..9ea1d1a 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -254,12 +254,8 @@
 	    GetObjectA (phdi->hbm, sizeof(BITMAP), (LPVOID)&bmp);
 
 	    textRect = r;
-	    if (infoPtr->bUnicode)
-              DrawTextW (hdc, phdi->pszText, -1,
-	   	  &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT);
-	    else
-              DrawTextA (hdc, (LPCSTR)phdi->pszText, -1,
-	   	  &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT);
+	    DrawTextW (hdc, phdi->pszText, -1,
+	               &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT);
 	    tx = textRect.right - textRect.left;
 	    ry = r.bottom - r.top;
 	    rx = r.right - r.left;
@@ -315,14 +311,10 @@
             r.left += 3 ;
 	    r.right -= 3;
 	    SetTextColor (hdc, (bHotTrack) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT);
-	    if (infoPtr->bUnicode)
-              DrawTextW (hdc, phdi->pszText, -1,
-	   	  &r, uTextJustify|DT_END_ELLIPSIS|DT_VCENTER|DT_SINGLELINE);
-	    else
-              DrawTextA (hdc, (LPCSTR)phdi->pszText, -1,
-	   	  &r, uTextJustify|DT_END_ELLIPSIS|DT_VCENTER|DT_SINGLELINE);
-            if (oldBkMode != TRANSPARENT)
-                SetBkMode(hdc, oldBkMode);
+	    DrawTextW (hdc, phdi->pszText, -1,
+	               &r, uTextJustify|DT_END_ELLIPSIS|DT_VCENTER|DT_SINGLELINE);
+	    if (oldBkMode != TRANSPARENT)
+	        SetBkMode(hdc, oldBkMode);
         }
     }/*Ownerdrawn*/