[BROWSEUI]

* Make use of shell command ID macros for toolbar button IDs.

svn path=/branches/shell-experiments/; revision=63644
This commit is contained in:
David Quintana 2014-06-25 15:56:04 +00:00
parent 73d72624b0
commit 9ebe8b2e4e
3 changed files with 12 additions and 10 deletions

View file

@ -1624,7 +1624,7 @@ LRESULT CInternetToolbar::OnMenuDropDown(UINT idControl, NMHDR *pNMHDR, BOOL &bH
V_INTREF(&inValue) = reinterpret_cast<INT *>(&bounds); V_INTREF(&inValue) = reinterpret_cast<INT *>(&bounds);
if (fCommandTarget.p != NULL) if (fCommandTarget.p != NULL)
hResult = fCommandTarget->Exec(&fCommandCategory, 0x7031, 1, &inValue, &outValue); hResult = fCommandTarget->Exec(&fCommandCategory, FCIDM_SHVIEW_AUTOARRANGE, 1, &inValue, &outValue);
// pvaOut is VT_I4 with value 0x403 // pvaOut is VT_I4 with value 0x403
break; break;
} }

View file

@ -22,20 +22,20 @@
static const int gSearchCommandID = 1003; static const int gSearchCommandID = 1003;
static const int gFoldersCommandID = 1004; static const int gFoldersCommandID = 1004;
static const int gMoveToCommandID = 0x701f; static const int gMoveToCommandID = FCIDM_SHVIEW_MOVETO;
static const int gCopyToCommandID = 0x701e; static const int gCopyToCommandID = FCIDM_SHVIEW_COPYTO;
static const int gDeleteCommandID = 0x7011; static const int gDeleteCommandID = FCIDM_SHVIEW_DELETE;
static const int gUndoCommandID = 0x701b; static const int gUndoCommandID = FCIDM_SHVIEW_UNDO;
static const int gViewsCommandID = 0x7031; static const int gViewsCommandID = FCIDM_SHVIEW_AUTOARRANGE;
static const int gStopCommandID = 1010; static const int gStopCommandID = 1010;
static const int gHomeCommandID = 1012; static const int gHomeCommandID = 1012;
static const int gFavoritesCommandID = 1015; static const int gFavoritesCommandID = 1015;
static const int gHistoryCommandID = 1016; static const int gHistoryCommandID = 1016;
static const int gFullScreenCommandID = 1017; static const int gFullScreenCommandID = 1017;
static const int gPropertiesCommandID = 0x7013; static const int gPropertiesCommandID = FCIDM_SHVIEW_PROPERTIES;
static const int gCutCommandID = 0x7018; static const int gCutCommandID = FCIDM_SHVIEW_CUT;
static const int gCopyCommandID = 0x7019; static const int gCopyCommandID = FCIDM_SHVIEW_COPY;
static const int gPasteCommandID = 0x701a; static const int gPasteCommandID = FCIDM_SHVIEW_INSERT;
class CMenuCallback : class CMenuCallback :
public CComObjectRootEx<CComMultiThreadModelNoCS>, public CComObjectRootEx<CComMultiThreadModelNoCS>,

View file

@ -466,6 +466,8 @@ typedef struct
#define FCIDM_SHVIEW_INSERT 0x701A #define FCIDM_SHVIEW_INSERT 0x701A
#define FCIDM_SHVIEW_UNDO 0x701B #define FCIDM_SHVIEW_UNDO 0x701B
#define FCIDM_SHVIEW_INSERTLINK 0x701C #define FCIDM_SHVIEW_INSERTLINK 0x701C
#define FCIDM_SHVIEW_COPYTO 0x701E
#define FCIDM_SHVIEW_MOVETO 0x701F
#define FCIDM_SHVIEW_SELECTALL 0x7021 #define FCIDM_SHVIEW_SELECTALL 0x7021
#define FCIDM_SHVIEW_INVERTSELECTION 0x7022 #define FCIDM_SHVIEW_INVERTSELECTION 0x7022