X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/767e3be0fa755e435a070d145fa623e36762d7a8..e22cf4b310aa1cac5f21879823aa26be4c804c24:/include/wx/palmos/accel.h?ds=sidebyside diff --git a/include/wx/palmos/accel.h b/include/wx/palmos/accel.h index 9c574247cf..f47b035a5f 100644 --- a/include/wx/palmos/accel.h +++ b/include/wx/palmos/accel.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/palmos/accel.h // Purpose: wxAcceleratorTable class -// Author: William Osborne +// Author: William Osborne - minimal working wxPalmOS port // Modified by: // Created: 10/13/04 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,10 +12,6 @@ #ifndef _WX_ACCEL_H_ #define _WX_ACCEL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "accel.h" -#endif - // ---------------------------------------------------------------------------- // the accel table has all accelerators for a given window or menu // ---------------------------------------------------------------------------- @@ -26,9 +22,6 @@ public: // default ctor wxAcceleratorTable(); - // copy ctor - wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); } - // load from .rc resource (Windows specific) wxAcceleratorTable(const wxString& resource); @@ -37,16 +30,8 @@ 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; } - bool operator!=(const wxAcceleratorTable& accel) const - { return !(*this == accel); } -#endif - - bool Ok() const; + bool Ok() const { return IsOk(); } + bool IsOk() const; void SetHACCEL(WXHACCEL hAccel); WXHACCEL GetHACCEL() const;