X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..87cc1cc772c106ebd7e9bae9941ed2c002f4706a:/include/wx/generic/accel.h?ds=sidebyside diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h index 4ba1dc4300..5bcdf83099 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_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "accel.h" -#endif - class WXDLLEXPORT wxKeyEvent; // ---------------------------------------------------------------------------- @@ -27,16 +23,12 @@ public: wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); virtual ~wxAcceleratorTable(); - wxAcceleratorTable(const wxAcceleratorTable& 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;