Document lack of wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK under OS X.

[wxWidgets.git] / src / osx / carbon / msgdlg.cpp

diff --git a/src/osx/carbon/msgdlg.cpp b/src/osx/carbon/msgdlg.cpp
index a95138112e9576401575abbfd46ae5043354d6f4..808fbcc3857a10bead04885d545ed1a872207bc5 100644 (file)
--- a/src/osx/carbon/msgdlg.cpp
+++ b/src/osx/carbon/msgdlg.cpp
@@ -19,6 +19,7 @@
 #endif
 
 #include "wx/thread.h"
+#include "wx/testing.h"
 #include "wx/osx/uma.h"
 
 
@@ -30,12 +31,14 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
                                  const wxString& caption,
                                  long style,
                                  const wxPoint& WXUNUSED(pos))
-               : wxMessageDialogWithCustomLabels(parent, message, caption, style)
+               : wxMessageDialogBase(parent, message, caption, style)
 {
 }
 
 int wxMessageDialog::ShowModal()
 {
+    WX_TESTING_SHOW_MODAL_HOOK();
+
     int resultbutton = wxID_CANCEL;
 
     const long style = GetMessageDialogStyle();
@@ -69,8 +72,8 @@ int wxMessageDialog::ShowModal()
     //
     // if the extended text is not empty we ignore the caption
     // and use the message and the extended message
-    
-    
+
+
     wxString msgtitle,msgtext;
     if(m_extendedMessage.IsEmpty())
     {
@@ -216,7 +219,9 @@ int wxMessageDialog::ShowModal()
         {
             DialogRef alertRef;
             CreateStandardAlert( alertType, cfTitle, cfText, &param, &alertRef );
+            wxDialog::OSXBeginModalDialog();
             RunStandardAlert( alertRef, NULL, &result );
+            wxDialog::OSXEndModalDialog();
         }
         else
         {
@@ -264,7 +269,7 @@ int wxMessageDialog::ShowModal()
             }
         }
     }
-    
+
     SetReturnCode(resultbutton);
 
     return resultbutton;