X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..8d1517cef26509f5b2fca218145af4e4db7a4be2:/include/wx/mac/carbon/accel.h diff --git a/include/wx/mac/carbon/accel.h b/include/wx/mac/carbon/accel.h index 25acc73bea..742b460190 100644 --- a/include/wx/mac/carbon/accel.h +++ b/include/wx/mac/carbon/accel.h @@ -12,10 +12,6 @@ #ifndef _WX_ACCEL_H_ #define _WX_ACCEL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "accel.h" -#endif - #include "wx/string.h" #include "wx/event.h" @@ -26,23 +22,15 @@ public: wxAcceleratorTable(); wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array - // Copy constructors - wxAcceleratorTable(const wxAcceleratorTable& accel) - : wxObject() - { Ref(accel); } - wxAcceleratorTable(const wxAcceleratorTable* accel) - { if (accel) Ref(*accel); } - - ~wxAcceleratorTable(); + virtual ~wxAcceleratorTable(); - wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) - { if (*this == accel) return (*this); Ref(accel); return *this; } - bool operator == (const wxAcceleratorTable& accel) + bool operator == (const wxAcceleratorTable& accel) const { return m_refData == accel.m_refData; } - bool operator != (const wxAcceleratorTable& accel) + bool operator != (const wxAcceleratorTable& accel) const { return m_refData != accel.m_refData; } - bool Ok() const; + bool Ok() const { return IsOk(); } + bool IsOk() const; int GetCommand( wxKeyEvent &event ); };