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

Timestamp:

Sep 23, 1999, 6:44:33 PM (26 years ago)

Author:

sandervl

Message:

Control Z-order + changes for comctl32

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.7 1999-09-22 08:58:35 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.8 1999-09-23 16:44:33 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -192 +192 @@
         GlobalGetAtomNameA( classAtom, buffer, sizeof(buffer) );
         dprintf(("Bad class '%s'\n", buffer ));
+        SetLastError(ERROR_INVALID_PARAMETER);
         return 0;
   }
@@ -304 +305 @@
   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 0
@@ -2173 +2179 @@
 //******************************************************************************
 //******************************************************************************
+HWND Win32BaseWindow::Win32ToOS2Handle(HWND hwnd)
+{
+        Win32BaseWindow *window = GetWindowFromHandle(hwnd);
+
+        if(window) {
+                return window->getOS2WindowHandle();
+        }
+        else  return hwnd;    //OS/2 window handle
+}
+//******************************************************************************
+//******************************************************************************
+HWND Win32BaseWindow::OS2ToWin32Handle(HWND hwnd)
+{
+        Win32BaseWindow *window = GetWindowFromOS2Handle(hwnd);
+
+        if(window) {
+                return window->getWindowHandle();
+        }
+        else  return hwnd;    //OS/2 window handle
+}
+//******************************************************************************
+//******************************************************************************
 GenericObject *Win32BaseWindow::windows  = NULL;