Fixed some warnings. removed some unneccessary includes, removed one
direct WND* access in controls/menu.c.
diff --git a/controls/menu.c b/controls/menu.c
index 3ba4f66..7c06d6d 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -561,13 +561,11 @@
POINT pt, UINT *pos )
{
MENUITEM *item;
- WND *wndPtr;
UINT i;
+ RECT wrect;
- if (!(wndPtr = WIN_FindWndPtr( menu->hWnd ))) return NULL;
- pt.x -= wndPtr->rectWindow.left;
- pt.y -= wndPtr->rectWindow.top;
- WIN_ReleaseWndPtr(wndPtr);
+ if (!GetWindowRect(menu->hWnd,&wrect)) return NULL;
+ pt.x -= wrect.left;pt.y -= wrect.top;
item = menu->items;
for (i = 0; i < menu->nItems; i++, item++)
{
@@ -4281,7 +4279,7 @@
if (itemMenu == NULL)
return FALSE;
- if(itemMenu->hWnd == NULL)
+ if(itemMenu->hWnd == 0)
return FALSE;
referenceHwnd = itemMenu->hWnd;
}