From 68fb266820911697f0f32ac91fbca0eefbd6230a Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Tue, 16 Jan 2007 15:22:31 +0000 Subject: [PATCH] get rid of the now useless trackTime parameter git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19828 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/interface/Menu.h | 4 ++-- src/kits/interface/Menu.cpp | 6 +++--- src/kits/interface/MenuBar.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/headers/os/interface/Menu.h b/headers/os/interface/Menu.h index 92b5ddeeb3..338a1e190f 100644 --- a/headers/os/interface/Menu.h +++ b/headers/os/interface/Menu.h @@ -190,7 +190,7 @@ virtual void _ReservedMenu6(); void InitData(BMessage *data = NULL); bool _show(bool selectFirstItem = false); 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 _UpdateStateClose(BMenuItem *item, const BPoint &where, const uint32 &buttons); @@ -286,7 +286,7 @@ static bool sAltAsCommandKey; BRect *fExtraRect; float fMaxContentWidth; BPoint *fInitMatrixSize; - _ExtraMenuData_ *fExtraMenuData; // !! + _ExtraMenuData_ *fExtraMenuData; uint32 _reserved[2]; diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp index 91cc9c8577..239ee9dd81 100644 --- a/src/kits/interface/Menu.cpp +++ b/src/kits/interface/Menu.cpp @@ -1065,7 +1065,7 @@ BMenu::Track(bool sticky, BRect *clickToOpenRect) } int action; - BMenuItem *menuItem = _track(&action, 0); + BMenuItem *menuItem = _track(&action); SetStickyMode(false); fExtraRect = NULL; @@ -1244,7 +1244,7 @@ const bigtime_t kHysteresis = 200000; // TODO: Test and reduce if needed. BMenuItem * -BMenu::_track(int *action, bigtime_t trackTime, long start) +BMenu::_track(int *action, long start) { // TODO: cleanup BMenuItem *item = NULL; @@ -1288,7 +1288,7 @@ BMenu::_track(int *action, bigtime_t trackTime, long start) bool wasSticky = IsStickyMode(); if (wasSticky) 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 if (wasSticky && !IsStickyMode()) { diff --git a/src/kits/interface/MenuBar.cpp b/src/kits/interface/MenuBar.cpp index 7014b7eef5..02f1f2719e 100644 --- a/src/kits/interface/MenuBar.cpp +++ b/src/kits/interface/MenuBar.cpp @@ -473,7 +473,7 @@ BMenuBar::Track(int32 *action, int32 startIndex, bool showMenu) if (wasSticky) menu->SetStickyMode(true); int localAction; - fChosenItem = menu->_track(&localAction, system_time()); + fChosenItem = menu->_track(&localAction); if (menu->State(NULL) == MENU_STATE_TRACKING && menu->IsStickyMode()) menu->SetStickyMode(false);