From 1cf1238db4232c143c56fdbda47e587562a4dff2 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 1 May 2003 15:38:55 +0000 Subject: [PATCH] Reset m_lastItem to avoid crashes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/treectrl/treetest.cpp | 1 + samples/treectrl/treetest.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index 8731c60346..351c59f045 100644 --- a/samples/treectrl/treetest.cpp +++ b/samples/treectrl/treetest.cpp @@ -836,6 +836,7 @@ void MyTreeCtrl::DoToggleIcon(const wxTreeItemId& item) void MyTreeCtrl::name(wxTreeEvent& event) \ { \ wxLogMessage(wxT(#name)); \ + SetLastItem(wxTreeItemId()); \ event.Skip(); \ } diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h index b6b9a7551a..39aa38955a 100644 --- a/samples/treectrl/treetest.h +++ b/samples/treectrl/treetest.h @@ -97,7 +97,7 @@ public: void DoSortChildren(const wxTreeItemId& item, bool reverse = FALSE) { m_reverseSort = reverse; wxTreeCtrl::SortChildren(item); } - void DoEnsureVisible() { EnsureVisible(m_lastItem); } + void DoEnsureVisible() { if (m_lastItem.IsOk()) EnsureVisible(m_lastItem); } void DoToggleIcon(const wxTreeItemId& item); @@ -105,6 +105,8 @@ public: int ImageSize(void) const { return m_imageSize; } + void SetLastItem(wxTreeItemId id) { m_lastItem = id; } + protected: virtual int OnCompareItems(const wxTreeItemId& i1, const wxTreeItemId& i2); -- 2.47.2