* Use wxTopLevelWindow::Show() for modeless dialogs
* Maintain m_isShown for modal dialogs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
cbb2499e71
commit
0411b8647b
@ -105,10 +105,13 @@ void wxDialog::SetModal(bool flag)
|
||||
|
||||
bool wxDialog::Show(bool show)
|
||||
{
|
||||
if(m_isShown == show)
|
||||
return false;
|
||||
if(show)
|
||||
InitDialog();
|
||||
if(IsModal())
|
||||
{
|
||||
m_isShown = show;
|
||||
if(show)
|
||||
{
|
||||
wxAutoNSAutoreleasePool pool;
|
||||
@ -124,6 +127,8 @@ bool wxDialog::Show(bool show)
|
||||
wxModalDialogs.DeleteObject(this);
|
||||
}
|
||||
}
|
||||
else
|
||||
return wxTopLevelWindow::Show(show);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user