code changed along msw lines

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-02-09 08:56:54 +00:00
parent 07c76470e9
commit 81b41c03c6
2 changed files with 14 additions and 6 deletions

View File

@@ -209,9 +209,13 @@ void wxDialog::DoShowModal()
// Replacement for Show(TRUE) for modal dialogs - returns return code
int wxDialog::ShowModal()
{
m_windowStyle |= wxDIALOG_MODAL;
Show(TRUE);
return GetReturnCode();
if ( !IsModal() )
{
SetModal(TRUE);
}
Show(TRUE);
return GetReturnCode();
}
// NB: this function (surprizingly) may be called for both modal and modeless

View File

@@ -209,9 +209,13 @@ void wxDialog::DoShowModal()
// Replacement for Show(TRUE) for modal dialogs - returns return code
int wxDialog::ShowModal()
{
m_windowStyle |= wxDIALOG_MODAL;
Show(TRUE);
return GetReturnCode();
if ( !IsModal() )
{
SetModal(TRUE);
}
Show(TRUE);
return GetReturnCode();
}
// NB: this function (surprizingly) may be called for both modal and modeless