X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8aa04e8bf1638ed4d9355e560c8d718c8be4667a..1c2e6a28129dcb918b9bb1531b13de7a7e89a33c:/include/wx/motif/accel.h diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h index cd08c75f1d..156290f84a 100644 --- a/include/wx/motif/accel.h +++ b/include/wx/motif/accel.h @@ -6,7 +6,7 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_ACCEL_H_ @@ -22,6 +22,7 @@ class WXDLLEXPORT wxAcceleratorTable; +#if 0 // Hold Ctrl key down #define wxACCEL_ALT 0x01 @@ -46,12 +47,12 @@ public: m_flags = flags; m_keyCode = keyCode; m_command = cmd; } - inline void Set(int flags, int keyCode, int cmd) + void Set(int flags, int keyCode, int cmd) { m_flags = flags; m_keyCode = keyCode; m_command = cmd; } - inline int GetFlags() const { return m_flags; } - inline int GetKeyCode() const { return m_keyCode; } - inline int GetCommand() const { return m_command; } + int GetFlags() const { return m_flags; } + int GetKeyCode() const { return m_keyCode; } + int GetCommand() const { return m_command; } void operator = (const wxAcceleratorEntry& entry) { @@ -62,10 +63,11 @@ public: bool MatchesEvent(const wxKeyEvent& event) const; public: - int m_flags; - int m_keyCode; // ASCII or virtual keycode - int m_command; // Command id to generate + int m_flags; + int m_keyCode; // ASCII or virtual keycode + int m_command; // Command id to generate }; +#endif class WXDLLEXPORT wxAcceleratorTable: public wxObject { @@ -76,14 +78,14 @@ public: wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array // Copy constructors - inline wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); } - inline wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); } + wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); } + wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); } ~wxAcceleratorTable(); - inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if (*this == accel) return (*this); Ref(accel); return *this; } - inline bool operator == (const wxAcceleratorTable& accel) { return m_refData == accel.m_refData; } - inline bool operator != (const wxAcceleratorTable& accel) { return m_refData != accel.m_refData; } + 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;