X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21aeca5e542b8f38d58c6308fdf0e94a4e9671a6..6b5a2b6fe96bb791c685c671f348d2710e4a4ab4:/include/wx/generic/accel.h

diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h
index 76e2f9369c..f69636a5b5 100644
--- a/include/wx/generic/accel.h
+++ b/include/wx/generic/accel.h
@@ -10,10 +10,6 @@
 #ifndef _WX_GENERIC_ACCEL_H_
 #define _WX_GENERIC_ACCEL_H_
 
-#ifdef __GNUG__
-#pragma interface "accel.h"
-#endif
-
 class WXDLLEXPORT wxKeyEvent;
 
 // ----------------------------------------------------------------------------
@@ -24,18 +20,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;
 
@@ -50,6 +49,11 @@ public:
 
     const wxAcceleratorEntry *GetEntry(const wxKeyEvent& event) const;
 
+protected:
+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 };