[BROWSEUI/RSHELL]

* Begin fixing the process of destroying the related objects when closing the window, so that eventually the filebrowser/explorer process will properly exit cleanly when no more windows are open.

svn path=/branches/shell-experiments/; revision=63535
This commit is contained in:
David Quintana
2014-06-02 21:35:32 +00:00
parent 13c7cade20
commit 3a54fd538b
4 changed files with 146 additions and 25 deletions
+7 -1
View File
@@ -74,7 +74,8 @@ CMenuBand::CMenuBand() :
m_hotBar(NULL),
m_hotItem(-1),
m_popupBar(NULL),
m_popupItem(-1)
m_popupItem(-1),
m_Show(FALSE)
{
m_focusManager = CMenuFocusManager::AcquireManager();
}
@@ -363,6 +364,9 @@ HRESULT STDMETHODCALLTYPE CMenuBand::ShowDW(BOOL fShow)
{
HRESULT hr = S_OK;
if (m_Show == fShow)
return S_OK;
if (m_staticToolbar != NULL)
{
hr = m_staticToolbar->ShowWindow(fShow);
@@ -403,6 +407,8 @@ HRESULT STDMETHODCALLTYPE CMenuBand::ShowDW(BOOL fShow)
hr = m_focusManager->PopMenuBar(this);
}
m_Show = fShow;
return S_OK;
}