Changeset 3603 for trunk/src/user32/win32wbase.cpp

Timestamp:

May 24, 2000, 9:30:08 PM (25 years ago)

Author:

sandervl

Message:

experimental WM_NCHITTEST generation (disabled) + MDI fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.193 2000-05-22 19:05:58 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.194 2000-05-24 19:30:06 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1142 +1142 @@
 //******************************************************************************
 //******************************************************************************
+LONG Win32BaseWindow::sendHitTest(ULONG lParam)
+{
+    lastHitTestVal = SendInternalMessageA(WM_NCHITTEST, 0, lParam);
+    return lastHitTestVal;
+}
+//******************************************************************************
+//******************************************************************************
 BOOL Win32BaseWindow::isMDIClient()
 {
@@ -1387 +1394 @@
 
     case WM_ACTIVATE:
-      return 0;
+        /* The default action in Windows is to set the keyboard focus to
+         * the window, if it's being activated and not minimized */
+        if (LOWORD(wParam) != WA_INACTIVE) {
+                if(!(getStyle() & WS_MINIMIZE))
+                        SetFocus(getWindowHandle());
+        }
+        return 0;
 
     case WM_SETCURSOR:
@@ -2131 +2144 @@
    Win32BaseWindow *window;
    HWND hParent = 0;
-   BOOL fShow = FALSE;
 
     if (fuFlags &
@@ -2245 +2257 @@
     rc = OSLibWinSetMultWindowPos(&swp, 1);
 
-#ifdef DEBUG
-    if(fShow) {
-        dprintf(("Frame style 0x%08x, client style 0x%08x", OSLibQueryWindowStyle(OS2HwndFrame), OSLibQueryWindowStyle(OS2Hwnd)));
-    }
-#endif
-    if (rc == FALSE)
+    if(rc == FALSE)
     {
         dprintf(("OSLibWinSetMultWindowPos failed! Error %x",OSLibWinGetLastError()));
-    }
+        return 0;
+    }
+
     if((fuFlags & SWP_FRAMECHANGED) && (fuFlags & (SWP_NOMOVE | SWP_NOSIZE) == (SWP_NOMOVE | SWP_NOSIZE)))
     {