[janderwald] 30362: - move Shell_MergeMenus to shlobj.h where it belongs

Author: janderwald
Date: Sun Nov 11 21:14:11 2007
New Revision: 30362

URL: http://svn.reactos.org/svn/reactos?rev=30362&view=rev
Log:
- move Shell_MergeMenus to shlobj.h where it belongs

Modified:
    trunk/reactos/dll/win32/shell32/shell32_main.h
    trunk/reactos/include/psdk/shlobj.h

Modified: trunk/reactos/dll/win32/shell32/shell32_main.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_m...
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_main.h (original)
+++ trunk/reactos/dll/win32/shell32/shell32_main.h Sun Nov 11 21:14:11 2007
@@ -112,11 +112,6 @@
 LPEXTRACTICONA	IExtractIconA_Constructor(LPCITEMIDLIST);
 LPEXTRACTICONW	IExtractIconW_Constructor(LPCITEMIDLIST);

-/* menu merging */
-#define MM_ADDSEPARATOR         0x00000001L
-#define MM_SUBMENUSHAVEIDS      0x00000002L
-HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags);
-
 /* initialisation for FORMATETC */
 #define InitFormatEtc(fe, cf, med) \
    {\

Modified: trunk/reactos/include/psdk/shlobj.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=3...
==============================================================================
--- trunk/reactos/include/psdk/shlobj.h (original)
+++ trunk/reactos/include/psdk/shlobj.h Sun Nov 11 21:14:11 2007
@@ -1372,6 +1372,15 @@

#include <poppack.h>

+
+/* menu merging */
+#define MM_ADDSEPARATOR         0x00000001L
+#define MM_SUBMENUSHAVEIDS      0x00000002L
+#define MM_DONTREMOVESEPS       0x00000004L
+
+HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags);
+
+
 /****************************************************************************
  * SHCreateDefaultContextMenu API
  */