Changeset 2400 for trunk/src/user32/new/pmwindow.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/pmwindow.cpp (modified) (4 diffs)

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.33 2000-01-05 21:25:05 cbratschi Exp $ */
+/* $Id: pmwindow.cpp,v 1.34 2000-01-10 23:29:13 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -91 +91 @@
      (PSZ)WIN32_STDCLASS,               /* Window class name            */
      (PFNWP)Win32WindowProc,            /* Address of window procedure  */
-     CS_HITTEST,
+     0,
      NROF_WIN32WNDBYTES)) {
         dprintf(("WinRegisterClass Win32BaseWindow failed"));
@@ -100 +100 @@
      (PSZ)WIN32_STDCLASS2,              /* Window class name            */
      (PFNWP)Win32WindowProc,            /* Address of window procedure  */
-     CS_HITTEST | CS_SAVEBITS,
+     CS_SAVEBITS,
      NROF_WIN32WNDBYTES)) {
         dprintf(("WinRegisterClass Win32BaseWindow failed"));
@@ -414 +414 @@
         win32wnd->DispatchMsgA(pWinMsg);
         goto RunDefWndProc;
-
-    case WM_HITTEST:
-    {
-      DWORD res;
-
-      // Only send this message if the window is enabled
-      if (!WinIsWindowEnabled(hwnd))
-        res = HT_ERROR;
-      else if (win32wnd->getIgnoreHitTest())
-        res = HT_NORMAL;
-      else
-      {
-        dprintf(("USER32: WM_HITTEST %x (%d,%d)",hwnd,(*(POINTS *)&mp1).x,(*(POINTS *)&mp1).y));
-
-        //CB: WinWindowFromPoint: PM sends WM_HITTEST -> loop -> stack overflow
-        win32wnd->setIgnoreHitTest(TRUE);
-        res = win32wnd->MsgHitTest(pWinMsg);
-        win32wnd->setIgnoreHitTest(FALSE);
-      }
-      RestoreOS2TIB();
-      return (MRESULT)res;
-    }
 
     case WM_CONTEXTMENU: