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

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

diff --git a/include/wx/palmos/accel.h b/include/wx/palmos/accel.h
index 77dffb489968283f097ec23345d3cbd8aaf2a728..9cc3f02552db73cb79f827f7dff33438663325ac 100644 (file)
--- a/include/wx/palmos/accel.h
+++ b/include/wx/palmos/accel.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/accel.h
 // Purpose:     wxAcceleratorTable class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/accel.h
 // Purpose:     wxAcceleratorTable class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // 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: