X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3399051ee9fa4dfa5fa7ac2dd9034062f4414d64..991d57f8443fc8a31c2ad3e3a8180af08a6394d6:/include/wx/motif/accel.h diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h index 8bb9608a63..d67392b8ee 100644 --- a/include/wx/motif/accel.h +++ b/include/wx/motif/accel.h @@ -12,10 +12,6 @@ #ifndef _WX_ACCEL_H_ #define _WX_ACCEL_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "accel.h" -#endif - #include "wx/object.h" #include "wx/string.h" #include "wx/event.h" @@ -27,16 +23,11 @@ public: wxAcceleratorTable(); wxAcceleratorTable(const wxString& resource); // Load from .rc resource wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array - - // Copy constructors - wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); } - wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); } - + ~wxAcceleratorTable(); - - wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if (*this == accel) return (*this); Ref(accel); return *this; } - bool operator == (const wxAcceleratorTable& accel) { return m_refData == accel.m_refData; } - bool operator != (const wxAcceleratorTable& accel) { return m_refData != accel.m_refData; } + + bool operator == (const wxAcceleratorTable& accel) const { return m_refData == accel.m_refData; } + bool operator != (const wxAcceleratorTable& accel) const { return m_refData != accel.m_refData; } bool Ok() const;