X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef0e92205a01c7d0ca6f381cc690cb5d4fa595c9..b02dd12239c8a59b9a545d9fcb04974f8ad02c6b:/include/wx/accel.h?ds=inline diff --git a/include/wx/accel.h b/include/wx/accel.h index 0d3593cc28..ca2d8dfb0e 100644 --- a/include/wx/accel.h +++ b/include/wx/accel.h @@ -34,10 +34,11 @@ enum wxAcceleratorEntryFlags wxACCEL_CTRL = 0x0002, // hold Ctrl key down wxACCEL_SHIFT = 0x0004, // hold Shift key down #if defined(__WXMAC__) || defined(__WXCOCOA__) - wxACCEL_CMD = 0x0008 // Command key on OS X + wxACCEL_RAW_CTRL= 0x0008, // #else - wxACCEL_CMD = wxACCEL_CTRL + wxACCEL_RAW_CTRL= wxACCEL_CTRL, #endif + wxACCEL_CMD = wxACCEL_CTRL }; // ---------------------------------------------------------------------------- @@ -107,8 +108,7 @@ public: bool IsOk() const { - return m_flags != 0 && - m_keyCode != 0; + return m_keyCode != 0; } @@ -117,7 +117,7 @@ public: // returns a wxString for the this accelerator. // this function formats it using the - format - // where maybe a hyphen-separed list of "shift|alt|ctrl" + // where maybe a hyphen-separated list of "shift|alt|ctrl" wxString ToString() const; // returns true if the given string correctly initialized this object