Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

get rid of the now useless trackTime parameter

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19828 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2007-01-16 15:22:31 +00:00
parent ebd1a3a130
commit 68fb266820
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
headers/os/interface/Menu.h
View File

@ -190,7 +190,7 @@ virtual void _ReservedMenu6();
void InitData(BMessage *data = NULL); void InitData(BMessage *data = NULL);
bool _show(bool selectFirstItem = false); bool _show(bool selectFirstItem = false);
void _hide(); void _hide();
BMenuItem *_track(int *action, bigtime_t trackTime, long start = -1); BMenuItem *_track(int *action, long start = -1);
void _UpdateStateOpenSelect(BMenuItem *item, bigtime_t &openTime, bigtime_t &closeTime); void _UpdateStateOpenSelect(BMenuItem *item, bigtime_t &openTime, bigtime_t &closeTime);
void _UpdateStateClose(BMenuItem *item, const BPoint &where, const uint32 &buttons); void _UpdateStateClose(BMenuItem *item, const BPoint &where, const uint32 &buttons);
@ -286,7 +286,7 @@ static bool sAltAsCommandKey;
BRect *fExtraRect; BRect *fExtraRect;
float fMaxContentWidth; float fMaxContentWidth;
BPoint *fInitMatrixSize; BPoint *fInitMatrixSize;
_ExtraMenuData_ *fExtraMenuData; // !! _ExtraMenuData_ *fExtraMenuData;
uint32 _reserved[2]; uint32 _reserved[2];

6
src/kits/interface/Menu.cpp
View File

@ -1065,7 +1065,7 @@ BMenu::Track(bool sticky, BRect *clickToOpenRect)
} }
int action; int action;
BMenuItem *menuItem = _track(&action, 0); BMenuItem *menuItem = _track(&action);
SetStickyMode(false); SetStickyMode(false);
fExtraRect = NULL; fExtraRect = NULL;
@ -1244,7 +1244,7 @@ const bigtime_t kHysteresis = 200000; // TODO: Test and reduce if needed.
BMenuItem * BMenuItem *
BMenu::_track(int *action, bigtime_t trackTime, long start) BMenu::_track(int *action, long start)
{ {
// TODO: cleanup // TODO: cleanup
BMenuItem *item = NULL; BMenuItem *item = NULL;
@ -1288,7 +1288,7 @@ BMenu::_track(int *action, bigtime_t trackTime, long start)
bool wasSticky = IsStickyMode(); bool wasSticky = IsStickyMode();
if (wasSticky) if (wasSticky)
submenu->SetStickyMode(true); submenu->SetStickyMode(true);
BMenuItem *submenuItem = submenu->_track(&submenuAction, trackTime); BMenuItem *submenuItem = submenu->_track(&submenuAction);
// check if the user started holding down a mouse button in a submenu // check if the user started holding down a mouse button in a submenu
if (wasSticky && !IsStickyMode()) { if (wasSticky && !IsStickyMode()) {

2
src/kits/interface/MenuBar.cpp
View File

@ -473,7 +473,7 @@ BMenuBar::Track(int32 *action, int32 startIndex, bool showMenu)
if (wasSticky) if (wasSticky)
menu->SetStickyMode(true); menu->SetStickyMode(true);
int localAction; int localAction;
fChosenItem = menu->_track(&localAction, system_time()); fChosenItem = menu->_track(&localAction);
if (menu->State(NULL) == MENU_STATE_TRACKING && menu->IsStickyMode()) if (menu->State(NULL) == MENU_STATE_TRACKING && menu->IsStickyMode())
menu->SetStickyMode(false); menu->SetStickyMode(false);