Changeset 1021 for trunk/src

Timestamp:

Sep 23, 1999, 4:59:22 PM (26 years ago)

Author:

phaller

Message:

Fix: WinMenu:GetSystemMenu fixed

File:

• trunk/src/user32/winmenu.cpp (modified) (2 diffs)

trunk/src/user32/winmenu.cpp

@@ -1 @@
-/* $Id: winmenu.cpp,v 1.4 1999-09-23 14:53:05 phaller Exp $ */
+/* $Id: winmenu.cpp,v 1.5 1999-09-23 14:58:57 phaller Exp $ */
 
 /*
@@ -264 +264 @@
   hMenuReturned = O32_GetSubMenu(menu->getOS2Handle(), arg2);
   /* @@@PH allocate Win32MenuRes object ! */
-  menuReturned = new Win32MenuRes(hMenu);
+  menuReturned = new Win32MenuRes(hMenuReturned);
   return ((HMENU)menuReturned);
 }
 //******************************************************************************
 //******************************************************************************
-HMENU WIN32API GetSystemMenu(HWND hSystemWindow, BOOL bRevert)
-{
-  dprintf(("USER32: GetSystemMenu not implemented correctly."));
-  //Win32BaseWindow *window;
-  //
-  //window = Win32BaseWindow::GetWindowFromHandle(hSystemWindow);
-  //if(!window)
-  //{
-  //  dprintf(("GetSystemMenu, window %x not found", hSystemWindow));
-  //  return 0;
-  //}
-  //
-  //dprintf(("GetSystemMenu %x", hSystemWindow));
-  //return window->GetSystemMenu();
-  return O32_GetSystemMenu(hSystemWindow, bRevert);
+ODINFUNCTION2(HMENU, GetSystemMenu,
+              HWND,  hSystemWindow,
+              BOOL,  bRevert)
+{
+  Win32MenuRes *menuReturned;
+  HMENU        hMenuReturned;
+  Win32BaseWindow *window;
+
+  window = Win32BaseWindow::GetWindowFromHandle(hSystemWindow);
+  if(!window)
+  {
+    dprintf(("GetSystemMenu, window %x not found", hSystemWindow));
+    return 0;
+  }
+
+  //hMenuReturned = window->GetSystemMenu();
+  hMenuReturned =  O32_GetSystemMenu(hSystemWindow, bRevert);
+
+  /* @@@PH allocate Win32MenuRes object ! */
+  menuReturned = new Win32MenuRes(hMenuReturned);
+  return ((HMENU)menuReturned);
 }
 //******************************************************************************