From: Paul Cornett <paulcor@bullseye.com>
Date: Mon, 24 Dec 2007 01:53:34 +0000 (+0000)
Subject: fix setting client data
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/cfe8a907fd616ea7ff1c2f6474c01ce7989aa015?ds=inline

fix setting client data

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 0f28034f81..73edbd78f8 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -33,7 +33,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 
 //-----------------------------------------------------------------------------
 // data
@@ -447,7 +446,7 @@ wxListBox::~wxListBox()
 int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
                              unsigned int pos,
                              void **clientData,
-                             wxClientDataType WXUNUSED(type))
+                             wxClientDataType type)
 {
     wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );
 
@@ -472,15 +471,15 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
                 (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb,
                             this);
 
-        if (clientData)
-            gtk_tree_entry_set_userdata(entry, clientData[i]);
-
         GtkTreeIter itercur;
         gtk_list_store_insert_before(m_liststore, &itercur, pIter);
 
         GtkSetItem(itercur, entry);
 
         g_object_unref (entry);
+
+        if (clientData)
+            AssignNewItemClientData(GtkGetIndexFor(itercur), clientData, i, type);
     }
 
     return pos + numItems - 1;