From 992295c493d410312d218ae3204dcafe2355e5b2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 8 Apr 2002 10:58:17 +0000 Subject: [PATCH] fixed crash in SetFirstVisible() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/listbox.cpp | 8 +++++++- src/gtk1/listbox.cpp | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) 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; -- 2.45.2