X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..d44d0cbd7343e36ddd3657dd97cd5eb7018d2585:/include/wx/generic/accel.h diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h index 4ba1dc4300..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_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "accel.h" #endif @@ -33,10 +33,12 @@ public: 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;