GTK+ selects the first item initially, II

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

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index b63c3c68bc760e9289ca7377472850a4bb7e36ca..2e160d2287c4d920700328a69d45a70ef2f79ba1 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -163,6 +163,12 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
         m_selection_hack += count;
     }
 
         m_selection_hack += count;
     }
 

+    // We must set the selection so that it can be read back even if 
+    // the user has not modified it since GTK+ will then select the
+    // first item so well return 0.
+    if ((count > 0) && (m_selection_hack==wxNOT_FOUND))
+        m_selection_hack = 0;
+

     return pos - 1;
 }
 
     return pos - 1;
 }