X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e55ad60e195f1007db921b2a73a3cac98ed9df65..354aa1e366a57d896e2cf0943c687b24e8db688c:/include/wx/gtk1/accel.h diff --git a/include/wx/gtk1/accel.h b/include/wx/gtk1/accel.h index 3f7ce4056e..a60eb15e98 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" @@ -54,8 +56,7 @@ extern wxAcceleratorTable wxNullAcceleratorTable; class wxAcceleratorEntry: public wxObject { - public: - +public: wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0) { m_flags = flags; m_keyCode = keyCode; m_command = cmd; } @@ -77,30 +78,32 @@ class wxAcceleratorEntry: public wxObject class wxAcceleratorTable: public wxObject { - DECLARE_DYNAMIC_CLASS(wxAcceleratorTable) - - public: +public: wxAcceleratorTable(); 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; -// private: +// implementation - int GetCommand( wxKeyEvent &event ); + int GetCommand( wxKeyEvent &event ); +private: + DECLARE_DYNAMIC_CLASS(wxAcceleratorTable) }; #endif + +#endif