X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0201182bf56889e11f925f8a6c9f967d5c598a10..bba0e4dceba0349937a44b367be9f8451b929c93:/include/wx/accel.h diff --git a/include/wx/accel.h b/include/wx/accel.h index faf7d50f88..80f35ede71 100644 --- a/include/wx/accel.h +++ b/include/wx/accel.h @@ -5,7 +5,7 @@ // Modified by: // Created: 31.05.01 (extracted from other files) // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,12 @@ enum wxACCEL_NORMAL = 0x0000, // no modifiers wxACCEL_ALT = 0x0001, // hold Alt key down wxACCEL_CTRL = 0x0002, // hold Ctrl key down - wxACCEL_SHIFT = 0x0004 // hold Shift key down + wxACCEL_SHIFT = 0x0004, // hold Shift key down +#if defined(__WXMAC__) || defined(__WXCOCOA__) + wxACCEL_CMD = 0x0008 // Command key on OS X +#else + wxACCEL_CMD = wxACCEL_CTRL +#endif }; // ---------------------------------------------------------------------------- @@ -57,12 +62,16 @@ public: , m_item(entry.m_item) { } + // create accelerator corresponding to the specified string, return NULL if + // string couldn't be parsed or a pointer to be deleted by the caller + static wxAcceleratorEntry *Create(const wxString& str); + wxAcceleratorEntry& operator=(const wxAcceleratorEntry& entry) { Set(entry.m_flags, entry.m_keyCode, entry.m_command, entry.m_item); return *this; } - + void Set(int flags, int keyCode, int cmd, wxMenuItem *item = NULL) { m_flags = flags; @@ -94,8 +103,32 @@ public: // Implementation use only bool MatchesEvent(const wxKeyEvent& event) const; #endif - + + bool IsOk() const + { + return m_flags != 0 && + m_keyCode != 0; + } + + + // string <-> wxAcceleratorEntry conversion + // ---------------------------------------- + + // returns a wxString for the this accelerator. + // this function formats it using the - format + // where maybe a hyphen-separed list of "shift|alt|ctrl" + wxString ToString() const; + + // returns true if the given string correctly initialized this object + // (i.e. if IsOk() returns true after this call) + bool FromString(const wxString& str); + + private: + // common part of Create() and FromString() + static bool ParseAccel(const wxString& str, int *flags, int *keycode); + + int m_flags; // combination of wxACCEL_XXX constants int m_keyCode; // ASCII or virtual keycode int m_command; // Command id to generate @@ -118,8 +151,10 @@ private: #include "wx/msw/accel.h" #elif defined(__WXMOTIF__) #include "wx/motif/accel.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/accel.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/accel.h" #elif defined(__WXMAC__) #include "wx/mac/accel.h" #elif defined(__WXCOCOA__) @@ -128,7 +163,7 @@ private: #include "wx/os2/accel.h" #endif -WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable; +extern WXDLLEXPORT_DATA(wxAcceleratorTable) wxNullAcceleratorTable; #endif // wxUSE_ACCEL