fixed incorrectly inversed test for parent [not] being deleted (patch 1624472)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -118,7 +118,7 @@ int wxDialog::ShowModal()
|
|||||||
wxWindow *parent = wxTheApp->GetTopWindow();
|
wxWindow *parent = wxTheApp->GetTopWindow();
|
||||||
if ( parent &&
|
if ( parent &&
|
||||||
parent != this &&
|
parent != this &&
|
||||||
parent->IsBeingDeleted() &&
|
!parent->IsBeingDeleted() &&
|
||||||
!(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
|
!(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
|
||||||
{
|
{
|
||||||
m_parent = parent;
|
m_parent = parent;
|
||||||
|
@@ -194,7 +194,7 @@ int wxDialog::ShowModal()
|
|||||||
wxWindow *parent = wxTheApp->GetTopWindow();
|
wxWindow *parent = wxTheApp->GetTopWindow();
|
||||||
if ( parent &&
|
if ( parent &&
|
||||||
parent != this &&
|
parent != this &&
|
||||||
parent->IsBeingDeleted() &&
|
!parent->IsBeingDeleted() &&
|
||||||
!(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
|
!(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
|
||||||
{
|
{
|
||||||
m_parent = parent;
|
m_parent = parent;
|
||||||
|
Reference in New Issue
Block a user