Changeset 961 for trunk/src/user32/winmenu.cpp

Timestamp:

Sep 16, 1999, 5:14:59 PM (26 years ago)

Author:

phaller

Message:

Fix: WINMENU::GetSystemMenu() was broken.

File:

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

trunk/src/user32/winmenu.cpp

@@ -1 @@
-/* $Id: winmenu.cpp,v 1.1 1999-09-15 23:19:03 sandervl Exp $ */
+/* $Id: winmenu.cpp,v 1.2 1999-09-16 15:14:18 phaller Exp $ */
 
 /*
@@ -17 +17 @@
  */
 #include <os2win.h>
+#include <odin.h>
+#include <odinwrap.h>
 #include <stdlib.h>
 #include <string.h>
@@ -23 +25 @@
 #include <winresmenu.h>
 
+
+ODINDEBUGCHANNEL(USER32)
+
 //******************************************************************************
 //******************************************************************************
@@ -231 +236 @@
 //******************************************************************************
 //******************************************************************************
-HMENU WIN32API GetSystemMenu( HWND hMenu, BOOL  arg2)
-{
- Win32MenuRes *menu = (Win32MenuRes *)hMenu;
-
-    dprintf(("USER32:  GetSystemMenu\n"));
-    if(menu == NULL || menu->getOS2Handle() == 0)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
-    }
-    return O32_GetSystemMenu(menu->getOS2Handle(), arg2);
+ODINFUNCTION2(HMENU,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);
 }
 //******************************************************************************