From: David Webster <Dave.Webster@bhmi.com>
Date: Wed, 6 Sep 2000 19:18:35 +0000 (+0000)
Subject: fix to OWNER_DRAWN assert in listbox
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5615ab377070991b552e8e75c951970390a16b05

fix to OWNER_DRAWN assert in listbox


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 3594e49841..98d9b64dd4 100644
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -307,8 +307,12 @@ void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
         if ( clientData )
         {
 #if wxUSE_OWNER_DRAWN
-            wxASSERT_MSG(clientData[i] == NULL,
-                         wxT("Can't use client data with owner-drawn listboxes"));
+            if ( m_windowStyle & wxLB_OWNERDRAW )
+            {
+                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
             ListBox_SetItemData(GetHwnd(), i, clientData[i]);
 #endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN