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

1. don't delete item attributes in the virtual list control (=> crash)

Browse Source 
2. refresh the window after deleting all items


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-19 20:50:40 +00:00
parent 2131b89d2c
commit 850ed6e7b0
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/generic/listctrl.cpp
View File

@@ -212,7 +212,7 @@ class WXDLLEXPORT wxListItemData
{ {
public: public:
wxListItemData(wxListMainWindow *owner); wxListItemData(wxListMainWindow *owner);
~wxListItemData() { delete m_attr; delete m_rect; } ~wxListItemData();
void SetItem( const wxListItem &info ); void SetItem( const wxListItem &info );
void SetImage( int image ) { m_image = image; } void SetImage( int image ) { m_image = image; }
@@ -983,6 +983,18 @@ void wxSelectionStore::OnItemDelete(size_t item)
// wxListItemData // wxListItemData
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
wxListItemData::~wxListItemData()
{
// in the virtual list control the attributes are managed by the main
// program, so don't delete them
if ( !m_owner->IsVirtual() )
{
delete m_attr;
}
delete m_rect;
}
void wxListItemData::Init() void wxListItemData::Init()
{ {
m_image = -1; m_image = -1;
@@ -997,7 +1009,7 @@ wxListItemData::wxListItemData(wxListMainWindow *owner)
m_owner = owner; m_owner = owner;
if ( owner->HasFlag(wxLC_REPORT) ) if ( owner->InReportView() )
{ {
m_rect = NULL; m_rect = NULL;
} }
@@ -3527,6 +3539,8 @@ void wxListMainWindow::SetItemCount(long count)
m_selStore.SetItemCount(count); m_selStore.SetItemCount(count);
m_countVirt = count; m_countVirt = count;
ResetVisibleLinesRange();
Refresh(); Refresh();
} }
@@ -3825,8 +3839,6 @@ void wxListMainWindow::DeleteAllItems()
return; return;
} }
m_dirty = TRUE;
ResetCurrent(); ResetCurrent();
// to make the deletion of all items faster, we don't send the // to make the deletion of all items faster, we don't send the
@@ -3842,7 +3854,7 @@ void wxListMainWindow::DeleteAllItems()
{ {
m_countVirt = 0; m_countVirt = 0;
ResetVisibleLinesRange(); m_selStore.Clear();
} }
if ( InReportView() ) if ( InReportView() )
@@ -3852,7 +3864,10 @@ void wxListMainWindow::DeleteAllItems()
m_lines.Clear(); m_lines.Clear();
m_selStore.Clear(); // NB: don't just set m_dirty to TRUE here as RecalculatePositions()
// doesn't do anything if the control is empty and so we won't be
// refreshed
Refresh();
} }
void wxListMainWindow::DeleteEverything() void wxListMainWindow::DeleteEverything()