Changeset 2400 for trunk/src/user32/new/win32wbase.cpp

Timestamp:

Jan 11, 2000, 12:29:16 AM (26 years ago)

Author:

sandervl

Message:

get/peekmessage fixes, timer fix, (user/new) replaced wm_hittest code; added wm_ncactivate, changed system menu

File:

• trunk/src/user32/new/win32wbase.cpp (modified) (5 diffs)

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.28 2000-01-10 17:18:09 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.29 2000-01-10 23:29:14 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -217 +217 @@
   isIcon           = FALSE;
   lastHitTestVal   = HTOS_NORMAL;
-  fIgnoreHitTest   = FALSE;
   owner            = NULL;
   windowClass      = 0;
@@ -879 +878 @@
 //******************************************************************************
 //******************************************************************************
-ULONG Win32BaseWindow::MsgHitTest(MSG *msg)
-{
-  lastHitTestVal = SendInternalMessageA(WM_NCHITTEST,msg->wParam,msg->lParam);
-  dprintf2(("MsgHitTest returned %x", lastHitTestVal));
-
-  if (lastHitTestVal == HTERROR)
-    return HTOS_ERROR;
-
-#if 0 //CB: problems with groupboxes, internal handling is better
-  if (lastHitTestVal == HTTRANSPARENT)
-    return HTOS_TRANSPARENT;
-#endif
-
-  return HTOS_NORMAL;
+ULONG Win32BaseWindow::MsgHitTest(ULONG x, ULONG y)
+{
+  lastHitTestVal = SendInternalMessageA(WM_NCHITTEST, 0, MAKELONG((USHORT)x, (USHORT)y));
+  dprintf2(("MsgHitTest (%d,%d) (%d,%d) (%d,%d) returned %x", x, y, rectWindow.left, rectWindow.right, rectWindow.top, rectWindow.bottom, lastHitTestVal));
+  return lastHitTestVal;
 }
 //******************************************************************************
@@ -3093 +3083 @@
         window = parentwindow;
    }
+}
+//******************************************************************************
+//******************************************************************************
+HMENU Win32BaseWindow::GetSystemMenu(BOOL fRevert)
+{
+    if(fRevert == FALSE) 
+    {
+            if(hSysMenu) {
+                DestroyMenu(hSysMenu);
+            }
+            hSysMenu = LoadMenuA(GetModuleHandleA("USER32"), (LPCSTR)"SYSMENU");
+            return hSysMenu;
+        }
+        else {//revert back to default system menu
+            if(hSysMenu) {
+                DestroyMenu(hSysMenu);
+                hSysMenu = 0;
+            }
+            return 0;
+    }
 }
 //******************************************************************************
@@ -3767 +3777 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32BaseWindow::GetWindowRect(PRECT pRect)
-{
-    return OSLibWinQueryWindowRect(OS2HwndFrame, pRect, RELATIVE_TO_SCREEN);
-}
-//******************************************************************************
-//******************************************************************************
 BOOL Win32BaseWindow::hasWindowName(LPSTR wndname, BOOL fUnicode)
 {