fixes to menu stock items support (patch 1547639)

[wxWidgets.git] / include / wx / mac / carbon / msgdlg.h

diff --git a/include/wx/mac/carbon/msgdlg.h b/include/wx/mac/carbon/msgdlg.h
index 1a869f085583be98cf468e4a5f20fbe2421bc10a..c74734d9d2910ea57d3ac1056dc6bd06f017cb33 100644 (file)
--- a/include/wx/mac/carbon/msgdlg.h
+++ b/include/wx/mac/carbon/msgdlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msgdlg.h
+// Name:        wx/mac/carbon/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,27 +13,22 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "msgdlg.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"

 #include "wx/dialog.h"
 
 /*
  * Message box dialog
  */
 
 #include "wx/dialog.h"
 
 /*
  * Message box dialog
  */
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxMessageBoxCaptionStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxMessageBoxCaptionStr[];

 
 

-class WXDLLEXPORT wxMessageDialog: public wxDialog
+class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase

 {
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 {
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)

-        
+

 protected:
     wxString    m_caption;
     wxString    m_message;
 protected:
     wxString    m_caption;
     wxString    m_message;

-    long        m_dialogStyle;

     wxWindow *  m_parent;
 public:
     wxMessageDialog(wxWindow *parent,
     wxWindow *  m_parent;
 public:
     wxMessageDialog(wxWindow *parent,


@@ -43,7 +38,8 @@ public:
                     const wxPoint& pos = wxDefaultPosition);
 
     int ShowModal();
                     const wxPoint& pos = wxDefaultPosition);
 
     int ShowModal();

-    
+
+protected:

     // not supported for message dialog, RR
     virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
                            int WXUNUSED(width), int WXUNUSED(height),
     // not supported for message dialog, RR
     virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
                            int WXUNUSED(width), int WXUNUSED(height),