Can't use IsValidInsert from GtkAddHelper as it could cause a segfault in

GetCount if the widget is not fully created yet.

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

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 80343f91c1b7268f6548e140a57d11d5d3343704..454348b56920f013cc1e181e810c4cbeb84839df 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -485,7 +485,7 @@ void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
 
 int wxChoice::GtkAddHelper(GtkWidget *menu, size_t pos, const wxString& item)
 {
-    wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));
+    wxCHECK_MSG((pos>=0) && (pos<=(int)m_clientList.GetCount()), -1, wxT("invalid index"));
 
     GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) );