X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..7737e2fd004685a23b18035545e3ed46515aab8a:/include/wx/motif/accel.h diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h index d67392b8ee..5ae1a3a2fa 100644 --- a/include/wx/motif/accel.h +++ b/include/wx/motif/accel.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: accel.h +// Name: wx/motif/accel.h // Purpose: wxAcceleratorTable class // Author: Julian Smart // Modified by: @@ -16,7 +16,7 @@ #include "wx/string.h" #include "wx/event.h" -class WXDLLEXPORT wxAcceleratorTable: public wxObject +class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject { DECLARE_DYNAMIC_CLASS(wxAcceleratorTable) public: @@ -24,19 +24,17 @@ public: wxAcceleratorTable(const wxString& resource); // Load from .rc resource wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array - ~wxAcceleratorTable(); + virtual ~wxAcceleratorTable(); + + bool Ok() const { return IsOk(); } + bool IsOk() const; - 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; - // Implementation only int GetCount() const; wxAcceleratorEntry* GetEntries() const; }; -WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable; +WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable; #endif // _WX_ACCEL_H_