Remove wxRTTI macro for wxComboBox from Motif port.

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

diff --git a/include/wx/cocoa/msgdlg.h b/include/wx/cocoa/msgdlg.h
index 7b69bf6e5037e5785fac1e8d03388d5d1ddb643d..bfea16092d82061c8c854366083aed6c48719b53 100644 (file)
--- a/include/wx/cocoa/msgdlg.h
+++ b/include/wx/cocoa/msgdlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/cocoa/dirdlg.h
+// Name:        wx/cocoa/msgdlg.h

 // Purpose:     wxMessageDialog class
 // Author:      Gareth Simpson
 // Created:     2007-10-29
 // Purpose:     wxMessageDialog class
 // Author:      Gareth Simpson
 // Created:     2007-10-29


@@ -25,25 +25,22 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSAlert);
     #endif
 #endif
 
     #endif
 #endif
 

-#if defined(__WX_COMPILING_COCOA_MSGDLG_MM__) || wxUSE_COCOA_NATIVE_MSGDLG
+#if wxUSE_COCOA_NATIVE_MSGDLG

     #define wxMessageDialog wxCocoaMessageDialog
 #else
     #include "wx/generic/msgdlgg.h"
     #define wxMessageDialog wxCocoaMessageDialog
 #else
     #include "wx/generic/msgdlgg.h"

+

     #define wxMessageDialog wxGenericMessageDialog
 #endif
 
     #define wxMessageDialog wxGenericMessageDialog
 #endif
 

-//-------------------------------------------------------------------------
-// wxMsgDialog
-//-------------------------------------------------------------------------
-
+// ----------------------------------------------------------------------------
+// wxCocoaMessageDialog
+// ----------------------------------------------------------------------------

 
 
 
 

-class WXDLLEXPORT wxCocoaMessageDialog: public wxMessageDialogBase
+class WXDLLIMPEXP_CORE wxCocoaMessageDialog
+    : public wxMessageDialogWithCustomLabels

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxCocoaMessageDialog)
-    DECLARE_NO_COPY_CLASS(wxCocoaMessageDialog)
-
-

 public:
     wxCocoaMessageDialog(wxWindow *parent,
                     const wxString& message,
 public:
     wxCocoaMessageDialog(wxWindow *parent,
                     const wxString& message,


@@ -51,28 +48,23 @@ public:
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
 
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
 

-    virtual ~wxCocoaMessageDialog();
-

     virtual int ShowModal();
 
     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);
-    virtual bool SetOKLabel(const wxString& ok);
-    virtual bool SetOKCancelLabels(const wxString& ok, const wxString& cancel);
-

 protected:
     // not supported for message dialog
     virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
                            int WXUNUSED(width), int WXUNUSED(height),
                            int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
 
 protected:
     // not supported for message dialog
     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;
+    // override wxMessageDialogWithCustomLabels method to get rid of
+    // accelerators in the custom label strings
+    //
+    // VZ: I have no idea _why_ do we do this but the old version did and
+    //     I didn't want to change the existing behaviour
+    virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label);

 
 

+    DECLARE_DYNAMIC_CLASS(wxCocoaMessageDialog)
+    wxDECLARE_NO_COPY_CLASS(wxCocoaMessageDialog);

 };
 
 #endif // _WX_MSGDLG_H_
 };
 
 #endif // _WX_MSGDLG_H_