Small fixes after wxHtmlTagHandler::GetParser() addition.

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

diff --git a/include/wx/osx/msgdlg.h b/include/wx/osx/msgdlg.h
index 00b54b7df0962291b5ba5452b698bf1e11e2e199..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
 // 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_
 
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 

-class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogWithCustomLabels
+class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase

 {
 public:
     wxMessageDialog(wxWindow *parent,
 {
 public:
     wxMessageDialog(wxWindow *parent,


@@ -22,8 +22,12 @@ public:
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
 
                     long style = wxOK|wxCENTRE,
                     const wxPoint& pos = wxDefaultPosition);
 

-    virtual int ShowModal();
+#if wxOSX_USE_COCOA
+    ~wxMessageDialog();
+#endif

     
     

+    virtual int ShowModal();
+

 #if wxOSX_USE_COCOA
     virtual void ShowWindowModal();
     virtual void ModalFinishedCallback(void* panel, int resultCode);
 #if wxOSX_USE_COCOA
     virtual void ShowWindowModal();
     virtual void ModalFinishedCallback(void* panel, int resultCode);


@@ -39,9 +43,12 @@ protected:
     void* ConstructNSAlert();
 #endif
 
     void* ConstructNSAlert();
 #endif
 

-    int m_buttonId[3];
+    int m_buttonId[4];

     int m_buttonCount;
 
     int m_buttonCount;
 

+#if wxOSX_USE_COCOA
+    WX_NSObject m_sheetDelegate;
+#endif

     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 };