X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbac5ccc54e900ac574efb626e77789fac465361..f40f8e17226c2080dec017e2043fe59e2d21e15b:/interface/wx/menuitem.h?ds=sidebyside
diff --git a/interface/wx/menuitem.h b/interface/wx/menuitem.h
index 577db5498c..83b96c7c77 100644
--- a/interface/wx/menuitem.h
+++ b/interface/wx/menuitem.h
@@ -307,7 +307,7 @@ public:
@onlyfor{wxmsw}
*/
- void SetBackgroundColour(const wxColour& colour) const;
+ void SetBackgroundColour(const wxColour& colour);
/**
Sets the bitmap for the menu item.
@@ -362,9 +362,16 @@ public:
Optionally you can specify also an accelerator string appending a tab character
\\t followed by a valid key combination (e.g. CTRL+V).
- Its general syntax is any combination of @c "CTRL", @c "ALT" and @c "SHIFT" strings
- (case doesn't matter) separated by either @c '-' or @c '+' characters and followed
- by the accelerator itself.
+ Its general syntax is any combination of @c "CTRL", @c "RAWCTRL", @c
+ "ALT" and @c "SHIFT" strings (case doesn't matter) separated by either
+ @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
(from F1 to F12) or one of the special characters listed in the table
below (again, case doesn't matter):
@@ -402,7 +409,7 @@ public:
@onlyfor{wxmsw}
*/
- void SetMarginWidth(int width) const;
+ void SetMarginWidth(int width);
/**
Sets the parent menu which will contain this menu item.