Changeset 1540 for trunk/src/user32/oslibwin.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/oslibwin.cpp (modified) (6 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.40 1999-10-30 18:08:19 dengert Exp $ */
+/* $Id: oslibwin.cpp,v 1.41 1999-11-01 19:11:40 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -50 +50 @@
 //******************************************************************************
 HWND OSLibWinCreateWindow(HWND hwndParent, ULONG dwWinStyle, ULONG dwFrameStyle,
-                          char *pszName, HWND Owner, ULONG fHWND_BOTTOM, HWND *hwndFrame,
+                          char *pszName, HWND Owner, ULONG fBottom, HWND *hwndFrame,
                           ULONG id)
 {
@@ -69 +69 @@
   ULONG dwClientStyle;
 
-#if 0
-//  if(dwFrameStyle || hwndParent == HWND_DESKTOP) {
-        dwClientStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPSIBLINGS);
-
-        dwFrameStyle |= FCF_NOBYTEALIGN;
-        if (hwndParent == HWND_DESKTOP && dwFrameStyle & FCF_TITLEBAR)
-                dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER;
-
-        dwWinStyle &= ~(WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
-
-        *hwndFrame = WinCreateStdWindow(hwndParent, dwWinStyle,
-                                       &dwFrameStyle, WIN32_STDCLASS,
-                                       "", dwClientStyle, 0, id, &hwndClient);
-        if(*hwndFrame) {
-                if(pszName) {
-                        WinSetWindowText(*hwndFrame, pszName);
-                }
-                return hwndClient;
-        }
-        dprintf(("OSLibWinCreateWindow: (FRAME) WinCreateStdWindow failed (%x)", WinGetLastError(GetThreadHAB())));
-        return 0;
-#else
   BOOL TopLevel = hwndParent == HWND_DESKTOP;
   FRAMECDATA FCData = {sizeof (FRAMECDATA), 0, 0, 0};
@@ -107 +85 @@
                                 TopLevel ? WC_FRAME : WIN32_INNERFRAME,
                                 pszName, dwWinStyle, 0, 0, 50, 30,
-                                hwndParent, HWND_TOP, id, &FCData, NULL);
+                                hwndParent, HWND_TOP, 
+                                id, &FCData, NULL);
   if (*hwndFrame) {
     hwndClient = WinCreateWindow (*hwndFrame, WIN32_STDCLASS,
@@ -114 +93 @@
     if (hwndClient != NULLHANDLE)
       WinSendMsg (*hwndFrame, WM_UPDATEFRAME, 0, 0);
+
     return hwndClient;
   }
   dprintf(("OSLibWinCreateWindow: (FRAME) WinCreateStdWindow failed (%x)", WinGetLastError(GetThreadHAB())));
   return 0;
-#endif
-
-#if 0
-  }
-  hwndClient = WinCreateWindow(hwndParent, WIN32_STDCLASS, pszName, dwWinStyle, 0, 0, 0, 0,
-                               Owner, (fHWND_BOTTOM) ? HWND_BOTTOM :HWND_TOP, 0, NULL,
-                               NULL);
-  *hwndFrame = hwndClient;
-  return hwndClient;
-#endif
 }
 //******************************************************************************
@@ -378 +348 @@
   if(rc == 0)
         dprintf(("WinShowWindow %x failed %x", hwnd, WinGetLastError(GetThreadHAB())));
-  rc = WinSetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, fl);
+  rc = WinSetWindowPos(hwnd, 0, 0, 0, 0, 0, fl);
   if(rc == 0)
         dprintf(("WinShowWindow %x failed %x", hwnd, WinGetLastError(GetThreadHAB())));