X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bcf1fa6bb46c38751072a1b5294bbd803ceb657e..799a341cc390e42c04b5705e316a406ee9bc713d:/include/wx/gtk1/accel.h diff --git a/include/wx/gtk1/accel.h b/include/wx/gtk1/accel.h index 44bfd043ae..4066849bea 100644 --- a/include/wx/gtk1/accel.h +++ b/include/wx/gtk1/accel.h @@ -1,9 +1,8 @@ ///////////////////////////////////////////////////////////////////////////// // Name: accel.h // Purpose: wxAcceleratorTable class -// Author: Robert -// Modified by: -// RCS-ID: +// Author: Robert Roebling +// RCS-ID: $Id$ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,6 +15,9 @@ #endif #include "wx/defs.h" + +#if wxUSE_ACCEL + #include "wx/object.h" #include "wx/event.h" @@ -52,7 +54,7 @@ extern wxAcceleratorTable wxNullAcceleratorTable; // wxAcceleratorEntry //----------------------------------------------------------------------------- -class wxAcceleratorEntry +class wxAcceleratorEntry: public wxObject { public: @@ -84,16 +86,16 @@ class wxAcceleratorTable: public wxObject wxAcceleratorTable(int n, wxAcceleratorEntry entries[] ); ~wxAcceleratorTable(); - inline wxAcceleratorTable(const wxAcceleratorTable& accel) + inline wxAcceleratorTable(const wxAcceleratorTable& accel) : wxObject() { Ref(accel); } inline wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); } - inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) - { if (*this == accel) return (*this); Ref(accel); return *this; } - inline bool operator == (const wxAcceleratorTable& accel) + inline bool operator == (const wxAcceleratorTable& accel) { return m_refData == accel.m_refData; } inline bool operator != (const wxAcceleratorTable& accel) { return m_refData != accel.m_refData; } + inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) + { if (*this == accel) return (*this); Ref(accel); return *this; } bool Ok() const; @@ -104,3 +106,5 @@ class wxAcceleratorTable: public wxObject }; #endif + +#endif