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

Timestamp:

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

Author:

cbratschi

Message:

subclassed frame, WM_STYLECHANGING fix

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.29 1999-10-08 14:57:18 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.30 1999-10-08 16:13:08 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -38 +38 @@
 #include "heapshared.h"
 #include "dc.h"
+#include "pmframe.h"
 
 #define HAS_DLGFRAME(style,exStyle) \
@@ -109 +110 @@
   windowId         = 0xFFFFFFFF;        //default = -1
   userData         = 0;
+
+  pOldFrameProc = NULL;
+  borderWidth   = 0;
+  borderHeight  = 0;
 
   hwndLinkAfter    = HWND_BOTTOM;
@@ -424 +429 @@
   DWORD dwOSWinStyle, dwOSFrameStyle;
 
-  OSLibWinConvertStyle(cs->style, cs->dwExStyle, &dwOSWinStyle, &dwOSFrameStyle);
+  OSLibWinConvertStyle(cs->style, cs->dwExStyle, &dwOSWinStyle, &dwOSFrameStyle, &borderWidth, &borderHeight);
 
 //CB: dwOSFrameStyle handled by OSLibWinConvertStyle
-//    todo: subclass frame WM_PAINT -> call DrawEdge() if HAS_3DFRAME (code below)
-//          OSLibWinCreateWindow: perhaps problems
+//    OSLibWinCreateWindow: perhaps problems
 //    shouldn't we always use a frame? -> no problems with scrollbars
 
@@ -527 +531 @@
   }
   //Subclass frame
-  if (dwStyle & WS_CHILD && HAS_3DFRAME(dwExStyle))
+
+  if (isFrameWindow())
   {
-    //CB: use a win32 window procedure and call DrawEdge() or
-    //    emulate DrawEdge() in a OS/2 procedure
+    pOldFrameProc = FrameSubclassFrameWindow(this);
+    if (dwStyle & WS_CHILD && HAS_3DFRAME(dwExStyle)) FrameSetBorderSize(this);
   }
 
@@ -2397 +2402 @@
                 ss.styleNew = value;
                 SendMessageA(WM_STYLECHANGING,GWL_EXSTYLE,(LPARAM)&ss);
-                oldval = dwExStyle;
-                setExStyle(value);
+                setExStyle(ss.styleNew);
                 SendMessageA(WM_STYLECHANGED,GWL_EXSTYLE,(LPARAM)&ss);
-                return oldval;
+                return ss.styleOld;
         }
         case GWL_STYLE:
@@ -2409 +2413 @@
                 ss.styleNew = value;
                 SendMessageA(WM_STYLECHANGING,GWL_STYLE,(LPARAM)&ss);
-                oldval = dwStyle;
-                setStyle(value);
+                setStyle(ss.styleNew);
                 OSLibSetWindowStyle(OS2HwndFrame, dwStyle);
                 SendMessageA(WM_STYLECHANGED,GWL_STYLE,(LPARAM)&ss);
-                return oldval;
+                return ss.styleOld;
         }
         case GWL_WNDPROC:
@@ -2536 +2539 @@
 //******************************************************************************
 //******************************************************************************
+Win32BaseWindow *Win32BaseWindow::GetWindowFromFrameHandle(HWND hwnd)
+{
+ Win32BaseWindow *win32wnd;
+ DWORD        magic;
+
+  return GetWindowFromOS2Handle(OSLibWinWindowFromID(hwnd,OSLIB_FID_CLIENT));
+
+  //CB: doesn't work with frame window words
+/*
+  win32wnd = (Win32BaseWindow *)OSLibWinGetWindowULong(hwnd, OFFSET_WIN32WNDPTR);
+  magic    = OSLibWinGetWindowULong(hwnd, OFFSET_WIN32PM_MAGIC);
+
+  if(win32wnd && CheckMagicDword(magic)) {
+        return win32wnd;
+  }
+  return 0;
+*/
+}
+//******************************************************************************
+//******************************************************************************
 HWND Win32BaseWindow::Win32ToOS2Handle(HWND hwnd)
 {