From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 8 Apr 2002 10:58:17 +0000 (+0000)
Subject: fixed crash in SetFirstVisible()
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/992295c493d410312d218ae3204dcafe2355e5b2?ds=inline

fixed crash in SetFirstVisible()


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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index d54e30e324..afdac34650 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -83,7 +83,13 @@ extern "C" gint wxlistbox_idle_callback( gpointer gdata )
 
     gtk_idle_remove( data->m_tag );
 
-    data->m_listbox->SetFirstItem( data->m_item );
+    // check that the items haven't been deleted from the listbox since we had
+    // installed this callback
+    wxListBox *lbox = data->m_listbox;
+    if ( data->m_item < lbox->GetCount() )
+    {
+        lbox->SetFirstItem( data->m_item );
+    }
 
     delete data;
 
diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index d54e30e324..afdac34650 100644
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -83,7 +83,13 @@ extern "C" gint wxlistbox_idle_callback( gpointer gdata )
 
     gtk_idle_remove( data->m_tag );
 
-    data->m_listbox->SetFirstItem( data->m_item );
+    // check that the items haven't been deleted from the listbox since we had
+    // installed this callback
+    wxListBox *lbox = data->m_listbox;
+    if ( data->m_item < lbox->GetCount() )
+    {
+        lbox->SetFirstItem( data->m_item );
+    }
 
     delete data;