Changeset 4434 for trunk/src

Timestamp:

Oct 5, 2000, 8:37:26 PM (25 years ago)

Author:

sandervl

Message:

GetWindow + z-order bugfixes

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (2 diffs)
• oslibwin.cpp (modified) (2 diffs)
• win32dlg.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.70 2000-09-02 08:30:09 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.71 2000-10-05 18:37:25 sandervl Exp $ */
 
 /*
@@ -630 +630 @@
 
         //Query update region
-#if 1
-        HRGN hrgnClip = GpiCreateRegion(pHps->hps, 1, &rectl);
-#else
         HRGN hrgnClip = GpiCreateRegion(pHps->hps, 1, &rectlClip);
         WinQueryUpdateRegion(hwndClient, hrgnClip);
-        dprintfRegion(pHps->hps, hWnd, hrgnClip);
-        WinQueryVisibleRegion(hwndClient, hrgnClip);
-        dprintfRegion(pHps->hps, hWnd, hrgnClip);
-        WinQueryUpdateRegion(hwndClient, hrgnClip);
-#endif
         WinValidateRegion(hwndClient, hrgnClip, FALSE);
 

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.82 2000-07-06 21:17:57 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.83 2000-10-05 18:37:25 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -85 +85 @@
   FCData.flCreateFlags = dwFrameStyle;
 
-  dprintf(("WinCreateWindow %x %s %x task %d shell %d classstyle %x winstyle %x", hwndParent, pszName, id, fTaskList, fShellPosition, classStyle, dwWinStyle));
-
-#if 0
-  return WinCreateWindow (hwndParent,
-//                          TopLevel ? WIN32_STDFRAMECLASS : WIN32_STDCLASS,
-                          WIN32_STDFRAMECLASS,
-                          pszName, dwWinStyle, 0, 0, 0, 0,
-                          Owner, HWND_TOP,
-                          id, &FCData, NULL);
-#else
+  dprintf(("WinCreateWindow %x %s %x task %d shell %d classstyle %x winstyle %x bottom %d", hwndParent, pszName, id, fTaskList, fShellPosition, classStyle, dwWinStyle, fHWND_BOTTOM));
+
   return WinCreateWindow (hwndParent,
                           WIN32_STDFRAMECLASS,
                           pszName, dwWinStyle, 0, 0, 0, 0,
-                          Owner, HWND_TOP,
+                          Owner, (fHWND_BOTTOM) ? HWND_BOTTOM : HWND_TOP,
                           id, NULL, NULL);
-#endif
 }
 //******************************************************************************

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.51 2000-09-04 18:23:55 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.52 2000-10-05 18:37:26 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -670 +670 @@
                                       classNameA,
                                       windowNameA,
-                                      info.style | WS_CHILD | WS_CLIPSIBLINGS,
+                                      info.style | WS_CHILD,
                                       info.x * xUnit / 4,
                                       info.y * yUnit / 8,

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.213 2000-10-05 13:47:06 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.214 2000-10-05 18:37:26 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -413 +413 @@
   dwExStyle = cs->dwExStyle;
 
-  hwndLinkAfter = HWND_TOP;
-#if 1
-  if(CONTROLS_IsControl(this, BUTTON_CONTROL) && ((dwStyle & 0x0f) == BS_GROUPBOX))
-  {
-        hwndLinkAfter = HWND_BOTTOM;
-        dwStyle |= WS_CLIPSIBLINGS;
-  }
-  else
-#endif
-  if(CONTROLS_IsControl(this, STATIC_CONTROL) && !(dwStyle & WS_GROUP)) {
-        dwStyle |= WS_CLIPSIBLINGS;
-  }
+  hwndLinkAfter = ((cs->style & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD) ? HWND_BOTTOM : HWND_TOP;
 
   /* Increment class window counter */