Dan Hipschman : user32: Redefine internal pop-up tracking flags to avoid conflicts.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 50b98a29466fdebca3a550e40fe5b8e9c26ec8a8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=50b98a29466fdebca3a550e40f...

Author: Dan Hipschman 
Date:   Thu Jun 26 16:18:05 2008 -0700

user32: Redefine internal pop-up tracking flags to avoid conflicts.

These internal flags conflict with the Win32 API flags TPM_RECURSE,
TPM_RIGHTBUTTON, and TPM_CENTERALIGN respectively, which are all stored
in the same flag UINT.

---

dlls/user32/menu.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index 88eb72f..b4c1955 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -116,9 +116,9 @@ typedef struct {

/* internal flags for menu tracking */

-#define TF_ENDMENU              0x0001
-#define TF_SUSPENDPOPUP         0x0002
-#define TF_SKIPREMOVE		0x0004
+#define TF_ENDMENU              0x10000
+#define TF_SUSPENDPOPUP         0x20000
+#define TF_SKIPREMOVE           0x40000

typedef struct
 {