From 84d8ef207f2c66d8908134895bb417a32d58befe Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@bullseye.com>
Date: Mon, 26 May 2014 07:30:42 +0000
Subject: [PATCH] Fix setting client data when adding items to a sorted
 wxListBox, broken in r74317 closes #16290

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt    | 1 +
 src/gtk/listbox.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 060162d5fd..9d7803fa97 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -623,6 +623,7 @@ wxGTK:
 - Fix wxDirPickerCtrl to send wxEVT_DIRPICKER_CHANGED when user selects a
   special folder from combobox
 - Fix wxSystemSettings::GetColour() returning transparent colors with GTK3.
+- Fix setting client data when adding items to a sorted wxListBox.
 
 wxMSW:
 
diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 7407fcf5ed..952b509161 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -460,9 +460,13 @@ int wxListBox::DoInsertOneItem(const wxString& item, unsigned int pos)
 #else
     int entryCol = 0;
 #endif
-    gtk_list_store_insert_with_values(m_liststore, NULL, pos, entryCol, entry, -1);
+    GtkTreeIter iter;
+    gtk_list_store_insert_with_values(m_liststore, &iter, pos, entryCol, entry, -1);
     g_object_unref(entry);
 
+    if (HasFlag(wxLB_SORT))
+        pos = GTKGetIndexFor(iter);
+
     return pos;
 }