* Implement a rudimentary but mostly functional (for start menu purposes) CMergedFolder class. It's still disabled by default because clicking on an item in a merged folder appears to fail to execute it.

svn path=/branches/shell-experiments/; revision=63658
This commit is contained in:
David Quintana 2014-06-28 15:38:25 +00:00
parent 9ebe8b2e4e
commit f03fef66d1
5 changed files with 449 additions and 106 deletions

View file

@ -19,6 +19,8 @@
*/
#pragma once
class CEnumMergedFolder;
class CMergedFolder :
public CComObjectRootEx<CComMultiThreadModelNoCS>,
public IShellFolder2
@ -26,6 +28,7 @@ class CMergedFolder :
private:
CComPtr<IShellFolder> m_UserLocal;
CComPtr<IShellFolder> m_AllUSers;
CComPtr<CEnumMergedFolder> m_EnumSource;
public:
CMergedFolder() {}