Changeset 1491 for trunk/src

Timestamp:

Oct 28, 1999, 5:20:25 PM (26 years ago)

Author:

sandervl

Message:

window style fixes

Location:

trunk/src/user32

Files:

• Makefile (modified) (2 diffs)
• oslibwin.cpp (modified) (9 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.38 1999-10-28 12:00:33 sandervl Exp $
+# $Id: Makefile,v 1.39 1999-10-28 15:20:24 sandervl Exp $
 
 #
@@ -46 +46 @@
 $(TARGET).dll: $(OBJS) $(TARGET).def $(TARGET).lrf
 !ifdef DEBUG
-#       icc -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /NOD /NOFREE" @$(TARGET).lrf
-        ilink /de /map /noe /NOD /dbgpack /NoLogo /NOFREE @$(TARGET).lrf
+!ifdef NODEBUGINFO
+        ilink /nodeb /map /noe /NOD /NoLogo /NOFREE @$(TARGET).lrf
+!else
+        ilink /de /map  /noe /NOD /dbgpack /NoLogo /NOFREE @$(TARGET).lrf
+!endif
 !else
         ilink /map  /noe /NOD /NoLogo /FREE @$(TARGET).lrf

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.36 1999-10-25 20:17:19 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.37 1999-10-28 15:20:25 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -70 +70 @@
 
 //  if(dwFrameStyle || hwndParent == HWND_DESKTOP) {
-        dwClientStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP);
+        dwClientStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPSIBLINGS);
 
         dwFrameStyle |= FCF_NOBYTEALIGN;
@@ -76 +76 @@
                 dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER;
 
-        dwWinStyle   &= ~WS_CLIPCHILDREN;
+        dwWinStyle &= ~(WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
 
         *hwndFrame = WinCreateStdWindow(hwndParent, dwWinStyle,
@@ -139 +139 @@
       *OSFrameStyle |= FCF_SIZEBORDER;
       *borderHeight = *borderWidth = 2;
-    } else if (*dwExStyle & WS_EX_DLGMODALFRAME_W)
+    }
+    else
+    if (*dwExStyle & WS_EX_DLGMODALFRAME_W)
     {
       *OSFrameStyle |= FCF_SIZEBORDER;
       *borderHeight = *borderWidth = 3;
-    } else if (*dwExStyle & WS_EX_STATICEDGE_W)
+    }
+    else
+    if (*dwExStyle & WS_EX_STATICEDGE_W)
     {
       *OSFrameStyle |= FCF_SIZEBORDER;
@@ -163 +167 @@
   else
   {
-    if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W)
-          *OSFrameStyle |= FCF_TITLEBAR;
-    if(dwStyle & WS_DLGFRAME_W)
-          *OSFrameStyle |= FCF_DLGBORDER;
+    if((dwStyle & WS_CAPTION_W) == WS_DLGFRAME_W)
+        *OSFrameStyle |= FCF_DLGBORDER;
     else
-    if(dwStyle & WS_BORDER_W)
-          *OSFrameStyle |= FCF_BORDER;
+    {
+        if((dwStyle & WS_CAPTION_W) == WS_CAPTION_W)
+            *OSFrameStyle |= (FCF_TITLEBAR | FCF_BORDER);
+        else
+        if(dwStyle & WS_BORDER_W)
+            *OSFrameStyle |= FCF_BORDER;
+    }
 
     if(dwStyle & WS_VSCROLL_W)
@@ -200 +207 @@
 {
   if(offset == OSLIB_QWL_USER)
-        offset = QWL_USER;
+    offset = QWL_USER;
 
   return WinSetWindowULong(hwnd, offset, value);
@@ -209 +216 @@
 {
   if(offset == OSLIB_QWL_USER)
-        offset = QWL_USER;
+    offset = QWL_USER;
 
   return WinQueryWindowULong(hwnd, offset);
@@ -1036 +1043 @@
   OSLibWinConvertStyle(dwStyle, &dwExStyle, &OSWinStyle, &OSFrameStyle, &borderWidth, &borderHeight);
 
-  OSWinStyle = OSWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPCHILDREN);
+  OSWinStyle = OSWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
 
   WinSetWindowULong(hwnd, QWL_STYLE,
@@ -1042 +1049 @@
                     OSWinStyle);
 
-  //CB: bug: it doesn't work with child windows!
-
-  if(OSFrameStyle != 0)  // maybe WinQueryClassName == WC_FRAME is better
+  if(OSFrameStyle & FCF_TITLEBAR)
   {
-    if(OSFrameStyle & FCF_TITLEBAR)
-    {
       WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_TITLEBAR), hwnd, FALSE);
       WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_MENU), hwnd, FALSE);
-    }
-    else
-    {
+  }
+  else
+  {
       WinSetParent(WinWindowFromID(hwnd, FID_TITLEBAR), HWND_OBJECT, FALSE);
       WinSetParent(WinWindowFromID(hwnd, FID_MENU), HWND_OBJECT, FALSE);
-    }
-    if(OSFrameStyle & FCF_SYSMENU)
+  }
+  if(OSFrameStyle & FCF_SYSMENU)
       WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_SYSMENU), hwnd, FALSE);
-    else
+  else
       WinSetParent(WinWindowFromID(hwnd, FID_SYSMENU), HWND_OBJECT, FALSE);
 
-    if(OSFrameStyle & FCF_MINBUTTON | OSFrameStyle & FCF_MAXBUTTON)
+  if(OSFrameStyle & FCF_MINBUTTON | OSFrameStyle & FCF_MAXBUTTON)
       WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_MINMAX), hwnd, FALSE);
-    else
+  else
       WinSetParent(WinWindowFromID(hwnd, FID_MINMAX), HWND_OBJECT, FALSE);
 
-    if(OSFrameStyle & FCF_VERTSCROLL)
+  if(OSFrameStyle & FCF_VERTSCROLL)
       WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_VERTSCROLL), hwnd, FALSE);
-    else
+  else
       WinSetParent(WinWindowFromID(hwnd, FID_VERTSCROLL), HWND_OBJECT, FALSE);
 
-    if(OSFrameStyle & FCF_HORZSCROLL)
+  if(OSFrameStyle & FCF_HORZSCROLL)
       WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_HORZSCROLL), hwnd, FALSE);
-    else
+  else
       WinSetParent(WinWindowFromID(hwnd, FID_HORZSCROLL), HWND_OBJECT, FALSE);
 
-    WinSendMsg(hwnd, WM_UPDATEFRAME,
-               MPFROMLONG(FCF_TITLEBAR | FCF_SYSMENU | FCF_MINMAX |
-                          FCF_MENU | FCF_VERTSCROLL | FCF_HORZSCROLL),
-               MPVOID);
-  }
+#if 0
+  WNDPARAMS wndparam = {0};
+  FRAMECDATA framecdata = {0};
+
+  framecdata.cb = sizeof(FRAMECDATA);
+
+  wndparam.fsStatus  = WPM_CTLDATA;
+  wndparam.cbCtlData = framecdata.cb;
+  wndparam.pCtlData  = (PVOID)&framecdata;
+  WinSendMsg(hwnd, WM_QUERYWINDOWPARAMS, &wndparam, 0);
+
+  wndparam.fsStatus = WPM_CTLDATA;
+  wndparam.pCtlData = (PVOID)&framecdata;
+  framecdata.flCreateFlags = OSFrameStyle;
+  WinSendMsg(hwnd, WM_SETWINDOWPARAMS, &wndparam, 0);
+#endif
+
+  WinSendMsg(hwnd, WM_UPDATEFRAME,
+             MPFROMLONG(FCF_TITLEBAR | FCF_SYSMENU | FCF_MINMAX |
+                        FCF_MENU | FCF_VERTSCROLL | FCF_HORZSCROLL),
+             MPVOID);
 }
 //******************************************************************************

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.63 1999-10-28 12:00:34 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.64 1999-10-28 15:20:25 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2563 +2563 @@
                 setStyle(ss.styleNew);
                 if(!IsWindowDestroyed())
-                    OSLibSetWindowStyle(OS2HwndFrame, dwStyle);
+                    OSLibSetWindowStyle(OS2HwndFrame, ss.styleNew);
                 SendMessageA(WM_STYLECHANGED,GWL_STYLE,(LPARAM)&ss);
                 return ss.styleOld;