* Use wxTopLevelWindow::Show() for modeless dialogs

* Maintain m_isShown for modal dialogs

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

diff --git a/src/cocoa/dialog.mm b/src/cocoa/dialog.mm
index 635487ceeb09aacca0ee1745227d41c89d7361d6..a2c3612bf588f6669598a3841874091ad7536848 100644 (file)
--- a/src/cocoa/dialog.mm
+++ b/src/cocoa/dialog.mm
@@ -105,10 +105,13 @@ void wxDialog::SetModal(bool flag)
 
 bool wxDialog::Show(bool show)
 {
 
 bool wxDialog::Show(bool show)
 {

+    if(m_isShown == show)
+        return false;

     if(show)
         InitDialog();
     if(IsModal())
     {
     if(show)
         InitDialog();
     if(IsModal())
     {

+        m_isShown = show;

         if(show)
         {
             wxAutoNSAutoreleasePool pool;
         if(show)
         {
             wxAutoNSAutoreleasePool pool;


@@ -124,6 +127,8 @@ bool wxDialog::Show(bool show)
             wxModalDialogs.DeleteObject(this);
         }
     }
             wxModalDialogs.DeleteObject(this);
         }
     }

+    else
+        return wxTopLevelWindow::Show(show);

     return true;
 }
 
     return true;
 }