Changeset 11849

Timestamp:

Oct 12, 1999, 8:51:38 PM (26 years ago)

Author:

sandervl

Message:

Only subclass frame when they have either a 3d border or *only* the WS_BORDER borderstyle

Location:

tags/trunk/src/user32

Files:

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

tags/trunk/src/user32/oslibwin.cpp ¶

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.23 1999-10-12 18:14:55 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.24 1999-10-12 18:51:38 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -141 +141 @@
       *borderHeight = *borderWidth = 1;
 
-    } else if (*dwExStyle & WS_EX_WINDOWEDGE_W); //no border
+    } 
+    else
+    if(dwStyle & WS_BORDER_W)
+    {
+      *OSFrameStyle |= FCF_SIZEBORDER;
+      *borderHeight = *borderWidth = 1;
+    }
+    else if (*dwExStyle & WS_EX_WINDOWEDGE_W); //no border
 
     if(dwStyle & WS_VSCROLL_W)

tags/trunk/src/user32/win32wbase.cpp ¶

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.38 1999-10-12 18:14:56 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.39 1999-10-12 18:51:38 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -557 +557 @@
 
   //Subclass frame
-  if (isFrameWindow() && HAS_3DFRAME(dwExStyle))
+  if(isFrameWindow() && (HAS_3DFRAME(dwExStyle) ||
+     (!HAS_DLGFRAME(dwStyle, dwExStyle) && (dwStyle & (WS_DLGFRAME|WS_BORDER|WS_THICKFRAME)) == WS_BORDER)))
   {
-    pOldFrameProc = FrameSubclassFrameWindow(this);
-    if (isChild()) FrameSetBorderSize(this,TRUE);
+        pOldFrameProc = FrameSubclassFrameWindow(this);
+        if (isChild()) FrameSetBorderSize(this,TRUE);
   }