Changeset 1046 for trunk/src/user32/win32wbase.cpp

Timestamp:

Sep 25, 1999, 5:10:00 PM (26 years ago)

Author:

cbratschi

Message:

WS_EX_* 3D frames for child windows

File:

• trunk/src/user32/win32wbase.cpp (modified) (3 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.11 1999-09-25 09:27:07 dengert Exp $ */
+/* $Id: win32wbase.cpp,v 1.12 1999-09-25 15:10:00 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -47 +47 @@
      !(((style) & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME))
 
+#define HAS_3DFRAME(exStyle) \
+    ((exStyle & WS_EX_CLIENTEDGE) || (exStyle & WS_EX_STATICEDGE) || (exStyle & WS_EX_WINDOWEDGE))
+
 #define HAS_BORDER(style, exStyle) \
     ((style & WS_BORDER) || HAS_THICKFRAME(style) || HAS_DLGFRAME(style,exStyle))
@@ -389 +392 @@
   OSLibWinConvertStyle(cs->style, cs->dwExStyle, &dwOSWinStyle, &dwOSFrameStyle);
 
-  //TODO: Test
-#if 1
-  if(cs->style & WS_CHILD) {
-        dwOSFrameStyle = 0;
-  }
-#endif
+//CB: dwOSFrameStyle handled by OSLibWinConvertStyle
+//    todo: subclass frame WM_PAINT -> call DrawEdge() if HAS_3DFRAME
+//          OSLibWinCreateWindow: perhaps problems
+//    shouldn't we always use a frame? -> no problems with scrollbars
 
   if(cs->lpszName)