X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffc93a32d83c17e9037aefb3a7e076721a1552a8..2e4b4ec598dfd4e9b849d6f430e27d27b871b020:/include/wx/mac/accel.h diff --git a/include/wx/mac/accel.h b/include/wx/mac/accel.h index 4e227ca248..4c1e71fb44 100644 --- a/include/wx/mac/accel.h +++ b/include/wx/mac/accel.h @@ -17,23 +17,30 @@ #endif #include "wx/string.h" +#include "wx/event.h" class WXDLLEXPORT wxAcceleratorTable: public wxObject { DECLARE_DYNAMIC_CLASS(wxAcceleratorTable) public: wxAcceleratorTable(); - wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array + wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array // Copy constructors - inline wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); } - inline wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); } + wxAcceleratorTable(const wxAcceleratorTable& accel) + : wxObject() + { Ref(accel); } + wxAcceleratorTable(const wxAcceleratorTable* accel) + { if (accel) Ref(*accel); } ~wxAcceleratorTable(); - inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if (*this == accel) return (*this); Ref(accel); return *this; } - inline bool operator == (const wxAcceleratorTable& accel) { return m_refData == accel.m_refData; } - inline bool operator != (const wxAcceleratorTable& accel) { return m_refData != accel.m_refData; } + 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 Ok() const;