ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Authors: Chris Morgan <cmorgan@wpi.edu>, James Abbatiello <abbeyj@wpi.edu> 

Fixed problems with disappearing text.
This commit is contained in:
Alexandre Julliard 1999-06-26 10:26:46 +00:00
parent 3c1ebcceca
commit b73d53c0d4
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/comctl32/listview.c
View File

@ -3050,6 +3050,11 @@ static LRESULT LISTVIEW_GetColumnA(HWND hwnd, INT nItem, LPLVCOLUMNA lpColumn)
{ {
lpColumn->fmt |= LVCFMT_COL_HAS_IMAGES; lpColumn->fmt |= LVCFMT_COL_HAS_IMAGES;
} }
if (hdi.fmt & HDF_BITMAP_ON_RIGHT)
{
lpColumn->fmt |= LVCFMT_BITMAP_ON_RIGHT;
}
} }
if (lpColumn->mask & LVCF_WIDTH) if (lpColumn->mask & LVCF_WIDTH)
@ -3391,13 +3396,14 @@ static LRESULT LISTVIEW_GetItemA(HWND hwnd, LPLVITEMA lpLVItem)
{ {
if (dispInfo.item.mask & LVIF_DI_SETITEM) if (dispInfo.item.mask & LVIF_DI_SETITEM)
{ {
Str_SetPtrA(&lpItem->pszText, dispInfo.item.pszText); if (lpSubItem)
Str_SetPtrA(&lpSubItem->pszText, dispInfo.item.pszText);
} }
lpLVItem->pszText = dispInfo.item.pszText; lpLVItem->pszText = dispInfo.item.pszText;
} }
else if (lpLVItem->mask & LVIF_TEXT) else if (lpLVItem->mask & LVIF_TEXT)
{ {
lpLVItem->pszText = lpItem->pszText; lpLVItem->pszText = lpSubItem->pszText;
} }
} }
} }
@ -4666,7 +4672,7 @@ static LRESULT LISTVIEW_SetColumnA(HWND hwnd, INT nColumn,
{ {
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0); LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongA(hwnd, 0);
BOOL bResult = FALSE; BOOL bResult = FALSE;
HDITEMA hdi; HDITEMA hdi, hdiget;
if ((lpColumn != NULL) && (nColumn >= 0) && if ((lpColumn != NULL) && (nColumn >= 0) &&
(nColumn < Header_GetItemCount(infoPtr->hwndHeader))) (nColumn < Header_GetItemCount(infoPtr->hwndHeader)))
@ -4679,6 +4685,12 @@ static LRESULT LISTVIEW_SetColumnA(HWND hwnd, INT nColumn,
/* format member is valid */ /* format member is valid */
hdi.mask |= HDI_FORMAT; hdi.mask |= HDI_FORMAT;
/* get current format first */
hdiget.mask = HDI_FORMAT;
if (Header_GetItemA(infoPtr->hwndHeader, nColumn, &hdiget))
/* preserve HDF_STRING if present */
hdi.fmt = hdiget.fmt & HDF_STRING;
/* set text alignment (leftmost column must be left-aligned) */ /* set text alignment (leftmost column must be left-aligned) */
if (nColumn == 0) if (nColumn == 0)
{ {