// We have to handle both fooW and fooA notifications in several cases
// because of broken commctl.dll and/or unicows.dll. This class is used to
-// convert LV_ITEMA and LV_ITEMW to LV_ITEM (which is either LV_ITEMA or
+// convert LV_ITEMA and LV_ITEMW to LV_ITEM (which is either LV_ITEMA or
// LV_ITEMW depending on wxUSE_UNICODE setting), so that it can be processed
// by wxConvertToMSWListItem().
class wxLV_ITEM
}
else
m_buf = NULL;
- }
+ }
private:
wxMB2WXbuf *m_buf;
}
else
m_buf = NULL;
- }
+ }
wxLV_ITEM(LV_ITEMA &item) : m_buf(NULL), m_item(&item) {}
private:
wxWC2WXbuf *m_buf;
///////////////////////////////////////////////////////
// Problem:
-// The MSW version had problems with SetTextColour() et
-// al as the wxListItemAttr's were stored keyed on the
-// item index. If a item was inserted anywhere but the end
-// of the list the the text attributes (colour etc) for
+// The MSW version had problems with SetTextColour() et
+// al as the wxListItemAttr's were stored keyed on the
+// item index. If a item was inserted anywhere but the end
+// of the list the the text attributes (colour etc) for
// the following items were out of sync.
-//
+//
// Solution:
-// Under MSW the only way to associate data with a List
-// item independant of its position in the list is to
-// store a pointer to it in its lParam attribute. However
-// user programs are already using this (via the
+// Under MSW the only way to associate data with a List
+// item independant of its position in the list is to
+// store a pointer to it in its lParam attribute. However
+// user programs are already using this (via the
// SetItemData() GetItemData() calls).
-//
-// However what we can do is store a pointer to a
-// structure which contains the attributes we want *and*
+//
+// However what we can do is store a pointer to a
+// structure which contains the attributes we want *and*
// a lParam for the users data, e.g.
-//
+//
// class wxListItemInternalData
// {
// public:
-// wxListItemAttr *attr;
+// wxListItemAttr *attr;
// long lParam; // user data
// };
-//
-// To conserve memory, a wxListItemInternalData is
-// only allocated for a LV_ITEM if text attributes or
+//
+// To conserve memory, a wxListItemInternalData is
+// only allocated for a LV_ITEM if text attributes or
// user data(lparam) are being set.
class wxListItemInternalData
{
public:
- wxListItemAttr *attr;
+ wxListItemAttr *attr;
LPARAM lParam; // user data
wxListItemInternalData() : attr(NULL), lParam(0) {}
};
// Get the internal data structure
-static wxListItemInternalData *GetInternalData(HWND hwnd, long itemId);
-static wxListItemInternalData *GetInternalData(wxListCtrl *ctl, long itemId);
-static wxListItemAttr *GetInternalDataAttr(wxListCtrl *ctl, long itemId);
+static wxListItemInternalData *wxGetInternalData(HWND hwnd, long itemId);
+static wxListItemInternalData *wxGetInternalData(wxListCtrl *ctl, long itemId);
+static wxListItemAttr *wxGetInternalDataAttr(wxListCtrl *ctl, long itemId);
+static void wxDeleteInternalData(wxListCtrl* ctl, long itemId);
// ----------------------------------------------------------------------------
void wxListCtrl::FreeAllInternalData()
{
if (m_AnyInternalData)
- {
+ {
int n = GetItemCount();
int i = 0;
for (i = 0; i < n; i++)
- {
- wxListItemInternalData *data = GetInternalData(this, i);
- if (data)
- delete data;
- };
- };
+ wxDeleteInternalData(this, i);
+
+ m_AnyInternalData = FALSE;
+ }
}
wxListCtrl::~wxListCtrl()
LV_COLUMN lvCol;
wxZeroMemory(lvCol);
+ lvCol.mask = LVCF_WIDTH;
+
if ( item.m_mask & wxLIST_MASK_TEXT )
{
lvCol.mask |= LVCF_TEXT;
lvCol.cchTextMax = 512;
}
+ if ( item.m_mask & wxLIST_MASK_FORMAT )
+ {
+ lvCol.mask |= LVCF_FMT;
+ }
+
+ if ( item.m_mask & wxLIST_MASK_IMAGE )
+ {
+ lvCol.mask |= LVCF_IMAGE;
+ }
+
bool success = ListView_GetColumn(GetHwnd(), col, & lvCol) != 0;
// item.m_subItem = lvCol.iSubItem;
item.m_format = wxLIST_FORMAT_CENTRE;
}
+#if _WIN32_IE >= 0x0300
+ if ( item.m_mask & wxLIST_MASK_IMAGE )
+ {
+ item.m_image = lvCol.iImage;
+ }
+#endif
+
return success;
}
{
// get internal item data
// perhaps a cache here ?
- wxListItemInternalData *data = GetInternalData(this, info.m_itemId);
-
+ wxListItemInternalData *data = wxGetInternalData(this, info.m_itemId);
+
if (! data)
{
// need to set it
eventType = wxEVT_COMMAND_LIST_END_LABEL_EDIT;
wxLV_ITEM item(((LV_DISPINFOA *)lParam)->item);
wxConvertFromMSWListItem(NULL, event.m_item, item);
- if ( ((LV_ITEM)item).pszText == NULL ||
+ if ( ((LV_ITEM)item).pszText == NULL ||
((LV_ITEM)item).iItem == -1 )
return FALSE;
eventType = wxEVT_COMMAND_LIST_END_LABEL_EDIT;
wxLV_ITEM item(((LV_DISPINFOW *)lParam)->item);
wxConvertFromMSWListItem(NULL, event.m_item, item);
- if ( ((LV_ITEM)item).pszText == NULL ||
+ if ( ((LV_ITEM)item).pszText == NULL ||
((LV_ITEM)item).iItem == -1 )
return FALSE;
case LVN_DELETEITEM:
eventType = wxEVT_COMMAND_LIST_DELETE_ITEM;
event.m_itemIndex = nmLV->iItem;
-
// delete the assoicated internal data
- {
- wxListItemInternalData *data =
- GetInternalData(this, nmLV->iItem);
- if (data)
- delete data;
- };
+ wxDeleteInternalData(this, nmLV->iItem);
break;
case LVN_SETDISPINFO:
wxListItemAttr *attr =
IsVirtual() ? OnGetItemAttr(item)
- : GetInternalDataAttr(this, item);
+ : wxGetInternalDataAttr(this, item);
if ( !attr )
{
RefreshRect(rect);
}
-static wxListItemInternalData *GetInternalData(HWND hwnd, long itemId)
+static wxListItemInternalData *wxGetInternalData(HWND hwnd, long itemId)
{
LV_ITEM it;
it.mask = LVIF_PARAM;
return NULL;
};
-static wxListItemInternalData *GetInternalData(wxListCtrl *ctl, long itemId)
+static wxListItemInternalData *wxGetInternalData(wxListCtrl *ctl, long itemId)
{
- return GetInternalData((HWND) ctl->GetHWND(), itemId);
+ return wxGetInternalData((HWND) ctl->GetHWND(), itemId);
};
-static wxListItemAttr *GetInternalDataAttr(wxListCtrl *ctl, long itemId)
+static wxListItemAttr *wxGetInternalDataAttr(wxListCtrl *ctl, long itemId)
{
- wxListItemInternalData *data = GetInternalData(ctl, itemId);
+ wxListItemInternalData *data = wxGetInternalData(ctl, itemId);
if (data)
return data->attr;
else
return NULL;
};
+static void wxDeleteInternalData(wxListCtrl* ctl, long itemId)
+{
+ wxListItemInternalData *data = wxGetInternalData(ctl, itemId);
+ if (data)
+ {
+ delete data;
+ LV_ITEM item;
+ memset(&item, 0, sizeof(item));
+ item.iItem = itemId;
+ item.mask = LVIF_PARAM;
+ item.lParam = (LPARAM) 0;
+ ListView_SetItem((HWND)ctl->GetHWND(), &item);
+ }
+}
static void wxConvertFromMSWListItem(HWND hwndListCtrl,
wxListItem& info,
LV_ITEM& lvItem)
{
- wxListItemInternalData *internaldata =
+ wxListItemInternalData *internaldata =
(wxListItemInternalData *) lvItem.lParam;
if (internaldata)
projects / wxWidgets.git / blobdiff