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 0f28034f816efc596d89b8c0744ce089887f46ba..73edbd78f8a0652659c679730ce31a2ece601762 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -33,7 +33,6 @@
 #endif
 
 #include <gtk/gtk.h>
 #endif
 
 #include <gtk/gtk.h>

-#include <gdk/gdkkeysyms.h>

 
 //-----------------------------------------------------------------------------
 // data
 
 //-----------------------------------------------------------------------------
 // data


@@ -447,7 +446,7 @@ wxListBox::~wxListBox()
 int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
                              unsigned int pos,
                              void **clientData,
 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") );
 
 {
     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);
 
                 (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);
         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;
     }
 
     return pos + numItems - 1;