X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/944f641cf9e822770d667be45926e58deb339482..fceac6bbfe23180d460ef62dac83c591d9e0f941:/interface/wx/accel.h diff --git a/interface/wx/accel.h b/interface/wx/accel.h index e60430af76..580d30033d 100644 --- a/interface/wx/accel.h +++ b/interface/wx/accel.h @@ -16,13 +16,16 @@ enum wxAcceleratorEntryFlags /** hold Alt key down */ wxACCEL_ALT, - /** hold Ctrl key down */ + /** hold Ctrl key down, corresponds to Command key on OS X */ wxACCEL_CTRL, /** hold Shift key down */ wxACCEL_SHIFT, - /** Command key on OS X; identic to wxACCEL_CTRL on other platforms. */ + /** corresponds to real Ctrl key on OS X, identic to @c wxACCEL_CTRL on other platforms */ + wxACCEL_RAW_CTRL, + + /** deprecated, identic to @c wxACCEL_CTRL on all platforms. */ wxACCEL_CMD }; @@ -119,7 +122,10 @@ public: ToString(), i.e. contain the accelerator itself only, or have the format of a full menu item text with i.e. Label TAB Accelerator. In the latter case, the part of the string - before the TAB is ignored. + before the TAB is ignored. Notice that the latter format is only + supported for the compatibility with the previous wxWidgets + versions and the new code should pass only the accelerator string + itself to this function. @return @true if the given string correctly initialized this object (i.e. if IsOk() returns true after this call)