avoid a bug in Carbon headers

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

diff --git a/include/wx/motif/msgdlg.h b/include/wx/motif/msgdlg.h
index 4275fa287406c2efa8900e16882abc72941df5c5..b8724d271fae71b2b2f6ee818f30ee5af5d6bad5 100644 (file)
--- a/include/wx/motif/msgdlg.h
+++ b/include/wx/motif/msgdlg.h
@@ -13,7 +13,7 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "msgdlg.h"
 #endif
 
 #pragma interface "msgdlg.h"
 #endif
 


@@ -29,20 +29,20 @@ WXDLLEXPORT_DATA(extern const char*) wxMessageBoxCaptionStr;
 class WXDLLEXPORT wxMessageDialog: public wxDialog
 {
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 class WXDLLEXPORT wxMessageDialog: public wxDialog
 {
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)

-
+        

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

-                    const wxString& message,
-                    const wxString& caption = wxMessageBoxCaptionStr,
-                    long style = wxOK | wxCENTRE,
-                    const wxPoint& pos = wxDefaultPosition);
-
+        const wxString& message,
+        const wxString& caption = wxMessageBoxCaptionStr,
+        long style = wxOK | wxCENTRE,
+        const wxPoint& pos = wxDefaultPosition);
+    

     int ShowModal();
     int ShowModal();

-
+    

     // implementation only from now on
     // implementation only from now on

-        // called by the Motif callback
+    // called by the Motif callback

     void SetResult(long result) { m_result = result; }
     void SetResult(long result) { m_result = result; }

-
+    

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


@@ -51,12 +51,5 @@ protected:
     long        m_result;
 };
 
     long        m_result;
 };
 

-
-int WXDLLEXPORT wxMessageBox(const wxString& message,
-                             const wxString& caption = wxMessageBoxCaptionStr,
-                             long style = wxOK | wxCENTRE,
-                             wxWindow *parent = NULL,
-                             int x = -1, int y = -1);
-

 #endif
 #endif

-    // _WX_MSGBOXDLG_H_
+// _WX_MSGBOXDLG_H_