fix to OWNER_DRAWN assert in listbox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -307,8 +307,12 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
|
|||||||
if ( clientData )
|
if ( clientData )
|
||||||
{
|
{
|
||||||
#if wxUSE_OWNER_DRAWN
|
#if wxUSE_OWNER_DRAWN
|
||||||
wxASSERT_MSG(clientData[i] == NULL,
|
if ( m_windowStyle & wxLB_OWNERDRAW )
|
||||||
wxT("Can't use client data with owner-drawn listboxes"));
|
{
|
||||||
|
wxASSERT_MSG(clientData[i] == NULL,
|
||||||
|
wxT("Can't use client data with owner-drawn listboxes"));
|
||||||
|
}
|
||||||
|
ListBox_SetItemData(GetHwnd(), i, clientData[i]);
|
||||||
#else // !wxUSE_OWNER_DRAWN
|
#else // !wxUSE_OWNER_DRAWN
|
||||||
ListBox_SetItemData(GetHwnd(), i, clientData[i]);
|
ListBox_SetItemData(GetHwnd(), i, clientData[i]);
|
||||||
#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
|
#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
|
||||||
|
Reference in New Issue
Block a user