X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa03793d3bf2b76a753483ddf12abfd35eebe7a0..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/generic/accel.h

diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h
index bdd4ff8a85..a17e5a3ef9 100644
--- a/include/wx/generic/accel.h
+++ b/include/wx/generic/accel.h
@@ -10,34 +10,21 @@
 #ifndef _WX_GENERIC_ACCEL_H_
 #define _WX_GENERIC_ACCEL_H_
 
-#ifdef __GNUG__
-#pragma interface "accel.h"
-#endif
-
-class WXDLLEXPORT wxKeyEvent;
+class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
 
 // ----------------------------------------------------------------------------
 // wxAcceleratorTable
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxAcceleratorTable : public wxObject
+class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject
 {
 public:
     wxAcceleratorTable();
-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]);
+    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
     virtual ~wxAcceleratorTable();
 
-    wxAcceleratorTable(const wxAcceleratorTable& accel)
-      { Ref(accel); }
-    wxAcceleratorTable& operator=(const wxAcceleratorTable& accel)
-      { if ( m_refData != accel.m_refData ) Ref(accel); return *this; }
-
-    bool operator==(const wxAcceleratorTable& accel) const
-        { return m_refData == accel.m_refData; } // FIXME: this is wrong (VZ)
-    bool operator!=(const wxAcceleratorTable& accel) const
-        { return !(*this == accel); }
-
-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;
 
     void Add(const wxAcceleratorEntry& entry);
     void Remove(const wxAcceleratorEntry& entry);