Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed core dump for when there is no image list on the TreeCtrl

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-06-21 20:53:15 +00:00
parent bea74fbbeb
commit d3a9f4afd9
1 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/generic/treectrl.cpp
View File

@@ -313,11 +313,13 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
if ((point.x >= m_x) && (point.x <= m_x+m_width)) if ((point.x >= m_x) && (point.x <= m_x+m_width))
{ {
int image_w,image_h; int image_w = -1;
int image_h;
// assuming every image (normal and selected ) has the same size ! // assuming every image (normal and selected ) has the same size !
if (theTree->m_imageListNormal)
theTree->m_imageListNormal->GetSize(m_image, image_w, image_h); theTree->m_imageListNormal->GetSize(m_image, image_w, image_h);
if (point.x<=m_x+image_w+1) if ((image_w != -1) && (point.x <= m_x + image_w + 1))
flags|=wxTREE_HITTEST_ONITEMICON; flags|=wxTREE_HITTEST_ONITEMICON;
else else
flags|=wxTREE_HITTEST_ONITEMLABEL; flags|=wxTREE_HITTEST_ONITEMLABEL;