Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-24 17:13:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSHELL]

Browse source 
* Fix executing items after the menu has closed.

svn path=/branches/shell-experiments/; revision=65074
This commit is contained in:
David Quintana 2014-10-28 15:39:47 +00:00
parent 180b6fb083
commit 30a510975b
3 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
base/shell/rshell/CMenuToolbars.cpp
View file

@ -846,16 +846,17 @@ HRESULT CMenuToolbarBase::MenuBarMouseUp(INT iIndex)
return ProcessClick(btn.idCommand);
}
HRESULT CMenuToolbarBase::ExecuteItem(INT iItem)
HRESULT CMenuToolbarBase::PrepareExecuteItem(INT iItem)
{
this->m_menuBand->_KillPopupTimers();
INT index;
DWORD_PTR data;
m_executeItem = iItem;
return GetDataFromId(iItem, &m_executeIndex, &m_executeData);
}
GetDataFromId(iItem, &index, &data);
return InternalExecuteItem(iItem, index, data);
HRESULT CMenuToolbarBase::ExecuteItem()
{
return InternalExecuteItem(m_executeItem, m_executeItem, m_executeData);
}
HRESULT CMenuToolbarBase::OnContextMenu(NMMOUSE * rclick)