diff --git a/include/wx/cocoa/msgdlg.h b/include/wx/cocoa/msgdlg.h
index 894fda2c50..ab4e4e06b7 100644
--- a/include/wx/cocoa/msgdlg.h
+++ b/include/wx/cocoa/msgdlg.h
@@ -24,10 +24,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 +38,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSAlert);
 
 
 
-class WXDLLEXPORT wxCocoaMessageDialog: public wxMessageDialogBase
+class WXDLLEXPORT wxCocoaMessageDialog: public wxDialog, public wxMessageDialogBase
 {
     DECLARE_DYNAMIC_CLASS(wxCocoaMessageDialog)
     DECLARE_NO_COPY_CLASS(wxCocoaMessageDialog)
@@ -66,6 +67,10 @@ protected:
                            int WXUNUSED(width), int WXUNUSED(height),
                            int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
 	
+    // 2.8: These are in the base class in trunk:
+    wxString m_message,
+             m_extendedMessage,
+             m_caption;
 private:
 	wxString m_yes,
 			 m_no,
diff --git a/src/cocoa/msgdlg.mm b/src/cocoa/msgdlg.mm
index cf026bbb4f..55cc1e45fa 100644
--- a/src/cocoa/msgdlg.mm
+++ b/src/cocoa/msgdlg.mm
@@ -46,7 +46,7 @@ wxCocoaMessageDialog::wxCocoaMessageDialog(wxWindow *parent,
                         const wxString& message,
                         const wxString& caption,
                         long style,
-						const wxPoint& pos) : wxMessageDialogBase(parent,message,caption,style)
+						const wxPoint& pos) : wxDialog(parent,message,caption,style)
 {
 
 	//m_caption = caption;