// 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;
LV_ITEM *m_item;
};
+///////////////////////////////////////////////////////
+// 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 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
+// SetItemData() GetItemData() calls).
+//
+// 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;
+// long lParam; // user data
+// };
+//
+// To conserve memory, a wxListItemInternalData is
+// only allocated for a LV_ITEM if text attributes or
+// user data(lparam) are being set.
+
+
+// class wxListItemInternalData
+class wxListItemInternalData
+{
+public:
+ wxListItemAttr *attr;
+ LPARAM lParam; // user data
+
+ wxListItemInternalData() : attr(NULL), lParam(0) {}
+ ~wxListItemInternalData()
+ {
+ if (attr)
+ delete attr;
+ };
+};
+
+// Get the internal data structure
+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);
+
+
// ----------------------------------------------------------------------------
// events
// ----------------------------------------------------------------------------
m_baseStyle = 0;
m_colCount = 0;
m_textCtrl = NULL;
+ m_AnyInternalData = FALSE;
m_hasAnyAttr = FALSE;
}
}
}
-void wxListCtrl::FreeAllAttrs(bool dontRecreate)
+void wxListCtrl::FreeAllInternalData()
{
- if ( m_hasAnyAttr )
+ if (m_AnyInternalData)
{
- for ( wxNode *node = m_attrs.Next(); node; node = m_attrs.Next() )
- {
- delete (wxListItemAttr *)node->Data();
- }
+ int n = GetItemCount();
+ int i = 0;
- m_attrs.Destroy();
- if ( !dontRecreate )
- {
- m_attrs.Create(wxKEY_INTEGER, 1000); // just as def ctor
- }
+ for (i = 0; i < n; i++)
+ wxDeleteInternalData(this, i);
- m_hasAnyAttr = FALSE;
+ m_AnyInternalData = FALSE;
}
}
wxListCtrl::~wxListCtrl()
{
- FreeAllAttrs(TRUE /* no need to recreate hash any more */);
+ FreeAllInternalData();
if ( m_textCtrl )
{
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;
}
LV_ITEM item;
wxConvertToMSWListItem(this, info, item);
+ // we never update the lParam if it contains our pointer
+ // to the wxListItemInternalData structure
+ item.mask &= ~LVIF_PARAM;
+
+ // check if setting attributes or lParam
+ if (info.HasAttributes() || (info.m_mask & wxLIST_MASK_DATA))
+ {
+ // get internal item data
+ // perhaps a cache here ?
+ wxListItemInternalData *data = wxGetInternalData(this, info.m_itemId);
+
+ if (! data)
+ {
+ // need to set it
+ m_AnyInternalData = TRUE;
+ data = new wxListItemInternalData();
+ item.lParam = (LPARAM) data;
+ item.mask |= LVIF_PARAM;
+ };
+
+
+ // user data
+ if (info.m_mask & wxLIST_MASK_DATA)
+ data->lParam = info.m_data;
+
+ // attributes
+ if (info.HasAttributes())
+ {
+ if (data->attr)
+ *data->attr = *info.GetAttributes();
+ else
+ data->attr = new wxListItemAttr(*info.GetAttributes());
+ };
+ };
+
+
// we could be changing only the attribute in which case we don't need to
// call ListView_SetItem() at all
if ( item.mask )
// check whether it has any custom attributes
if ( info.HasAttributes() )
{
- wxListItemAttr *attr = (wxListItemAttr *)m_attrs.Get(item.iItem);
-
- if ( attr == NULL )
- m_attrs.Put(item.iItem, (wxObject *)new wxListItemAttr(*info.GetAttributes()));
- else
- *attr = *info.GetAttributes();
-
m_hasAnyAttr = TRUE;
// if the colour has changed, we must redraw the item
{
wxASSERT( (textControlClass->IsKindOf(CLASSINFO(wxTextCtrl))) );
- // VS: ListView_EditLabel requires that the list has focus.
+ // ListView_EditLabel requires that the list has focus.
SetFocus();
- HWND hWnd = (HWND) ListView_EditLabel(GetHwnd(), item);
+ WXHWND hWnd = (WXHWND) ListView_EditLabel(GetHwnd(), item);
if (m_textCtrl)
{
m_textCtrl->SetHWND(0);
m_textCtrl->UnsubclassWin();
delete m_textCtrl;
- m_textCtrl = NULL;
}
m_textCtrl = (wxTextCtrl*) textControlClass->CreateObject();
- m_textCtrl->SetHWND((WXHWND) hWnd);
- m_textCtrl->SubclassWin((WXHWND) hWnd);
+ m_textCtrl->SetHWND(hWnd);
+ m_textCtrl->SubclassWin(hWnd);
+ m_textCtrl->SetParent(this);
return m_textCtrl;
}
LV_ITEM item;
wxConvertToMSWListItem(this, info, item);
+ item.mask &= ~LVIF_PARAM;
- // check whether it has any custom attributes
- if ( info.HasAttributes() )
+ // check wether we need to allocate our internal data
+ bool needInternalData = ((info.m_mask & wxLIST_MASK_DATA) || info.HasAttributes());
+ if (needInternalData)
{
+ m_AnyInternalData = TRUE;
+ item.mask |= LVIF_PARAM;
- wxListItemAttr *attr;
- attr = (wxListItemAttr*) m_attrs.Get(item.iItem);
-
- if (attr == NULL)
+ // internal stucture that manages data
+ wxListItemInternalData *data = new wxListItemInternalData();
+ item.lParam = (LPARAM) data;
- m_attrs.Put(item.iItem, (wxObject *)new wxListItemAttr(*info.GetAttributes()));
+ if (info.m_mask & wxLIST_MASK_DATA)
+ data->lParam = info.m_data;
- else *attr = *info.GetAttributes();
-
- m_hasAnyAttr = TRUE;
+ // check whether it has any custom attributes
+ if ( info.HasAttributes() )
+ {
+ // take copy of attributes
+ data->attr = new wxListItemAttr(*info.GetAttributes());
}
+ };
+
return (long) ListView_InsertItem(GetHwnd(), & item);
}
// data is arbitrary data to be passed to the sort function.
-// FIXME: this is horrible and MT-unsafe and everything else but I don't have
-// time for anything better right now (VZ)
-static long gs_sortData = 0;
-static wxListCtrl *gs_sortCtrl = NULL;
-static wxListCtrlCompare gs_sortFunction = NULL;
+// Internal structures for proxying the user compare function
+// so that we can pass it the *real* user data
-int wxCMPFUNC_CONV wxListCtrlCompareFn(const void *arg1, const void *arg2)
+// translate lParam data and call user func
+struct wxInternalDataSort
{
- int n1 = *(const int *)arg1,
- n2 = *(const int *)arg2;
-
- return gs_sortFunction(gs_sortCtrl->GetItemData(n1),
- gs_sortCtrl->GetItemData(n2),
- gs_sortData);
-}
+ wxListCtrlCompare user_fn;
+ long data;
+};
-bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
+int CALLBACK wxInternalDataCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)
{
- // sort the attributes too
- if ( m_hasAnyAttr )
- {
- int n,
- count = GetItemCount();
- int *aItems = new int[count];
- for ( n = 0; n < count; n++ )
- {
- aItems[n] = n;
- }
-
- gs_sortData = data;
- gs_sortCtrl = this;
- gs_sortFunction = fn;
+ struct wxInternalDataSort *internalData = (struct wxInternalDataSort *) lParamSort;
- qsort(aItems, count, sizeof(int), wxListCtrlCompareFn);
+ wxListItemInternalData *data1 = (wxListItemInternalData *) lParam1;
+ wxListItemInternalData *data2 = (wxListItemInternalData *) lParam2;
- gs_sortData = 0;
- gs_sortCtrl = NULL;
- gs_sortFunction = NULL;
+ long d1 = (data1 == NULL ? 0 : data1->lParam);
+ long d2 = (data2 == NULL ? 0 : data2->lParam);
- wxHashTable attrsNew(wxKEY_INTEGER, 1000);
- for ( n = 0; n < count; n++ )
- {
- wxObject *attr = m_attrs.Delete(aItems[n]);
- if ( attr )
- {
- attrsNew.Put(n, attr);
- }
- }
+ return internalData->user_fn(d1, d2, internalData->data);
- m_attrs.Destroy();
- m_attrs = attrsNew;
+};
- delete [] aItems;
- }
+bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
+{
+ struct wxInternalDataSort internalData;
+ internalData.user_fn = fn;
+ internalData.data = data;
- if ( !ListView_SortItems(GetHwnd(), (PFNLVCOMPARE)fn, data) )
+ // WPARAM cast is needed for mingw/cygwin
+ if ( !ListView_SortItems(GetHwnd(),
+ wxInternalDataCompareFunc,
+ (WPARAM) &internalData) )
{
wxLogDebug(_T("ListView_SortItems() failed"));
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_DELETEALLITEMS:
eventType = wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
event.m_itemIndex = -1;
-
- FreeAllAttrs();
-
break;
case LVN_DELETEITEM:
eventType = wxEVT_COMMAND_LIST_DELETE_ITEM;
event.m_itemIndex = nmLV->iItem;
-
- if ( m_hasAnyAttr )
- {
- delete (wxListItemAttr *)m_attrs.Delete(nmLV->iItem);
- }
+ // delete the assoicated internal data
+ wxDeleteInternalData(this, nmLV->iItem);
break;
case LVN_SETDISPINFO:
wxListItemAttr *attr =
IsVirtual() ? OnGetItemAttr(item)
- : (wxListItemAttr *)m_attrs.Get(item);
+ : wxGetInternalDataAttr(this, item);
if ( !attr )
{
RefreshRect(rect);
}
+static wxListItemInternalData *wxGetInternalData(HWND hwnd, long itemId)
+{
+ LV_ITEM it;
+ it.mask = LVIF_PARAM;
+ it.iItem = itemId;
+
+ bool success = ListView_GetItem(hwnd, &it) != 0;
+ if (success)
+ return (wxListItemInternalData *) it.lParam;
+ else
+ return NULL;
+};
+
+static wxListItemInternalData *wxGetInternalData(wxListCtrl *ctl, long itemId)
+{
+ return wxGetInternalData((HWND) ctl->GetHWND(), itemId);
+};
+
+static wxListItemAttr *wxGetInternalDataAttr(wxListCtrl *ctl, long 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)
{
- info.m_data = lvItem.lParam;
+ wxListItemInternalData *internaldata =
+ (wxListItemInternalData *) lvItem.lParam;
+
+ if (internaldata)
+ info.m_data = internaldata->lParam;
+
info.m_mask = 0;
info.m_state = 0;
info.m_stateMask = 0;
lvItem.iItem = (int) info.m_itemId;
lvItem.iImage = info.m_image;
- lvItem.lParam = info.m_data;
lvItem.stateMask = 0;
lvItem.state = 0;
lvItem.mask = 0;
}
if (info.m_mask & wxLIST_MASK_IMAGE)
lvItem.mask |= LVIF_IMAGE;
- if (info.m_mask & wxLIST_MASK_DATA)
- lvItem.mask |= LVIF_PARAM;
}
static void wxConvertToMSWListCol(int WXUNUSED(col), const wxListItem& item,
}
#endif // wxUSE_LISTCTRL
-
-// vi:sts=4:sw=4:et
projects / wxWidgets.git / blobdiff