From 452a710f3783af0f3b44f85b52d14369a0f5a100 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 2 May 2009 15:44:18 +0000 Subject: [PATCH] don't use invalid image list index (closes #10472) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@60479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/treectlg.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index 2a2eff5349..5e71b9ade6 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -2951,9 +2951,13 @@ bool wxGenericTreeCtrl::GetBoundingRect(const wxTreeItemId& item, if ( m_imageListNormal ) { - int image_w, image_h; - m_imageListNormal->GetSize( 0, image_w, image_h ); - rect.width += image_w + MARGIN_BETWEEN_IMAGE_AND_TEXT; + int image = ((wxGenericTreeItem*) item.m_pItem)->GetCurrentImage(); + if ( image != NO_IMAGE ) + { + int image_w, image_h; + m_imageListNormal->GetSize( image, image_w, image_h ); + rect.width += image_w + MARGIN_BETWEEN_IMAGE_AND_TEXT; + } } } else // the entire line