Index: src/chext/DropMenuExt.h
===================================================================
diff -u -N -r2d7bee54f998ae8f5d4145a2cf3f4a589253016f -r633a533cb6e741d44fe28aa56339e1d2709b1b27
--- src/chext/DropMenuExt.h	(.../DropMenuExt.h)	(revision 2d7bee54f998ae8f5d4145a2cf3f4a589253016f)
+++ src/chext/DropMenuExt.h	(.../DropMenuExt.h)	(revision 633a533cb6e741d44fe28aa56339e1d2709b1b27)
@@ -20,10 +20,10 @@
 #define __DROPMENUEXT_H_
 
 #include "resource.h"       // main symbols
-#include "ActionSelector.h"
+#include "TContextMenuHandler.h"
+#include "..\common\TShellExtMenuConfig.h"
+#include "TShellExtData.h"
 
-#include "../libchcore/TTaskDefinition.h"
-
 /////////////////////////////////////////////////////////////////////////////
 // CDropMenuExt
 class ATL_NO_VTABLE CDropMenuExt : 
@@ -56,9 +56,18 @@
 	STDMETHOD(HandleMenuMsg2)(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT* plResult);
 
 protected:
+	HRESULT ReadShellConfig();
+
+protected:
 	IShellExtControl* m_piShellExtControl;
-	TActionSelector m_asSelector;
 
+	TShellExtData m_tShellExtData;
+	TShellExtMenuConfig m_tShellExtMenuConfig;
+
+	TContextMenuHandler m_tContextMenuHandler;
+
+//	TActionSelector m_asSelector;
+
 	chcore::TPathContainer m_vPaths;
 	chcore::TSmartPath m_pathPidl;
 };