IsModal now has the newer meaning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 830ab7f87538839f4f4a2035ad217d14710bd5ab..63f74ce6c60068325d2e9052b77493d38434a719 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -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
 int wxDialog::ShowModal()
 {
 // Replacement for Show(TRUE) for modal dialogs - returns return code
 int wxDialog::ShowModal()
 {

-    if ( !IsModal() )
+    if ( !m_isModalStyle )

     {
         SetModal(TRUE);
     }
     {
         SetModal(TRUE);
     }


@@ -202,8 +203,9 @@ int wxDialog::ShowModal()
 //     dialogs and should work for both of them
 void wxDialog::EndModal(int retCode)
 {
 //     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
 }
 
 // Standard buttons