X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/mac/carbon/accel.h diff --git a/include/wx/mac/carbon/accel.h b/include/wx/mac/carbon/accel.h index 9702282af9..5a81d61840 100644 --- a/include/wx/mac/carbon/accel.h +++ b/include/wx/mac/carbon/accel.h @@ -15,26 +15,22 @@ #include "wx/string.h" #include "wx/event.h" -class WXDLLEXPORT wxAcceleratorTable: public wxObject +class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject { DECLARE_DYNAMIC_CLASS(wxAcceleratorTable) public: wxAcceleratorTable(); wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array - ~wxAcceleratorTable(); + virtual ~wxAcceleratorTable(); - 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; + bool Ok() const { return IsOk(); } + bool IsOk() const; int GetCommand( wxKeyEvent &event ); }; -// WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable; +// WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable; #endif // _WX_ACCEL_H_