Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-20 07:36:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSHELL]

Browse source 
* Fix some more C-style casts, and misc coding style changes.
* CMenuBand: Create a skeleton of the functions that would handle SMIF_TRACKPOPUP submenus.
* CMenuDeskBar: Fix the redraw issue that prevented submenus from working as expected.
CORE-7886

svn path=/branches/shell-experiments/; revision=62248
This commit is contained in:
David Quintana 2014-02-18 18:18:08 +00:00
parent 7c921822b4
commit f1281f1369
5 changed files with 100 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

12
base/shell/rshell/CMenuDeskBar.cpp
View file

@ -24,7 +24,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar);
#define WRAP_LOG 1
#define WRAP_LOG 0
typedef CWinTraits<
WS_POPUP | WS_DLGFRAME | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
@ -680,7 +680,7 @@ LRESULT CMenuDeskBar::OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam
LRESULT CMenuDeskBar::OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled)
{
TRACE("OnPaint\n");
bHandled = FALSE;
if (m_Banner && !m_IconSize)
{
@ -716,7 +716,7 @@ LRESULT CMenuDeskBar::OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHa
EndPaint(&ps);
}
return 0;
return TRUE;
}
HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags)
@ -849,7 +849,7 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect(
case MPOS_EXECUTE:
bubbleUp = true;
cancel = true;
// fall through
break;
case MPOS_CANCELLEVEL:
cancel = true;
break;
@ -857,9 +857,9 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect(
case MPOS_SELECTRIGHT:
// if unhandled, spread upwards?
bubbleUp = true;
return S_OK;
break;
case MPOS_CHILDTRACKING:
return S_OK;
break;
}
if (cancel)