avoid a bug in Carbon headers

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

diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h
index 290de47d1a717bd0ffcae97a7023c9ac37566034..1d05a92a99fbf8a01dc87e6432b7155f1aafaec6 100644 (file)
--- a/include/wx/generic/accel.h
+++ b/include/wx/generic/accel.h
@@ -10,7 +10,7 @@
 #ifndef _WX_GENERIC_ACCEL_H_
 #define _WX_GENERIC_ACCEL_H_
 
 #ifndef _WX_GENERIC_ACCEL_H_
 #define _WX_GENERIC_ACCEL_H_
 

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

 #pragma interface "accel.h"
 #endif
 
 #pragma interface "accel.h"
 #endif
 


@@ -24,7 +24,7 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject
 {
 public:
     wxAcceleratorTable();
 {
 public:
     wxAcceleratorTable();

-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]);
+    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);

     virtual ~wxAcceleratorTable();
 
     wxAcceleratorTable(const wxAcceleratorTable& accel)
     virtual ~wxAcceleratorTable();
 
     wxAcceleratorTable(const wxAcceleratorTable& accel)