bug fix for m_parent == NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -198,7 +198,9 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
|
|||||||
Centre(wxCENTER_FRAME | wxBOTH);
|
Centre(wxCENTER_FRAME | wxBOTH);
|
||||||
|
|
||||||
if(m_disableParentOnly)
|
if(m_disableParentOnly)
|
||||||
m_parent->Enable(FALSE);
|
{
|
||||||
|
if(m_parent) m_parent->Enable(FALSE);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
wxEnableTopLevelWindows(FALSE);
|
wxEnableTopLevelWindows(FALSE);
|
||||||
|
|
||||||
@@ -285,7 +287,9 @@ void wxProgressDialog::OnClose(wxCloseEvent& event)
|
|||||||
wxProgressDialog::~wxProgressDialog()
|
wxProgressDialog::~wxProgressDialog()
|
||||||
{
|
{
|
||||||
if ( m_disableParentOnly )
|
if ( m_disableParentOnly )
|
||||||
m_parent->Enable(TRUE);
|
{
|
||||||
|
if(m_parent) m_parent->Enable(TRUE);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
wxEnableTopLevelWindows(TRUE);
|
wxEnableTopLevelWindows(TRUE);
|
||||||
if (m_time) delete m_time;
|
if (m_time) delete m_time;
|
||||||
|
Reference in New Issue
Block a user