avoid a bug in Carbon headers

[wxWidgets.git] / include / wx / generic / msgdlgg.h

diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h
index 62dddb1b876522384fc50c6dceaf9ce61a562c12..521f5586fa8340c0c6152afdd8159de105ee07d2 100644 (file)
--- a/include/wx/generic/msgdlgg.h
+++ b/include/wx/generic/msgdlgg.h
@@ -12,7 +12,7 @@
 #ifndef __MSGDLGH_G__
 #define __MSGDLGH_G__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "msgdlgg.h"
 #endif
 
@@ -29,26 +29,22 @@ class WXDLLEXPORT wxGenericMessageDialog: public wxDialog
 DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog)
 
 public:
-    wxGenericMessageDialog(wxWindow *parent, const wxString& message, 
+    wxGenericMessageDialog(wxWindow *parent, const wxString& message,
         const wxString& caption = wxMessageBoxCaptionStr,
         long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     void OnYes(wxCommandEvent& event);
     void OnNo(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
-    
+
 private:
-    int     m_dialogStyle;
+    long m_dialogStyle;
 
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
-#if !defined( __WXMSW__ ) && !defined( __WXMAC__)
+#if (!defined( __WXMSW__ ) && !defined( __WXMAC__) && !defined(__WXPM__)) || defined(__WXUNIVERSAL__)
 #define wxMessageDialog wxGenericMessageDialog
-
-int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, 
-  long style = wxOK|wxCENTRE, wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1);
-
 #endif
 
 #endif