From 88cbbaaedf97564cb4230c7691d1bd35cd3f0210 Mon Sep 17 00:00:00 2001 From: deadwood Date: Thu, 8 Dec 2011 20:28:28 +0000 Subject: [PATCH] Pass the required parameter in macro calls. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@42794 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- rom/intuition/menutask.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rom/intuition/menutask.c b/rom/intuition/menutask.c index 07f1f761d3..7c74628c4c 100644 --- a/rom/intuition/menutask.c +++ b/rom/intuition/menutask.c @@ -561,7 +561,7 @@ static inline BOOL CustomDrawBackground(struct RastPort *rp, struct Window *win, msg.mdp_ItemHeight = itemheight; msg.mdp_Flags = flags; - msg.mdp_MenuDecorFlags = (MENUS_UNDERMOUSE) ? MDP_MDF_MENUS_UNDERMOUSE : 0; + msg.mdp_MenuDecorFlags = (MENUS_UNDERMOUSE(IntuitionBase)) ? MDP_MDF_MENUS_UNDERMOUSE : 0; if (win == mhd->submenuwin) { msg.mdp_UserBuffer = mhd->SubDecorUserBuffer; msg.mdp_MenuDecorFlags |= MDP_MDF_SUBITEM; } else if (win == mhd->menuwin) { msg.mdp_UserBuffer = mhd->DecorUserBuffer; msg.mdp_MenuDecorFlags |= MDP_MDF_ITEM; } else { msg.mdp_UserBuffer = mhd->BarDecorUserBuffer; msg.mdp_MenuDecorFlags |= MDP_MDF_MENU; } @@ -894,7 +894,7 @@ static void MakeMenuBarWin(struct MenuHandlerData *mhd, struct IntuitionBase *In msg.mdp_Height = win_tags[3].ti_Data; msg.mdp_UserBuffer = mhd->BarDecorUserBuffer; msg.mdp_ScreenUserBuffer = ((struct IntScreen *) mhd->scr)->DecorUserBuffer; - msg.mdp_MenuDecorFlags = (MENUS_UNDERMOUSE) ? MDP_MDF_MENUS_UNDERMOUSE : 0; + msg.mdp_MenuDecorFlags = (MENUS_UNDERMOUSE(IntuitionBase)) ? MDP_MDF_MENUS_UNDERMOUSE : 0; msg.mdp_MenuDecorFlags |= MDP_MDF_MENU; msg.mdp_Screen = mhd->scr; @@ -1181,7 +1181,7 @@ static void MakeMenuWin(struct MenuHandlerData *mhd, struct IntuitionBase *Intui msg.mdp_UserBuffer = mhd->DecorUserBuffer; msg.mdp_ScreenUserBuffer = ((struct IntScreen *) mhd->scr)->DecorUserBuffer; msg.mdp_Screen = mhd->scr; - msg.mdp_MenuDecorFlags = (MENUS_UNDERMOUSE) ? MDP_MDF_MENUS_UNDERMOUSE : 0; + msg.mdp_MenuDecorFlags = (MENUS_UNDERMOUSE(IntuitionBase)) ? MDP_MDF_MENUS_UNDERMOUSE : 0; msg.mdp_MenuDecorFlags |= MDP_MDF_ITEM; DoMethodA(((struct IntScreen *)(mhd->scr))->MenuDecorObj, (Msg)&msg); @@ -1345,7 +1345,7 @@ static void MakeSubMenuWin(struct MenuHandlerData *mhd, struct IntuitionBase *In msg.mdp_ScreenUserBuffer = ((struct IntScreen *) mhd->scr)->DecorUserBuffer; msg.mdp_TrueColor = mhd->TrueColor; msg.mdp_Screen = mhd->scr; - msg.mdp_MenuDecorFlags = (MENUS_UNDERMOUSE) ? MDP_MDF_MENUS_UNDERMOUSE : 0; + msg.mdp_MenuDecorFlags = (MENUS_UNDERMOUSE(IntuitionBase)) ? MDP_MDF_MENUS_UNDERMOUSE : 0; msg.mdp_MenuDecorFlags |= MDP_MDF_SUBITEM; DoMethodA(((struct IntScreen *)(mhd->scr))->MenuDecorObj, (Msg)&msg); -- 2.11.4.GIT