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

STL-ification patch for wxMSW and wxGTK.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-10 19:55:12 +00:00
parent 6992d326eb
commit 222ed1d678
73 changed files with 668 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/statbar.cpp
View File

@@ -234,7 +234,8 @@ void wxStatusBarBase::FreeStacks()
{
if(m_statusTextStacks[i])
{
m_statusTextStacks[i]->Clear();
wxListString& t = *m_statusTextStacks[i];
WX_CLEAR_LIST(wxListString, t);
delete m_statusTextStacks[i];
}
}
@@ -257,10 +258,11 @@ void wxStatusBarBase::PopStatusText(int number)
{
wxListString *st = GetStatusStack(number);
wxCHECK_RET( st, _T("Unbalanced PushStatusText/PopStatusText") );
wxListString::Node *top = st->GetFirst();
wxListString::compatibility_iterator top = st->GetFirst();
SetStatusText(*top->GetData(), number);
st->DeleteNode(top);
delete top->GetData();
st->Erase(top);
if(st->GetCount() == 0)
{
delete st;
@@ -288,7 +290,6 @@ wxListString *wxStatusBarBase::GetOrCreateStatusStack(int i)
if(!m_statusTextStacks[i])
{
m_statusTextStacks[i] = new wxListString();
m_statusTextStacks[i]->DeleteContents(TRUE);
}
return m_statusTextStacks[i];