Changeset 1281 for trunk/src/user32/oslibwin.cpp

Timestamp:

Oct 14, 1999, 11:22:43 AM (26 years ago)

Author:

sandervl

Message:

Window creation rewrite + bugfixes. NOT WORKING CORRECTLY YET..

File:

• trunk/src/user32/oslibwin.cpp (modified) (7 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.26 1999-10-13 14:24:25 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.27 1999-10-14 09:22:40 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -48 +48 @@
  HWND  hwndClient;
 
-  if(dwFrameStyle)
-        dprintf(("FRAME:    WinCreateWindow %x %x %x %s", hwndParent, dwWinStyle, dwFrameStyle, pszName));
-  else  dprintf(("WinCreateWindow %x %x %x %s", hwndParent, dwWinStyle, dwFrameStyle, pszName));
+  dprintf(("WinCreateWindow %x %x %x %s", hwndParent, dwWinStyle, dwFrameStyle, pszName));
 
   if(pszName && *pszName == 0) {
@@ -62 +60 @@
   }
 
-  if(dwFrameStyle || hwndParent == HWND_DESKTOP) {
-        ULONG dwClientStyle;
-
+  ULONG dwClientStyle;
+
+//  if(dwFrameStyle || hwndParent == HWND_DESKTOP) {
         dwClientStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP);
-//        if(pszName)
-//                dwFrameStyle |= FCF_TITLEBAR;
 
         dwFrameStyle |= FCF_NOBYTEALIGN;
-        if (hwndParent == HWND_DESKTOP) dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER;
+        if (hwndParent == HWND_DESKTOP && dwFrameStyle & FCF_TITLEBAR) 
+                dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER;
+
         dwWinStyle   &= ~WS_CLIPCHILDREN;
 
@@ -84 +82 @@
         dprintf(("OSLibWinCreateWindow: (FRAME) WinCreateStdWindow failed (%x)", WinGetLastError(GetThreadHAB())));
         return 0;
+#if 0
   }
   hwndClient = WinCreateWindow(hwndParent, WIN32_STDCLASS, pszName, dwWinStyle, 0, 0, 0, 0,
@@ -90 +89 @@
   *hwndFrame = hwndClient;
   return hwndClient;
+#endif
 }
 //******************************************************************************
@@ -144 +144 @@
     if(dwStyle & WS_BORDER_W)
     {
-      *OSFrameStyle |= FCF_SIZEBORDER;
+      *OSFrameStyle |= FCF_BORDER;
       *borderHeight = *borderWidth = 1;
     }
@@ -182 +182 @@
   }
 
+  //Clear certain frame bits when the window doesn't have a titlebar
+  if(!(*OSFrameStyle & FCF_TITLEBAR)) {
+        *OSFrameStyle &= ~(FCF_MINBUTTON|FCF_MAXBUTTON|FCF_SYSMENU);
+  }
   return TRUE;
 }