X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa03793d3bf2b76a753483ddf12abfd35eebe7a0..d44d0cbd7343e36ddd3657dd97cd5eb7018d2585:/include/wx/generic/accel.h?ds=inline

diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h
index bdd4ff8a85..5bccb069a9 100644
--- 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_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "accel.h"
 #endif
 
@@ -24,18 +24,21 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject
 {
 public:
     wxAcceleratorTable();
-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]);
+    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
     virtual ~wxAcceleratorTable();
 
     wxAcceleratorTable(const wxAcceleratorTable& accel)
-      { Ref(accel); }
+        : wxObject()
+        { Ref(accel); }
     wxAcceleratorTable& operator=(const wxAcceleratorTable& accel)
       { if ( m_refData != accel.m_refData ) Ref(accel); return *this; }
 
+#if WXWIN_COMPATIBILITY_2_4
     bool operator==(const wxAcceleratorTable& accel) const
-        { return m_refData == accel.m_refData; } // FIXME: this is wrong (VZ)
+        { return m_refData == accel.m_refData; }
     bool operator!=(const wxAcceleratorTable& accel) const
         { return !(*this == accel); }
+#endif
 
     bool Ok() const;