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

Timestamp:

Nov 1, 1999, 8:11:46 PM (26 years ago)

Author:

sandervl

Message:

Activate + group box fixes + cleanup changes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.70 1999-10-31 01:14:42 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.71 1999-11-01 19:11:43 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -39 +39 @@
 #include "win32wdesktop.h"
 #include "pmwindow.h"
+#include "controls.h"
 #include <wprocess.h>
 
@@ -75 +76 @@
 
 void PrintWindowStyle(DWORD dwStyle, DWORD dwExStyle);
+
+static fDestroyAll = FALSE;
 
 //******************************************************************************
@@ -199 +202 @@
     OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_MAGIC, 0);
 
-    if(getParent() && getParent()->getFirstChild() == this && getNextChild() == NULL)
+    if(!fDestroyAll && getParent() && getParent()->getFirstChild() == this && getNextChild() == NULL)
     {
         //if we're the last child that's being destroyed and our
@@ -210 +213 @@
         }
     }
+    else 
+    if(fDestroyAll) {
+        dprintf(("Destroying window %x %s", getWindowHandle(), windowNameA));
+        setParent(NULL);  //or else we'll crash in the dtor of the ChildWindow class
+    }
+
     if (isOwnDC())
         releaseOwnDC (ownDC);
@@ -234 +243 @@
         horzScrollInfo = NULL;
     }
+}
+//******************************************************************************
+//******************************************************************************
+void Win32BaseWindow::DestroyAll()
+{
+    fDestroyAll = TRUE;
+    GenericObject::DestroyAll(windows);
 }
 //******************************************************************************
@@ -414 +430 @@
   dwExStyle = cs->dwExStyle;
 
-#if 1
-  //SvL: Messes up Z-order of dialog controls
   hwndLinkAfter = HWND_TOP;
-#else
-  hwndLinkAfter = ((cs->style & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD)
-                  ? HWND_BOTTOM : HWND_TOP;
-#endif
+  if(WIDGETS_IsControl(this, BUTTON_CONTROL) && ((dwStyle & 0x0f) == BS_GROUPBOX))
+  {
+        hwndLinkAfter = HWND_BOTTOM;
+        dwStyle |= WS_CLIPSIBLINGS;
+  }
+  else 
+  if(WIDGETS_IsControl(this, STATIC_CONTROL) && !(dwStyle & WS_GROUP)) {
+        dwStyle |= WS_CLIPSIBLINGS;
+  }
 
   /* Increment class window counter */
@@ -524 +543 @@
         return FALSE;
   }
+
   SetLastError(0);
   return TRUE;
@@ -622 +642 @@
 
   if(getParent()) {
-        SetWindowPos(getParent()->getWindowHandle(), rectClient.left, rectClient.top,
+        SetWindowPos(hwndLinkAfter, rectClient.left, rectClient.top,
                      rectClient.right-rectClient.left,
                      rectClient.bottom-rectClient.top,
-                     SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOREDRAW);
+                     SWP_NOACTIVATE | SWP_NOREDRAW);
   }
   else {
-        SetWindowPos(HWND_TOP, rectClient.left, rectClient.top,
+        SetWindowPos(hwndLinkAfter, rectClient.left, rectClient.top,
                      rectClient.right-rectClient.left,
                      rectClient.bottom-rectClient.top,
@@ -810 +830 @@
 {
   lastHitTestVal = SendInternalMessageA(WM_NCHITTEST, 0, MAKELONG((USHORT)x, (USHORT)y));
+  dprintf(("MsgHitTest returned %x", lastHitTestVal));
   return 1; //TODO: May need to change this
 }
@@ -1095 +1116 @@
                    && hwndTop != GetForegroundWindow() )
                 {
-                      SetActiveWindow();
+                      ::SetActiveWindow(hwndTop);
                 }
         }
@@ -1421 +1442 @@
     case WM_MOUSEACTIVATE:
     {
-        DWORD dwStyle = GetWindowLongA(GWL_STYLE);
-        DWORD dwExStyle = GetWindowLongA(GWL_EXSTYLE);
         dprintf(("DefWndProc: WM_MOUSEACTIVATE for %x Msg %s", Win32Hwnd, GetMsgText(HIWORD(lParam))));
-        if(dwStyle & WS_CHILD && !(dwExStyle & WS_EX_NOPARENTNOTIFY) )
+        if(getStyle() & WS_CHILD && !(getExStyle() & WS_EX_NOPARENTNOTIFY) )
         {
             if(getParent()) {
@@ -1435 +1454 @@
     case WM_SETCURSOR:
     {
-        DWORD dwStyle = GetWindowLongA(GWL_STYLE);
-        DWORD dwExStyle = GetWindowLongA(GWL_EXSTYLE);
         dprintf(("DefWndProc: WM_SETCURSOR for %x Msg %s", Win32Hwnd, GetMsgText(HIWORD(lParam))));
-        if(dwStyle & WS_CHILD && !(dwExStyle & WS_EX_NOPARENTNOTIFY) )
+        if(getStyle() & WS_CHILD && !(getExStyle() & WS_EX_NOPARENTNOTIFY) )
         {
             if(getParent()) {
@@ -1905 +1922 @@
 {
  ULONG showstate = 0;
+ HWND hWinAfter;
 
     dprintf(("ShowWindow %x %x", getWindowHandle(), nCmdShow));
@@ -1972 +1990 @@
     }
 
+    /* We can't activate a child window (WINE) */
+    if(getStyle() & WS_CHILD)
+        showstate &= ~SWPOS_ACTIVATE;
+
     if(showstate & SWPOS_SHOW) {
             setStyle(getStyle() | WS_VISIBLE);