Changeset 1025 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

Control Z-order + changes for comctl32

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• heapshared.cpp (modified) (2 diffs)
• user32exp.def (modified) (1 diff)
• win32wbase.cpp (modified) (4 diffs)
• win32wbase.h (modified) (2 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.12 1999-09-15 23:18:47 sandervl Exp $
+; $Id: USER32.DEF,v 1.13 1999-09-23 16:44:32 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -627 +627 @@
     NativeCreateDlgIP          = _NativeCreateDlgIP@24       @2004
     NativeLoadBitmap           = _NativeLoadBitmap@8         @2005
+
+    Win32ToOS2Handle__FUl      = Win32ToOS2Handle__15Win32BaseWindowFUl @2006

trunk/src/user32/heapshared.cpp

@@ -1 @@
-/* $Id: heapshared.cpp,v 1.2 1999-09-23 14:24:57 phaller Exp $ */
+/* $Id: heapshared.cpp,v 1.3 1999-09-23 16:44:32 sandervl Exp $ */
 /*
  * Shared heap functions for OS/2
@@ -115 +115 @@
                         return NULL;
                 }
-                for(int j=0;
-        j < *size/PAGE_SIZE;
-        j++)
-  {
+                for(int j=0;j < *size/PAGE_SIZE; j++)
+                {
                         pageBitmap[i+j] = 1; //mark as committed
                 }

trunk/src/user32/user32exp.def

@@ -577 +577 @@
     _NativeCreateDlgIP@24                     @2004
     _NativeLoadBitmap@8                       @2005
+    Win32ToOS2Handle__FUl                     @2006

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;

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.4 1999-09-22 08:58:36 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.5 1999-09-23 16:44:33 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -186 +186 @@
                              BOOL fUnicode = 0);
 
-    static HWND Win32ToOS2Handle(HWND hwnd)
-    {
-        Win32BaseWindow *window = GetWindowFromHandle(hwnd);
-
-        if(window) {
-                return window->getOS2WindowHandle();
-        }
-        else  return hwnd;    //OS/2 window handle
-    }
-
-    static HWND OS2ToWin32Handle(HWND hwnd)
-    {
-        Win32BaseWindow *window = GetWindowFromOS2Handle(hwnd);
-
-        if(window) {
-                return window->getWindowHandle();
-        }
-        else  return hwnd;    //OS/2 window handle
-    }
+    static HWND Win32ToOS2Handle(HWND hwnd);
+    static HWND OS2ToWin32Handle(HWND hwnd);
 
 static Win32BaseWindow *GetWindowFromHandle(HWND hwnd);