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

Timestamp:

Oct 8, 1999, 6:13:09 PM (26 years ago)

Author:

cbratschi

Message:

subclassed frame, WM_STYLECHANGING fix

File:

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

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.16 1999-10-08 14:57:17 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.17 1999-10-08 16:13:07 cbratschi Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -90 +90 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle, ULONG *OSFrameStyle)
+BOOL OSLibWinConvertStyle(ULONG dwStyle, ULONG dwExStyle, ULONG *OSWinStyle, ULONG *OSFrameStyle, ULONG *borderWidth, ULONG *borderHeight)
 {
   *OSWinStyle   = 0;
   *OSFrameStyle = 0;
+  *borderWidth  = 0;
+  *borderHeight = 0;
 
   /* Window styles */
@@ -126 +128 @@
         dwExStyle & WS_EX_STATICEDGE_W ||
         dwExStyle & WS_EX_WINDOWEDGE_W)
-          *OSFrameStyle |= FCF_DLGBORDER;
+          {
+            *OSFrameStyle |= FCF_DLGBORDER;
+            *borderHeight = *borderWidth = 2; //CB: right?
+          }
 
     if(dwStyle & WS_VSCROLL_W)
@@ -834 +839 @@
 void OSLibSetWindowStyle(HWND hwnd, ULONG dwStyle)
 {
-  ULONG OSWinStyle, OSFrameStyle;
-
-  OSLibWinConvertStyle(dwStyle, 0, &OSWinStyle, &OSFrameStyle);
+  ULONG OSWinStyle, OSFrameStyle, borderWidth, borderHeight;
+
+  OSLibWinConvertStyle(dwStyle, 0, &OSWinStyle, &OSFrameStyle, &borderWidth, &borderHeight);
 
   WinSetWindowULong(hwnd, QWL_STYLE,