Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Document "raw control" use with accelerators.

Browse Source 
Mention it in the places where the other accelerator prefixes are documented.

See #13496.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-05-23 21:16:28 +00:00
parent 1a692f0f22
commit 5ec18516f6
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/wx/accel.h
View File

@@ -108,7 +108,7 @@ public:
/** /**
Returns a textual representation of this accelerator. Returns a textual representation of this accelerator.
The returned string is of the form <code>[Alt+][Ctrl+][Shift+]Key</code> The returned string is of the form <code>[Alt+][Ctrl+][RawCtrl+][Shift+]Key</code>
where the modifier keys are present only if the corresponding flag is where the modifier keys are present only if the corresponding flag is
set. set.
*/ */

13
interface/wx/menuitem.h
View File

@@ -362,9 +362,16 @@ public:
Optionally you can specify also an accelerator string appending a tab character Optionally you can specify also an accelerator string appending a tab character
<tt>\\t</tt> followed by a valid key combination (e.g. <tt>CTRL+V</tt>). <tt>\\t</tt> followed by a valid key combination (e.g. <tt>CTRL+V</tt>).
Its general syntax is any combination of @c "CTRL", @c "ALT" and @c "SHIFT" strings Its general syntax is any combination of @c "CTRL", @c "RAWCTRL", @c
(case doesn't matter) separated by either @c '-' or @c '+' characters and followed "ALT" and @c "SHIFT" strings (case doesn't matter) separated by either
by the accelerator itself. @c '-' or @c '+' characters and followed by the accelerator itself.
Notice that @c CTRL corresponds to the "Ctrl" key on most platforms but
not under Mac OS where it is mapped to "Cmd" key on Mac keyboard.
Usually this is exactly what you want in portable code but if you
really need to use the (rarely used for this purpose) "Ctrl" key even
under Mac, you may use @c RAWCTRL to prevent this mapping. Under the
other platforms @c RAWCTRL is the same as plain @c CTRL.
The accelerator may be any alphanumeric character, any function key The accelerator may be any alphanumeric character, any function key
(from F1 to F12) or one of the special characters listed in the table (from F1 to F12) or one of the special characters listed in the table
below (again, case doesn't matter): below (again, case doesn't matter):