guarding agains NULL

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

diff --git a/include/wx/osx/msgdlg.h b/include/wx/osx/msgdlg.h
index 4ec95ea4a6d3e2791192f2b6a272881dc62d1944..9c3d38067dca082a9f6f61926f7aa0643b84f45c 100644 (file)
--- a/include/wx/osx/msgdlg.h
+++ b/include/wx/osx/msgdlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/msgdlg.h
+// Name:        wx/osx/msgdlg.h
 // Purpose:     wxMessageDialog class. Use generic version if no
 //              platform-specific implementation.
 // Author:      Stefan Csomor
@@ -13,7 +13,7 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
-class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogWithCustomLabels
+class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
 {
 public:
     wxMessageDialog(wxWindow *parent,
@@ -22,14 +22,33 @@ public:
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
 
+#if wxOSX_USE_COCOA
+    ~wxMessageDialog();
+#endif
+    
     virtual int ShowModal();
 
+#if wxOSX_USE_COCOA
+    virtual void ShowWindowModal();
+    virtual void ModalFinishedCallback(void* panel, int resultCode);
+#endif
+
 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) {}
 
+#if wxOSX_USE_COCOA
+    void* ConstructNSAlert();
+#endif
+
+    int m_buttonId[4];
+    int m_buttonCount;
+
+#if wxOSX_USE_COCOA
+    WX_NSObject m_sheetDelegate;
+#endif
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 };