Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge back commit from winehq

Browse source 
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
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/lib/comctl32/status.c
View file

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