the msw implementation even shows an ok button if it is not specified, we do the...

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

diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp
index f7a4a0a7248189ccbb5de42250e094bbcc469a35..732a2f48bac3efb2f2e7f7cb8b7ab1c88bdda580 100644 (file)
--- a/src/mac/carbon/msgdlg.cpp
+++ b/src/mac/carbon/msgdlg.cpp
@@ -120,7 +120,8 @@ int wxMessageDialog::ShowModal()
                 param.cancelButton     = 0;
             }
         }
-        else if (m_dialogStyle & wxOK)
+        // the msw implementation even shows an ok button if it is not specified, we'll do the same
+        else 
         {
             if (m_dialogStyle & wxCANCEL)
             {
@@ -142,10 +143,12 @@ int wxMessageDialog::ShowModal()
                 param.cancelButton     = 0;
             }
         }
+        /*
         else
         {
             skipDialog = true ;
         }
+        */
         
         param.position = kWindowDefaultPosition;
         if ( !skipDialog )

diff --git a/src/mac/msgdlg.cpp b/src/mac/msgdlg.cpp
index f7a4a0a7248189ccbb5de42250e094bbcc469a35..732a2f48bac3efb2f2e7f7cb8b7ab1c88bdda580 100644 (file)
--- a/src/mac/msgdlg.cpp
+++ b/src/mac/msgdlg.cpp
@@ -120,7 +120,8 @@ int wxMessageDialog::ShowModal()
                 param.cancelButton     = 0;
             }
         }
-        else if (m_dialogStyle & wxOK)
+        // the msw implementation even shows an ok button if it is not specified, we'll do the same
+        else 
         {
             if (m_dialogStyle & wxCANCEL)
             {
@@ -142,10 +143,12 @@ int wxMessageDialog::ShowModal()
                 param.cancelButton     = 0;
             }
         }
+        /*
         else
         {
             skipDialog = true ;
         }
+        */
         
         param.position = kWindowDefaultPosition;
         if ( !skipDialog )