[BROWSEUI]

[reactos.git] / base / shell / rshell / CMenuToolbars.h

diff --git a/base/shell/rshell/CMenuToolbars.h b/base/shell/rshell/CMenuToolbars.h
index a35d95a..a44bb12 100644 (file)
--- a/base/shell/rshell/CMenuToolbars.h
+++ b/base/shell/rshell/CMenuToolbars.h
@@ -71,14 +71,16 @@ public:
     HRESULT ChangeHotItem(CMenuToolbarBase * toolbar, INT item, DWORD dwFlags);
     HRESULT ChangePopupItem(CMenuToolbarBase * toolbar, INT item);
 
-    HRESULT PopupSubMenu(UINT itemId, UINT index, IShellMenu* childShellMenu);
+    HRESULT PopupSubMenu(UINT itemId, UINT index, IShellMenu* childShellMenu, BOOL keyInitiated);
     HRESULT PopupSubMenu(UINT itemId, UINT index, HMENU menu);
     HRESULT TrackContextMenu(IContextMenu* contextMenu, POINT pt);
 
     HRESULT KeyboardItemChange(DWORD changeType);
 
+    HRESULT ExecuteItem(INT iItem);
+
     HRESULT IsTrackedItem(INT index);
-    HRESULT ChangeTrackedItem(INT index, BOOL wasTracking);
+    HRESULT ChangeTrackedItem(INT index, BOOL wasTracking, BOOL mouse);
 
     HRESULT GetSizes(SIZE* pMinSize, SIZE* pMaxSize, SIZE* pIntegralSize);
     HRESULT SetPosSize(int x, int y, int cx, int cy);
@@ -90,7 +92,7 @@ public:
     virtual HRESULT FillToolbar(BOOL clearFirst=FALSE) = 0;
     
     HRESULT CancelCurrentPopup();
-    HRESULT PopupItem(INT iItem);
+    HRESULT PopupItem(INT iItem, BOOL keyInitiated);
     HRESULT GetDataFromId(INT iItem, INT* pIndex, DWORD_PTR* pData);
 
     HRESULT KillPopupTimer();
@@ -100,7 +102,7 @@ protected:
 
     virtual HRESULT InternalGetTooltip(INT iItem, INT index, DWORD_PTR dwData, LPWSTR pszText, INT cchTextMax) = 0;
     virtual HRESULT InternalExecuteItem(INT iItem, INT index, DWORD_PTR dwData) = 0;
-    virtual HRESULT InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData) = 0;
+    virtual HRESULT InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData, BOOL keyInitiated) = 0;
     virtual HRESULT InternalHasSubMenu(INT iItem, INT index, DWORD_PTR dwData) = 0;
     virtual HRESULT InternalContextMenu(INT iItem, INT index, DWORD_PTR dwData, POINT pt) = 0;
 
@@ -130,7 +132,7 @@ private:
 
 public:
     CMenuStaticToolbar(CMenuBand *menuBand);
-    virtual ~CMenuStaticToolbar() {}
+    virtual ~CMenuStaticToolbar();
 
     HRESULT SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags);
     HRESULT GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags);
@@ -142,7 +144,7 @@ protected:
 
     virtual HRESULT InternalGetTooltip(INT iItem, INT index, DWORD_PTR dwData, LPWSTR pszText, INT cchTextMax);
     virtual HRESULT InternalExecuteItem(INT iItem, INT index, DWORD_PTR dwData);
-    virtual HRESULT InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData);
+    virtual HRESULT InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData, BOOL keyInitiated);
     virtual HRESULT InternalHasSubMenu(INT iItem, INT index, DWORD_PTR dwData);
     virtual HRESULT InternalContextMenu(INT iItem, INT index, DWORD_PTR dwData, POINT pt);
 };
@@ -169,7 +171,7 @@ protected:
 
     virtual HRESULT InternalGetTooltip(INT iItem, INT index, DWORD_PTR dwData, LPWSTR pszText, INT cchTextMax);
     virtual HRESULT InternalExecuteItem(INT iItem, INT index, DWORD_PTR dwData);
-    virtual HRESULT InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData);
+    virtual HRESULT InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData, BOOL keyInitiated);
     virtual HRESULT InternalHasSubMenu(INT iItem, INT index, DWORD_PTR dwData);
     virtual HRESULT InternalContextMenu(INT iItem, INT index, DWORD_PTR dwData, POINT pt);
 };