allow wxDialog::ShowModal() after Show() (see #1416, #4658, #4664)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-22 14:40:25 +00:00
parent 809ca837f6
commit dc28b8564e
4 changed files with 14 additions and 6 deletions
--- a/src/osx/carbon/dialog.cpp
+++ b/src/osx/carbon/dialog.cpp
@@ -169,7 +169,10 @@ int wxDialog::ShowModal()
    if ( !m_isModalStyle )
        SetModal(true);

-    Show(true);
+    if ( IsShown() )
+        DoShowModal();
+    else
+        Show(true);

    return GetReturnCode();
 }