From 767e3be0fa755e435a070d145fa623e36762d7a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 8 Dec 2004 17:17:37 +0000 Subject: [PATCH] Fix to FIXME: better nothing than broken comparison. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/accel.h | 5 ++++- include/wx/palmos/accel.h | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h index e68e66b653..a155c683be 100644 --- a/include/wx/msw/accel.h +++ b/include/wx/msw/accel.h @@ -38,10 +38,13 @@ public: virtual ~wxAcceleratorTable(); wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if ( *this != accel ) 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; void SetHACCEL(WXHACCEL hAccel); diff --git a/include/wx/palmos/accel.h b/include/wx/palmos/accel.h index 77dffb4899..9c574247cf 100644 --- a/include/wx/palmos/accel.h +++ b/include/wx/palmos/accel.h @@ -4,7 +4,7 @@ // Author: William Osborne // Modified by: // Created: 10/13/04 -// RCS-ID: $Id: +// RCS-ID: $Id: // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -38,16 +38,19 @@ public: virtual ~wxAcceleratorTable(); wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if ( *this != accel ) 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; void SetHACCEL(WXHACCEL hAccel); WXHACCEL GetHACCEL() const; - // translate the accelerator, return TRUE if done + // translate the accelerator, return true if done bool Translate(wxWindow *window, WXMSG *msg) const; private: -- 2.45.2