added wxMOTIF_STR() macro casting away string literal constness for use with Motif...

[wxWidgets.git] / include / wx / generic / accel.h

diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h
index 1d05a92a99fbf8a01dc87e6432b7155f1aafaec6..5bccb069a974216b1535e4d091e6f3081e2f2c6e 100644 (file)
--- a/include/wx/generic/accel.h
+++ b/include/wx/generic/accel.h
@@ -33,10 +33,12 @@ public:
     wxAcceleratorTable& operator=(const wxAcceleratorTable& accel)
       { if ( m_refData != accel.m_refData ) Ref(accel); return *this; }
 
     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
     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;
 
 
     bool Ok() const;