X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3399051ee9fa4dfa5fa7ac2dd9034062f4414d64..616c0d1f3ac084bb92f0a75dc48812e8647f1b22:/include/wx/motif/accel.h?ds=sidebyside diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h index 8bb9608a63..fb90ecb0b0 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: @@ -12,40 +12,29 @@ #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" -class WXDLLEXPORT wxAcceleratorTable: public wxObject +class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject { DECLARE_DYNAMIC_CLASS(wxAcceleratorTable) 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 Ok() const; - + + virtual ~wxAcceleratorTable(); + + 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_