[ros-diffs] [dquintana] 63644: [BROWSEUI] * Make use of shell command ID macros for toolbar button IDs.

Author: dquintana
Date: Wed Jun 25 15:56:04 2014
New Revision: 63644

URL: http://svn.reactos.org/svn/reactos?rev=63644&view=rev
Log:
[BROWSEUI]
* Make use of shell command ID macros for toolbar button IDs.

Modified:
    branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp
    branches/shell-experiments/dll/win32/browseui/internettoolbar.h
    branches/shell-experiments/include/psdk/shlobj.h

Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro…
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp	[iso-8859-1]
(original)
+++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp	[iso-8859-1] Wed Jun
25 15:56:04 2014
@@ -1624,7 +1624,7 @@
             V_INTREF(&inValue) = reinterpret_cast<INT *>(&bounds);
 
             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
             break;
     }

Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.h
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro…
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/internettoolbar.h	[iso-8859-1]
(original)
+++ branches/shell-experiments/dll/win32/browseui/internettoolbar.h	[iso-8859-1] Wed Jun
25 15:56:04 2014
@@ -22,20 +22,20 @@
 
 static const int gSearchCommandID = 1003;
 static const int gFoldersCommandID = 1004;
-static const int gMoveToCommandID = 0x701f;
-static const int gCopyToCommandID = 0x701e;
-static const int gDeleteCommandID = 0x7011;
-static const int gUndoCommandID = 0x701b;
-static const int gViewsCommandID = 0x7031;
+static const int gMoveToCommandID = FCIDM_SHVIEW_MOVETO;
+static const int gCopyToCommandID = FCIDM_SHVIEW_COPYTO;
+static const int gDeleteCommandID = FCIDM_SHVIEW_DELETE;
+static const int gUndoCommandID = FCIDM_SHVIEW_UNDO;
+static const int gViewsCommandID = FCIDM_SHVIEW_AUTOARRANGE;
 static const int gStopCommandID = 1010;
 static const int gHomeCommandID = 1012;
 static const int gFavoritesCommandID = 1015;
 static const int gHistoryCommandID = 1016;
 static const int gFullScreenCommandID = 1017;
-static const int gPropertiesCommandID = 0x7013;
-static const int gCutCommandID = 0x7018;
-static const int gCopyCommandID = 0x7019;
-static const int gPasteCommandID = 0x701a;
+static const int gPropertiesCommandID = FCIDM_SHVIEW_PROPERTIES;
+static const int gCutCommandID = FCIDM_SHVIEW_CUT;
+static const int gCopyCommandID = FCIDM_SHVIEW_COPY;
+static const int gPasteCommandID = FCIDM_SHVIEW_INSERT;
 
 class CMenuCallback :
     public CComObjectRootEx<CComMultiThreadModelNoCS>,

Modified: branches/shell-experiments/include/psdk/shlobj.h
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/…
==============================================================================
--- branches/shell-experiments/include/psdk/shlobj.h	[iso-8859-1] (original)
+++ branches/shell-experiments/include/psdk/shlobj.h	[iso-8859-1] Wed Jun 25 15:56:04
2014
@@ -466,6 +466,8 @@
 #define FCIDM_SHVIEW_INSERT     0x701A
 #define FCIDM_SHVIEW_UNDO       0x701B
 #define FCIDM_SHVIEW_INSERTLINK 0x701C
+#define FCIDM_SHVIEW_COPYTO     0x701E
+#define FCIDM_SHVIEW_MOVETO     0x701F
 #define FCIDM_SHVIEW_SELECTALL  0x7021
 #define FCIDM_SHVIEW_INVERTSELECTION 0x7022