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:
@@ -209,9 +209,13 @@ void wxDialog::DoShowModal()
|
|||||||
// Replacement for Show(TRUE) for modal dialogs - returns return code
|
// Replacement for Show(TRUE) for modal dialogs - returns return code
|
||||||
int wxDialog::ShowModal()
|
int wxDialog::ShowModal()
|
||||||
{
|
{
|
||||||
m_windowStyle |= wxDIALOG_MODAL;
|
if ( !IsModal() )
|
||||||
Show(TRUE);
|
{
|
||||||
return GetReturnCode();
|
SetModal(TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
|
Show(TRUE);
|
||||||
|
return GetReturnCode();
|
||||||
}
|
}
|
||||||
|
|
||||||
// NB: this function (surprizingly) may be called for both modal and modeless
|
// NB: this function (surprizingly) may be called for both modal and modeless
|
||||||
|
@@ -209,9 +209,13 @@ void wxDialog::DoShowModal()
|
|||||||
// Replacement for Show(TRUE) for modal dialogs - returns return code
|
// Replacement for Show(TRUE) for modal dialogs - returns return code
|
||||||
int wxDialog::ShowModal()
|
int wxDialog::ShowModal()
|
||||||
{
|
{
|
||||||
m_windowStyle |= wxDIALOG_MODAL;
|
if ( !IsModal() )
|
||||||
Show(TRUE);
|
{
|
||||||
return GetReturnCode();
|
SetModal(TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
|
Show(TRUE);
|
||||||
|
return GetReturnCode();
|
||||||
}
|
}
|
||||||
|
|
||||||
// NB: this function (surprizingly) may be called for both modal and modeless
|
// NB: this function (surprizingly) may be called for both modal and modeless
|
||||||
|
Reference in New Issue
Block a user