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

fixed memory leak (patch 655899)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-21 14:32:55 +00:00
parent 894c8f3ef2
commit 168954a1d1
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/widgets/static.cpp
View File

@@ -166,6 +166,7 @@ protected:
*m_radioVAlign; *m_radioVAlign;
// the controls and the sizer containing them // the controls and the sizer containing them
wxStaticBox *m_staticBox;
wxStaticBoxSizer *m_sizerStatBox; wxStaticBoxSizer *m_sizerStatBox;
wxStaticText *m_statText; wxStaticText *m_statText;
wxStaticLine *m_statLine; wxStaticLine *m_statLine;
@@ -215,6 +216,7 @@ StaticWidgetsPage::StaticWidgetsPage(wxNotebook *notebook,
m_statLine = (wxStaticLine *)NULL; m_statLine = (wxStaticLine *)NULL;
m_statText = (wxStaticText *)NULL; m_statText = (wxStaticText *)NULL;
m_staticBox = (wxStaticBox *)NULL;
m_sizerStatBox = (wxStaticBoxSizer *)NULL; m_sizerStatBox = (wxStaticBoxSizer *)NULL;
m_sizerStatic = (wxSizer *)NULL; m_sizerStatic = (wxSizer *)NULL;
@@ -319,9 +321,9 @@ void StaticWidgetsPage::CreateStatic()
if ( m_sizerStatBox ) if ( m_sizerStatBox )
{ {
m_sizerStatic->Remove(m_sizerStatBox); delete m_staticBox;
// delete m_sizerStatBox; -- deleted by Remove() // delete m_sizerStatBox; -- deleted by Remove()
m_sizerStatic->Remove(m_sizerStatBox);
delete m_statText; delete m_statText;
delete m_statLine; delete m_statLine;
} }
@@ -376,11 +378,11 @@ void StaticWidgetsPage::CreateStatic()
flagsText |= align; flagsText |= align;
flagsBox |= align; flagsBox |= align;
wxStaticBox *box = new MyStaticBox(this, -1, m_textBox->GetValue(), m_staticBox = new MyStaticBox(this, -1, m_textBox->GetValue(),
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
flagsBox); flagsBox);
m_sizerStatBox = new wxStaticBoxSizer(box, isVert ? wxHORIZONTAL m_sizerStatBox = new wxStaticBoxSizer(m_staticBox, isVert ? wxHORIZONTAL
: wxVERTICAL); : wxVERTICAL);
m_statText = new MyStaticText(this, -1, m_textLabel->GetValue(), m_statText = new MyStaticText(this, -1, m_textLabel->GetValue(),
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,