Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IsModal now has the newer meaning.

Browse Source 
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
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mac/carbon/dialog.cpp
View File

@@ -112,7 +112,8 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
bool wxDialog::IsModal() const 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(); InitDialog();
} }
if ( IsModal() ) if ( m_isModalStyle )
{ {
if ( show ) if ( show )
{ {
@@ -189,7 +190,7 @@ 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()
{ {
if ( !IsModal() ) if ( !m_isModalStyle )
{ {
SetModal(TRUE); SetModal(TRUE);
} }
@@ -204,6 +205,7 @@ void wxDialog::EndModal(int retCode)
{ {
SetReturnCode(retCode); SetReturnCode(retCode);
Show(FALSE); Show(FALSE);
SetModal(false);
} }
// Standard buttons // Standard buttons