fix m_sizerPage memory leak for the wizards not using sizers (replaces patch 1708331, fixes bug 1647290)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-04-30 19:43:28 +00:00
parent 97b253782a
commit 781130bf60
3 changed files with 11 additions and 0 deletions

View File

@ -160,6 +160,7 @@ All (Unix):
All (GUI):
- Allow status bar children in XRC (Edmunt Pienkowski)
- Fix memory leak in wxWizard when not using sizers for the page layout
wxMSW:

View File

@ -44,6 +44,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
long style = wxDEFAULT_DIALOG_STYLE);
void Init();
virtual ~wxWizard();
// implement base class pure virtuals
virtual bool RunWizard(wxWizardPage *firstPage);

View File

@ -312,6 +312,15 @@ bool wxWizard::Create(wxWindow *parent,
return result;
}
wxWizard::~wxWizard()
{
// normally we don't have to delete this sizer as it's deleted by the
// associated window but if we never used it or didn't set it as the window
// sizer yet, do delete it manually
if ( !m_usingSizer || !m_started )
delete m_sizerPage;
}
void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn)
{
m_sizerBmpAndPage = new wxBoxSizer(wxHORIZONTAL);