add an assert indicating that old code overriding OnExecute() must be updated with 2.9

[wxWidgets.git] / include / wx / cocoa / msgdlg.h

diff --git a/include/wx/cocoa/msgdlg.h b/include/wx/cocoa/msgdlg.h
index af0d26b8f19ea2ca088a2ba78ddf520a18c15824..62c1d1dc7f01e9033202c41f123e1ae4939f47a2 100644 (file)
--- a/include/wx/cocoa/msgdlg.h
+++ b/include/wx/cocoa/msgdlg.h
@@ -3,6 +3,7 @@
 // Purpose:     wxMessageDialog class
 // Author:      Gareth Simpson
 // Created:     2007-10-29
+// RCS-ID:      $Id$
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -24,10 +25,11 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSAlert);
     #endif
 #endif
 
-#if defined(__WX_COMPILING_COCOA_MSGDLG_MM__) || wxUSE_COCOA_NATIVE_MSGDLG
+#include "wx/generic/msgdlgg.h"
+
+#if wxUSE_COCOA_NATIVE_MSGDLG
     #define wxMessageDialog wxCocoaMessageDialog
 #else
-    #include "wx/generic/msgdlgg.h"
     #define wxMessageDialog wxGenericMessageDialog
 #endif
 
@@ -37,7 +39,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSAlert);
 
 
 
-class WXDLLEXPORT wxCocoaMessageDialog: public wxMessageDialogBase
+class WXDLLIMPEXP_CORE wxCocoaMessageDialog: public wxMessageDialogBase
 {
     DECLARE_DYNAMIC_CLASS(wxCocoaMessageDialog)
     DECLARE_NO_COPY_CLASS(wxCocoaMessageDialog)
@@ -49,11 +51,11 @@ public:
                     const wxString& caption = wxMessageBoxCaptionStr,
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
-                                               
-       virtual ~wxCocoaMessageDialog();
 
-       virtual int ShowModal();
-       
+    virtual ~wxCocoaMessageDialog();
+
+    virtual int ShowModal();
+
     // customization of the message box
     virtual bool SetYesNoLabels(const wxString& yes,const wxString& no);
     virtual bool SetYesNoCancelLabels(const wxString& yes, const wxString& no, const wxString& cancel);
@@ -65,12 +67,12 @@ protected:
     virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
                            int WXUNUSED(width), int WXUNUSED(height),
                            int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
-       
+
 private:
-       wxString m_yes,
-                        m_no,
-                        m_ok,
-                        m_cancel;
+    wxString m_yes,
+             m_no,
+             m_ok,
+             m_cancel;
 
 };