mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 10:04:49 +00:00
Merge back commit from winehq
svn path=/trunk/; revision=13187
This commit is contained in:
parent
1e0c9bb940
commit
27c9d50d1d
1 changed files with 7 additions and 4 deletions
|
@ -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,7 +675,10 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style,
|
|||
oldStyle = part->style;
|
||||
part->style = style;
|
||||
if (style & SBT_OWNERDRAW) {
|
||||
if (part->text == text)
|
||||
if (!(oldStyle & SBT_OWNERDRAW)) {
|
||||
if (part->text)
|
||||
Free (part->text);
|
||||
} else if (part->text == text)
|
||||
return TRUE;
|
||||
part->text = (LPWSTR)text;
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue