Merge back commit from winehq

svn path=/trunk/; revision=13187
This commit is contained in:
Gé van Geldorp 2005-01-21 16:50:11 +00:00
parent 1e0c9bb940
commit 27c9d50d1d

View file

@ -650,7 +650,7 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style,
{
STATUSWINDOWPART *part=NULL;
BOOL changed = FALSE;
WORD oldStyle;
INT oldStyle;
if (style & SBT_OWNERDRAW) {
TRACE("part %d, text %p\n",nPart,text);
@ -675,9 +675,12 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style,
oldStyle = part->style;
part->style = style;
if (style & SBT_OWNERDRAW) {
if (part->text == text)
return TRUE;
part->text = (LPWSTR)text;
if (!(oldStyle & SBT_OWNERDRAW)) {
if (part->text)
Free (part->text);
} else if (part->text == text)
return TRUE;
part->text = (LPWSTR)text;
} else {
LPWSTR ntext;