X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..164a797204e4738fceac9ad0d3ef2b0ffffae8cb:/include/wx/generic/accel.h diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h index 290de47d1a..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_ -#ifdef __GNUG__ -#pragma interface "accel.h" -#endif - class WXDLLEXPORT wxKeyEvent; // ---------------------------------------------------------------------------- @@ -24,19 +20,15 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject { public: wxAcceleratorTable(); - wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); + 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;