IsModal now has the newer meaning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-09-20 11:03:49 +00:00
parent 4bbc4bded5
commit 285ce5a341

View File

@@ -112,7 +112,8 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
bool wxDialog::IsModal() const
{
return m_isModalStyle;
return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
// return m_isModalStyle;
}
@@ -135,7 +136,7 @@ bool wxDialog::Show(bool show)
InitDialog();
}
if ( IsModal() )
if ( m_isModalStyle )
{
if ( show )
{
@@ -189,7 +190,7 @@ void wxDialog::DoShowModal()
// Replacement for Show(TRUE) for modal dialogs - returns return code
int wxDialog::ShowModal()
{
if ( !IsModal() )
if ( !m_isModalStyle )
{
SetModal(TRUE);
}
@@ -202,8 +203,9 @@ int wxDialog::ShowModal()
// dialogs and should work for both of them
void wxDialog::EndModal(int retCode)
{
SetReturnCode(retCode);
Show(FALSE);
SetReturnCode(retCode);
Show(FALSE);
SetModal(false);
}
// Standard buttons