explicit app modality in SetModal

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

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 7b7bfc024b7899c5636d789022edcb6947d7ef24..cab8d1906c609fb827a1cb7879478ace7f490f46 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -78,6 +78,9 @@ void wxDialog::SetModal(bool flag)
         m_windowStyle |= wxDIALOG_MODAL;
         
         wxModelessWindows.DeleteObject(this);
         m_windowStyle |= wxDIALOG_MODAL;
         
         wxModelessWindows.DeleteObject(this);

+#if TARGET_CARBON
+        SetWindowModality( (WindowRef) MacGetWindowRef() , kWindowModalityAppModal , NULL ) ;
+#endif

     }
     else
     {
     }
     else
     {

diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp
index 7b7bfc024b7899c5636d789022edcb6947d7ef24..cab8d1906c609fb827a1cb7879478ace7f490f46 100644 (file)
--- a/src/mac/dialog.cpp
+++ b/src/mac/dialog.cpp
@@ -78,6 +78,9 @@ void wxDialog::SetModal(bool flag)
         m_windowStyle |= wxDIALOG_MODAL;
         
         wxModelessWindows.DeleteObject(this);
         m_windowStyle |= wxDIALOG_MODAL;
         
         wxModelessWindows.DeleteObject(this);

+#if TARGET_CARBON
+        SetWindowModality( (WindowRef) MacGetWindowRef() , kWindowModalityAppModal , NULL ) ;
+#endif

     }
     else
     {
     }
     else
     {