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

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.6 1999-09-25 14:18:11 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.7 1999-09-25 15:10:00 cbratschi Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -113 +113 @@
         *OSWinStyle |= WS_TABSTOP;
 
-  if(dwStyle & WS_CAPTION_W)
-        *OSFrameStyle |= FCF_TITLEBAR;
-  if(dwStyle & WS_DLGFRAME_W)
-        *OSFrameStyle |= FCF_DLGBORDER;
-  else
-  if(dwStyle & WS_BORDER_W)
-        *OSFrameStyle |= FCF_BORDER;
-
-  if(dwStyle & WS_VSCROLL_W)
-        *OSFrameStyle |= FCF_VERTSCROLL;
-  if(dwStyle & WS_HSCROLL_W)
-        *OSFrameStyle |= FCF_HORZSCROLL;
-  if(dwStyle & WS_SYSMENU_W)
-        *OSFrameStyle |= FCF_SYSMENU;
-  if(dwStyle & WS_THICKFRAME_W)
-        *OSFrameStyle |= FCF_SIZEBORDER;        //??
-  if(dwStyle & WS_MINIMIZEBOX_W)
-        *OSFrameStyle |= FCF_MINBUTTON;
-  if(dwStyle & WS_MAXIMIZEBOX_W)
-        *OSFrameStyle |= FCF_MAXBUTTON;
-
-  if(dwExStyle & WS_EX_DLGMODALFRAME_W)
-        *OSFrameStyle |= FCF_DLGBORDER;
+  if (dwStyle & WS_CHILD_W)
+  {
+    if (dwExStyle & WS_EX_CLIENTEDGE_W ||
+        dwExStyle & WS_EX_STATICEDGE_W ||
+        dwExStyle & WS_EX_WINDOWEDGE_W)
+          *OSFrameStyle |= FCF_DLGBORDER;
+
+    if(dwStyle & WS_VSCROLL_W)
+          *OSFrameStyle |= FCF_VERTSCROLL;
+    if(dwStyle & WS_HSCROLL_W)
+          *OSFrameStyle |= FCF_HORZSCROLL;
+  } else
+  {
+    if(dwStyle & WS_CAPTION_W)
+          *OSFrameStyle |= FCF_TITLEBAR;
+    if(dwStyle & WS_DLGFRAME_W)
+          *OSFrameStyle |= FCF_DLGBORDER;
+    else
+    if(dwStyle & WS_BORDER_W)
+          *OSFrameStyle |= FCF_BORDER;
+
+    if(dwStyle & WS_VSCROLL_W)
+          *OSFrameStyle |= FCF_VERTSCROLL;
+    if(dwStyle & WS_HSCROLL_W)
+          *OSFrameStyle |= FCF_HORZSCROLL;
+    if(dwStyle & WS_SYSMENU_W)
+          *OSFrameStyle |= FCF_SYSMENU;
+    if(dwStyle & WS_THICKFRAME_W)
+          *OSFrameStyle |= FCF_SIZEBORDER;        //??
+    if(dwStyle & WS_MINIMIZEBOX_W)
+          *OSFrameStyle |= FCF_MINBUTTON;
+    if(dwStyle & WS_MAXIMIZEBOX_W)
+          *OSFrameStyle |= FCF_MAXBUTTON;
+
+    if(dwExStyle & WS_EX_DLGMODALFRAME_W)
+          *OSFrameStyle |= FCF_DLGBORDER;
+  }
 
   return TRUE;