fixing warning and compile error against 10.4

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

diff --git a/include/wx/cocoa/msgdlg.h b/include/wx/cocoa/msgdlg.h
index 1a22cb9c2320232c58b0cb0fa91c07f5440f556e..90cfdc23e97e9d85e5c10949c77378bc84a5c453 100644 (file)
--- a/include/wx/cocoa/msgdlg.h
+++ b/include/wx/cocoa/msgdlg.h
@@ -25,26 +25,22 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSAlert);
     #endif
 #endif
 
     #endif
 #endif
 

-#include "wx/generic/msgdlgg.h"
-

 #if wxUSE_COCOA_NATIVE_MSGDLG
     #define wxMessageDialog wxCocoaMessageDialog
 #else
 #if wxUSE_COCOA_NATIVE_MSGDLG
     #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,


@@ -52,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_