i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/haiku/haiku

Browse Source
This commit is contained in:
Alex Wilson
2011-12-15 20:50:28 -07:00
parent 29ef6eb52d 09aaa658b0
commit a84e14ca84
4732 changed files with 115256 additions and 42332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/Menu.h
+16 -2
View File
@@ -245,7 +245,14 @@ private:
void _SetIgnoreHidden(bool on);
void _SetStickyMode(bool on);
bool _IsStickyMode() const;
void _GetIsAltCommandKey(bool &value) const;
// Methods to get the current modifier keycode
void _GetShiftKey(uint32 &value) const;
void _GetControlKey(uint32 &value) const;
void _GetCommandKey(uint32 &value) const;
void _GetOptionKey(uint32 &value) const;
void _GetMenuKey(uint32 &value) const;
void _CalcTriggers();
bool _ChooseTrigger(const char* title, int32& index,
uint32& trigger,
@@ -262,7 +269,14 @@ private:
void _QuitTracking(bool onlyThis = true);
static menu_info sMenuInfo;
static bool sAltAsCommandKey;
// Variables to keep track of what code is currently assigned to
// each modifier key
static uint32 sShiftKey;
static uint32 sControlKey;
static uint32 sOptionKey;
static uint32 sCommandKey;
static uint32 sMenuKey;
BMenuItem* fChosenItem;
BList fItems;