X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1d63b79352db5290a9f86428d193bd6a08ef32f..23b4f32040409166e2ee53314c5b27c593982c0a:/include/wx/palmos/accel.h?ds=sidebyside diff --git a/include/wx/palmos/accel.h b/include/wx/palmos/accel.h index 9cc3f02552..4f82696b8d 100644 --- a/include/wx/palmos/accel.h +++ b/include/wx/palmos/accel.h @@ -12,23 +12,16 @@ #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 // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxAcceleratorTable : public wxObject +class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject { 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;