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

Timestamp:

Jun 10, 2001, 2:05:41 PM (24 years ago)

Author:

sandervl

Message:

bugfixes + os/2 look support added

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.261 2001-06-10 09:19:58 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.262 2001-06-10 12:05:40 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -469 +469 @@
     teb->o.odin.newWindow = (ULONG)this;
 
-    DWORD dwOSWinStyle;
-
-    OSLibWinConvertStyle(dwStyle,dwExStyle,&dwOSWinStyle);
+    DWORD dwOSWinStyle, dwOSFrameStyle;
+
+    OSLibWinConvertStyle(dwStyle,dwExStyle,&dwOSWinStyle, &dwOSFrameStyle);
 
     OS2Hwnd = OSLibWinCreateWindow((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
-                                   dwOSWinStyle,(char *)windowNameA,
+                                   dwOSWinStyle, dwOSFrameStyle, (char *)windowNameA,
                                    (owner) ? owner->getOS2WindowHandle() : ((getParent()) ? getParent()->getOS2WindowHandle() : OSLIB_HWND_DESKTOP),
                                    (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE,
@@ -582 +582 @@
                 windowNameA[0] = 0;
             }
+        }
+        if(fOS2Look) {
+            OSLibWinSetTitleBarText(OS2HwndFrame, windowNameA);
         }
     }
@@ -1202 +1205 @@
   }
 #endif
+  if(fOS2Look && ((dwStyle & WS_CAPTION) == WS_CAPTION))
+  {
+      RECT rect = {0};
+      int  height  = getWindowHeight();
+      RECTLOS2 rectOS2;
+
+      AdjustRectOuter(&rect, FALSE);
+
+      rect.left   = -rect.left;
+      rect.top    = rect.bottom - rect.top;
+      rect.right  = rectWindow.right - rectWindow.left - rect.right;
+ 
+      rectOS2.xLeft   = rect.left;
+      rectOS2.xRight  = rect.right;
+      rectOS2.yBottom = height - rect.top;
+      rectOS2.yTop    = height - rect.bottom;
+      OSLibWinPositionFrameControls(getOS2FrameWindowHandle(), &rectOS2);
+  }
   return rc;
 }
@@ -1423 +1444 @@
             if(hTaskList) {
                 OSLibWinChangeTaskList(hTaskList, OS2HwndFrame, getWindowNameA(), (getStyle() & WS_VISIBLE) ? 1 : 0);
+                if(fOS2Look) {
+                    OSLibWinSetTitleBarText(OS2HwndFrame, getWindowNameA());
+                }
             }
         }
@@ -1913 +1937 @@
             if(hTaskList) {
                 OSLibWinChangeTaskList(hTaskList, OS2HwndFrame, getWindowNameA(), (getStyle() & WS_VISIBLE) ? 1 : 0);
+                if(fOS2Look) {
+                    OSLibWinSetTitleBarText(OS2HwndFrame, getWindowNameA());
+                }
             }
         }
@@ -2766 +2793 @@
    }
    else {
+        if(newparent) RELEASE_WNDOBJ(newparent);
+
         setParent(windowDesktop);
+        windowDesktop->addRef();
         windowDesktop->addChild(this);
         OSLibWinSetParent(getOS2FrameWindowHandle(), OSLIB_HWND_DESKTOP);
@@ -3651 +3681 @@
     if(HwGetWindowHandleData(hwnd, (DWORD *)&window) == TRUE) {
          if(window) {
-             dprintf(("addRef %x; refcount %d", hwnd, window->getRefCount()+1));
+////             dprintf(("addRef %x; refcount %d", hwnd, window->getRefCount()+1));
              window->addRef();
          }