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

diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h
index e68e66b65300bb83ef3ad9a7f158447e2f438427..a155c683be1ed01533903a3abcc25a691ef5f6c1 100644 (file)
--- 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; }
     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
     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); }
     bool operator!=(const wxAcceleratorTable& accel) const
         { return !(*this == accel); }

+#endif

 
     bool Ok() const;
     void SetHACCEL(WXHACCEL hAccel);
 
     bool Ok() const;
     void SetHACCEL(WXHACCEL hAccel);

diff --git a/include/wx/palmos/accel.h b/include/wx/palmos/accel.h
index 77dffb489968283f097ec23345d3cbd8aaf2a728..9c574247cfd89e8c8e7e730bc3cc4d3aadd35c75 100644 (file)
--- 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
 // Author:      William Osborne
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id:

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // 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; }
     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
     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); }
     bool operator!=(const wxAcceleratorTable& accel) const
         { return !(*this == accel); }

+#endif

 
     bool Ok() const;
     void SetHACCEL(WXHACCEL hAccel);
     WXHACCEL GetHACCEL() const;
 
 
     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:
     bool Translate(wxWindow *window, WXMSG *msg) const;
 
 private: