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

Renamed some private methods to have the underline prefix, now that

Browse Source 
BWindow doesn't call them directly anymore.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24911 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2008-04-11 08:53:25 +00:00
parent 150ddd17b1
commit 18af47f5c4
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,10 +236,9 @@ private:
bool _CustomTrackingWantsToQuit();
// private methods called by BWindow
int State(BMenuItem** _item = NULL) const;
void InvokeItem(BMenuItem* item, bool now = false);
void QuitTracking(bool onlyThis = true);
int _State(BMenuItem** _item = NULL) const;
void _InvokeItem(BMenuItem* item, bool now = false);
void _QuitTracking(bool onlyThis = true);
static menu_info sMenuInfo;
static bool sAltAsCommandKey;

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

@ -869,13 +869,13 @@ BMenu::KeyDown(const char *bytes, int32 numBytes)
case B_ENTER:
case B_SPACE:
if (fSelected) {
InvokeItem(fSelected);
QuitTracking(false);
_InvokeItem(fSelected);
_QuitTracking(false);
}
break;
case B_ESCAPE:
QuitTracking();
_QuitTracking();
break;
default:
@ -887,7 +887,7 @@ BMenu::KeyDown(const char *bytes, int32 numBytes)
if (item->fTriggerIndex < 0 || item->fTrigger != trigger)
continue;
InvokeItem(item);
_InvokeItem(item);
}
break;
}
@ -2135,20 +2135,20 @@ BMenu::_DrawItems(BRect updateRect)
int
BMenu::State(BMenuItem **item) const
BMenu::_State(BMenuItem **item) const
{
if (fState == MENU_STATE_TRACKING || fState == MENU_STATE_CLOSED)
return fState;
if (fSelected != NULL && fSelected->Submenu() != NULL)
return fSelected->Submenu()->State(item);
return fSelected->Submenu()->_State(item);
return fState;
}
void
BMenu::InvokeItem(BMenuItem *item, bool now)
BMenu::_InvokeItem(BMenuItem *item, bool now)
{
if (!item->IsEnabled())
return;
@ -2564,7 +2564,7 @@ BMenu::_CustomTrackingWantsToQuit()
void
BMenu::QuitTracking(bool onlyThis)
BMenu::_QuitTracking(bool onlyThis)
{
_SelectItem(NULL);
if (BMenuBar *menuBar = dynamic_cast<BMenuBar *>(this))
@ -2692,7 +2692,7 @@ MenuPrivate::IsAltCommandKey() const
int
MenuPrivate::State(BMenuItem **item) const
{
return fMenu->State(item);
return fMenu->_State(item);
}
@ -2727,14 +2727,14 @@ MenuPrivate::SetSuperItem(BMenuItem *item)
void
MenuPrivate::InvokeItem(BMenuItem *item, bool now)
{
fMenu->InvokeItem(item, now);
fMenu->_InvokeItem(item, now);
}
void
MenuPrivate::QuitTracking(bool thisMenuOnly)
{
fMenu->QuitTracking(thisMenuOnly);
fMenu->_QuitTracking(thisMenuOnly);
}
} ;