X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/925f7740663f38ed8296ddb247754a9d62152aea..616c0d1f3ac084bb92f0a75dc48812e8647f1b22:/include/wx/motif/accel.h?ds=sidebyside diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h index f51093d326..fb90ecb0b0 100644 --- a/include/wx/motif/accel.h +++ b/include/wx/motif/accel.h @@ -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 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; // Implementation only int GetCount() const; wxAcceleratorEntry* GetEntries() const; }; -WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable; +extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable; #endif // _WX_ACCEL_H_