[BROWSEUI]

* Allow the static items in the Favorites menu to be received by the shell browse window.
* Handle the Organize Favorites menu item by opening either the USER favorites, or the COMMON version of the folder.

[RSHELL]
* Send the proper HWND together with the HMENU, when sending callbacks.

svn path=/branches/shell-experiments/; revision=65111
This commit is contained in:
David Quintana 2014-10-29 22:28:51 +00:00
parent 5ee771bbc6
commit 2e0e5f7174
8 changed files with 64 additions and 13 deletions

View file

@ -1111,7 +1111,8 @@ HRESULT CMenuToolbarBase::PopupItem(INT iItem, BOOL keyInitiated)
CMenuStaticToolbar::CMenuStaticToolbar(CMenuBand *menuBand) :
CMenuToolbarBase(menuBand, FALSE),
m_hmenu(NULL)
m_hmenu(NULL),
m_hwndMenu(NULL)
{
}
@ -1127,7 +1128,7 @@ HRESULT CMenuStaticToolbar::GetMenu(
if (phmenu)
*phmenu = m_hmenu;
if (phwnd)
*phwnd = NULL;
*phwnd = m_hwndMenu;
if (pdwFlags)
*pdwFlags = m_dwMenuFlags;
@ -1140,6 +1141,7 @@ HRESULT CMenuStaticToolbar::SetMenu(
DWORD dwFlags)
{
m_hmenu = hmenu;
m_hwndMenu = hwnd;
m_dwMenuFlags = dwFlags;
return S_OK;