From: Gilles Depeyrot Date: Wed, 27 Jun 2001 21:33:41 +0000 (+0000) Subject: removed common duplicated definitions X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5601914e98040a5ff99ea46c56f4ccfa68ef198b removed common duplicated definitions git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/mac/accel.h b/include/wx/mac/accel.h index ec39737483..d55e1ea8f1 100644 --- a/include/wx/mac/accel.h +++ b/include/wx/mac/accel.h @@ -16,43 +16,8 @@ #pragma interface "accel.h" #endif -#include "wx/object.h" #include "wx/string.h" -class WXDLLEXPORT wxAcceleratorTable; - -// Hold Ctrl key down -#define wxACCEL_ALT 0x01 - -// Hold Ctrl key down -#define wxACCEL_CTRL 0x02 - - // Hold Shift key down -#define wxACCEL_SHIFT 0x04 - - // Hold no key down -#define wxACCEL_NORMAL 0x00 - -class WXDLLEXPORT wxAcceleratorEntry -{ -public: - wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0) - { - m_flags = flags; m_keyCode = keyCode; m_command = cmd; - } - - inline 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 m_flags; - int m_keyCode; // ASCII or virtual keycode - int m_command; // Command id to generate -}; - class WXDLLEXPORT wxAcceleratorTable: public wxObject { DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)