Skip to content

W
wine-cw
Commit 79e265ac authored by Felix Nawothnig's avatar Felix Nawothnig Committed by Alexandre Julliard
Browse files
Options

comctl32: Remove unnecessary and misused mask member from TAB_ITEM.

parent 42dda83b
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
dlls/comctl32/tab.c
View file @ 79e265ac
...@@ -82,7 +82,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(tab); ...@@ -82,7 +82,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(tab);
typedef struct typedef struct
{ {
UINT mask;
DWORD dwState; DWORD dwState;
LPWSTR pszText; LPWSTR pszText;
INT iImage; INT iImage;
...@@ -217,9 +216,8 @@ TAB_DumpItemInternal(TAB_INFO *infoPtr, UINT iItem) ...@@ -217,9 +216,8 @@ TAB_DumpItemInternal(TAB_INFO *infoPtr, UINT iItem)
TAB_ITEM *ti; TAB_ITEM *ti;
ti = TAB_GetItem(infoPtr, iItem); ti = TAB_GetItem(infoPtr, iItem);
TRACE("tab %d, mask=0x%08x, dwState=0x%08x, pszText=%s, iImage=%d\n", TRACE("tab %d, dwState=0x%08x, pszText=%s, iImage=%d\n",
iItem, ti->mask, ti->dwState, debugstr_w(ti->pszText), iItem, ti->dwState, debugstr_w(ti->pszText), ti->iImage);
ti->iImage);
TRACE("tab %d, rect.left=%d, rect.top(row)=%d\n", TRACE("tab %d, rect.left=%d, rect.top(row)=%d\n",
iItem, ti->rect.left, ti->rect.top); iItem, ti->rect.left, ti->rect.top);
} }
...@@ -1737,7 +1735,7 @@ TAB_DrawItemInterior ...@@ -1737,7 +1735,7 @@ TAB_DrawItemInterior
* *
* Draw the icon. * Draw the icon.
*/ */
if (infoPtr->himl && (item->mask & TCIF_IMAGE)) if (infoPtr->himl && item->iImage != -1)
{ {
INT cx; INT cx;
INT cy; INT cy;
...@@ -2639,7 +2637,6 @@ TAB_InsertItemT (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnicode) ...@@ -2639,7 +2637,6 @@ TAB_InsertItemT (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnicode)
item = TAB_GetItem(infoPtr, iItem); item = TAB_GetItem(infoPtr, iItem);
item->mask = pti->mask;
item->pszText = NULL; item->pszText = NULL;
if (pti->mask & TCIF_TEXT) if (pti->mask & TCIF_TEXT)
...@@ -2846,7 +2843,7 @@ static LRESULT TAB_DeleteItem (TAB_INFO *infoPtr, INT iItem) ...@@ -2846,7 +2843,7 @@ static LRESULT TAB_DeleteItem (TAB_INFO *infoPtr, INT iItem)
TAB_InvalidateTabArea(infoPtr); TAB_InvalidateTabArea(infoPtr);
if ((item->mask & TCIF_TEXT) && item->pszText) if (item->pszText)
Free(item->pszText); Free(item->pszText);
infoPtr->uNumItem--; infoPtr->uNumItem--;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment