X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/motif/accel.h diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h index 41dea67575..7753ac9d68 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,10 +12,6 @@ #ifndef _WX_ACCEL_H_ #define _WX_ACCEL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "accel.h" -#endif - #include "wx/object.h" #include "wx/string.h" #include "wx/event.h" @@ -27,19 +23,12 @@ 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;