Changeset 7409 for trunk/src/user32/menu.cpp

Timestamp:

Nov 21, 2001, 12:51:39 PM (24 years ago)

Author:

sandervl

Message:

menu + groupbox fixes

File:

• trunk/src/user32/menu.cpp (modified) (17 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.39 2001-10-24 15:41:53 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.40 2001-11-21 11:51:37 sandervl Exp $*/
 /*
  * Menu functions
@@ -302 +302 @@
 //#define USER_HEAP_FREE(handle) HeapFree(GetProcessHeap(),0,(LPVOID)handle)
 
-HMENU getMenu(HWND hwnd)
-{
-  Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-  
-  if(win32wnd) {
-      HMENU hmenu = win32wnd->GetMenu();
-      RELEASE_WNDOBJ(win32wnd);
-      return hmenu;
-  }
-  return (HMENU)0;
-}
-
-VOID setMenu(HWND hwnd,HMENU hMenu)
-{
-  Win32BaseWindow *win32wnd = Win32BaseWindow::GetWindowFromHandle(hwnd);
-
-  if (win32wnd) {
-      win32wnd->SetMenu(hMenu);
-      RELEASE_WNDOBJ(win32wnd);
-  }
-}
-
 
 /***********************************************************************
@@ -1468 +1446 @@
     HFONT hfontOld = 0;
 
-    lppop = MENU_GetMenu(getMenu(hwnd));
+    lppop = MENU_GetMenu(GetMenu(hwnd));
     if (lppop == NULL || lprect == NULL)
     {
@@ -1518 +1496 @@
       {
         OffsetRect(&lppop->items[i].rect,-lprect->left,-lprect->top);
-        MENU_DrawMenuItem( hwnd,getMenu(hwnd), GetWindow(hwnd,GW_OWNER),
+        MENU_DrawMenuItem( hwnd,GetMenu(hwnd), GetWindow(hwnd,GW_OWNER),
                          memDC, &lppop->items[i], lppop->Height, TRUE, ODA_DRAWENTIRE );
         OffsetRect(&lppop->items[i].rect,lprect->left,lprect->top);
@@ -2266 +2244 @@
         {
             ht = ((ht == HTSYSMENU) && !inMenuBar) ? (UINT)(getSysMenu(menu->hWnd))
-                 : ((ht == HTMENU) && inMenuBar) ? (UINT)(getMenu(menu->hWnd)) : 0;
+                 : ((ht == HTMENU) && inMenuBar) ? (UINT)(GetMenu(menu->hWnd)) : 0;
         }
    }
@@ -2561 +2539 @@
                 /* switch to the menu bar */
 
-                if( (GetWindowLongA(pmt->hOwnerWnd,GWL_STYLE) & WS_CHILD) || !getMenu(pmt->hOwnerWnd) )
+                if( (GetWindowLongA(pmt->hOwnerWnd,GWL_STYLE) & WS_CHILD) || !GetMenu(pmt->hOwnerWnd) )
                 {
                     return FALSE;
                 }
 
-                hNewMenu = getMenu(pmt->hOwnerWnd);
+                hNewMenu = GetMenu(pmt->hOwnerWnd);
                 if( vk == VK_LEFT )
                 {
@@ -2596 +2574 @@
                     hNewMenu =  getSysMenu(hNewWnd);
                 }
-                else if( (GetWindowLongA(hNewWnd,GWL_STYLE) & WS_CHILD) || (getMenu(hNewWnd) != hNewMenu) )
+                else if( (GetWindowLongA(hNewWnd,GWL_STYLE) & WS_CHILD) || (GetMenu(hNewWnd) != hNewMenu) )
                 {
                     /* FIXME: Not sure what to do here, perhaps,
@@ -3163 +3141 @@
 void MENU_TrackMouseMenuBar( HWND hWnd, INT ht, POINT pt )
 {
-    HMENU hMenu = (ht == 0) ? getMenu(hWnd):getSysMenu(hWnd);
+    HMENU hMenu = (ht == 0) ? GetMenu(hWnd):getSysMenu(hWnd);
     UINT wFlags = TPM_ENTERIDLEEX | TPM_BUTTONDOWN | TPM_LEFTALIGN | TPM_LEFTBUTTON;
 
@@ -3185 +3163 @@
 void MENU_TrackMouseMenuBar_MouseMove(HWND hwnd,POINT pt,BOOL OnMenu)
 {
-    HMENU hMenu = getMenu(hwnd);
+    HMENU hMenu = GetMenu(hwnd);
     MENUITEM *item = NULL;
     RECT rect;
@@ -3262 +3240 @@
 
     if( (GetWindowLongA(hWnd,GWL_STYLE) & (WS_CHILD | WS_MINIMIZE)) ||
-        !getMenu(hWnd) || vkey == VK_SPACE )
+        !GetMenu(hWnd) || vkey == VK_SPACE )
     {
         if( !(GetWindowLongA(hWnd,GWL_STYLE) & WS_SYSMENU) ) return;
@@ -3270 +3248 @@
     }
     else
-        hTrackMenu = getMenu(hWnd);
+        hTrackMenu = GetMenu(hWnd);
 
     if (IsMenu( hTrackMenu ))
@@ -3456 +3434 @@
     //             hwnd, menubarWidth, orgX, orgY );
 
-    if (!(lppop = MENU_GetMenu(getMenu(hwnd))))
+    if (!(lppop = MENU_GetMenu(GetMenu(hwnd))))
     {
         return 0;
@@ -4143 +4121 @@
     HMENU retvalue;
 
-    dprintf(("USER32: GetMenu %x", hWnd));
-
-    if (GetWindowLongA(hWnd,GWL_STYLE) & WS_CHILD) return 0;
-    else return getMenu(hWnd);
+    dprintf(("USER32: GetMenu %x %x", hWnd, GetWindowLongA( hWnd, GWL_ID )));
+
+    if (GetWindowLongA(hWnd,GWL_STYLE) & WS_CHILD) {
+        dprintf(("WARNING: window is child; no menu"));
+        return 0;
+    }
+    retvalue = (HMENU)GetWindowLongA( hWnd, GWL_ID );
+    if(MENU_GetMenu(retvalue) != NULL) {
+        return retvalue;
+    }
+    return 0;
 }
 
@@ -4169 +4154 @@
         if (GetCapture() == hWnd) ReleaseCapture();
 
-        setMenu(hWnd,hMenu);
         if (hMenu != 0)
         {
@@ -4182 +4166 @@
             lpmenu->Height = 0;  /* Make sure we recalculate the size */
         }
+        SetWindowLongA( hWnd, GWL_ID, hMenu );
+
+#ifdef __WIN32OS2__
 //SvL: This fixes the menu in standard mine sweeper (window isn't visible
 //     when SetMenu is called)
 //        if (IsWindowVisible(hWnd))
+#endif
             SetWindowPos( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE |
                         SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED );
@@ -4202 +4190 @@
     dprintf(("USER32: GetSubMenu %x %d", hMenu, nPos));
 
+#ifdef __WIN32OS2__
+    if (!(lpmi = MENU_FindItem(&hMenu,(UINT*)&nPos,MF_BYPOSITION)))  {
+        SetLastError(ERROR_INVALID_HANDLE);
+        return 0;
+    }
+#else
     if (!(lpmi = MENU_FindItem(&hMenu,(UINT*)&nPos,MF_BYPOSITION))) return 0;
+#endif
+
     if (!(lpmi->fType & MF_POPUP)) return 0;
     return lpmi->hSubMenu;
@@ -4217 +4213 @@
     dprintf(("USER32: DrawMenuBar %x", hWnd));
 
-    if (!(GetWindowLongA(hWnd,GWL_STYLE) & WS_CHILD) && getMenu(hWnd))
-    {
-        lppop = MENU_GetMenu(getMenu(hWnd));
+    if (!(GetWindowLongA(hWnd,GWL_STYLE) & WS_CHILD) && GetMenu(hWnd))
+    {
+        lppop = MENU_GetMenu(GetMenu(hWnd));
         if (lppop == NULL)
         {