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

Timestamp:

Oct 11, 1999, 6:04:52 PM (26 years ago)

Author:

cbratschi

Message:

pmframe finished

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.34 1999-10-11 15:26:05 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.35 1999-10-11 16:04:51 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -432 +432 @@
   DWORD dwOSWinStyle, dwOSFrameStyle;
 
-  OSLibWinConvertStyle(cs->style, cs->dwExStyle, &dwOSWinStyle, &dwOSFrameStyle, &borderWidth, &borderHeight);
+  OSLibWinConvertStyle(cs->style, &cs->dwExStyle, &dwOSWinStyle, &dwOSFrameStyle, &borderWidth, &borderHeight);
+  dwExStyle = cs->dwExStyle;
 
 //CB: dwOSFrameStyle handled by OSLibWinConvertStyle
@@ -532 +533 @@
                      rectClient.right-rectClient.left,
                      rectClient.bottom-rectClient.top,
-                     SWP_NOACTIVATE | SWP_NOZORDER);
+                     SWP_NOACTIVATE | SWP_NOZORDER );
   }
   else {
@@ -540 +541 @@
                      SWP_NOACTIVATE);
   }
+
   //Subclass frame
-
   if (isFrameWindow())
   {
     pOldFrameProc = FrameSubclassFrameWindow(this);
-    if (dwStyle & WS_CHILD && HAS_3DFRAME(dwExStyle)) FrameSetBorderSize(this);
+    if (isChild()) FrameSetBorderSize(this,TRUE);
   }
 
@@ -1456 +1457 @@
     if( ctlType == CTLCOLOR_SCROLLBAR)
     {
-            HBRUSH hb = GetSysColorBrush(COLOR_SCROLLBAR);
+            HBRUSH hb = GetSysColorBrush(COLOR_SCROLLBAR);
         COLORREF bk = GetSysColor(COLOR_3DHILIGHT);
         SetTextColor( hdc, GetSysColor(COLOR_3DFACE));
@@ -1471 +1472 @@
         }
 #endif
-        UnrealizeObject( hb );
+        UnrealizeObject( hb );
         return (LRESULT)hb;
     }
@@ -1477 +1478 @@
     SetTextColor( hdc, GetSysColor(COLOR_WINDOWTEXT));
 
-        if ((ctlType == CTLCOLOR_EDIT) || (ctlType == CTLCOLOR_LISTBOX))
-        {
-            SetBkColor( hdc, GetSysColor(COLOR_WINDOW) );
-        }
-        else
-        {
-            SetBkColor( hdc, GetSysColor(COLOR_3DFACE) );
-            return (LRESULT)GetSysColorBrush(COLOR_3DFACE);
-        }
+        if ((ctlType == CTLCOLOR_EDIT) || (ctlType == CTLCOLOR_LISTBOX))
+        {
+            SetBkColor( hdc, GetSysColor(COLOR_WINDOW) );
+        }
+        else
+        {
+            SetBkColor( hdc, GetSysColor(COLOR_3DFACE) );
+            return (LRESULT)GetSysColorBrush(COLOR_3DFACE);
+        }
     return (LRESULT)GetSysColorBrush(COLOR_WINDOW);
 }
@@ -1531 +1532 @@
 
     case WM_CTLCOLOR:
-            return DefWndControlColor(HIWORD(lParam), (HDC)wParam);
+            return DefWndControlColor(HIWORD(lParam), (HDC)wParam);
 
     case WM_VKEYTOITEM:
     case WM_CHARTOITEM:
-             return -1;
+             return -1;
 
     case WM_PARENTNOTIFY:
@@ -1967 +1968 @@
     dprintf(("ShowWindow %x", nCmdShow));
     if(fFirstShow) {
-        if(isFrameWindow() && IS_OVERLAPPED(getStyle())) {
+        if(isFrameWindow() && IS_OVERLAPPED(getStyle()) && !isChild()) {
                 SendMessageA(WM_SIZE, SIZE_RESTORED,
                                 MAKELONG(rectClient.right-rectClient.left,
@@ -2047 +2048 @@
        {
            hParent = getParent()->getOS2WindowHandle();
-           OSLibWinQueryWindowPos(OS2Hwnd, &swpOld);
+           OSLibWinQueryWindowPos(isFrameWindow() ? OS2HwndFrame:OS2Hwnd, &swpOld);
        }
        else
@@ -2064 +2065 @@
    if (isFrameWindow())
    {
-      POINT maxSize, maxPos, minTrack, maxTrack;
-
-      GetMinMaxInfo(&maxSize, &maxPos, &minTrack, &maxTrack);
-
-      if (swp.cx > maxTrack.x) swp.cx = maxTrack.x;
-      if (swp.cy > maxTrack.y) swp.cy = maxTrack.y;
-      if (swp.cx < minTrack.x) swp.cx = minTrack.x;
-      if (swp.cy < minTrack.y) swp.cy = minTrack.y;
+      if (!isChild())
+      {
+        POINT maxSize, maxPos, minTrack, maxTrack;
+
+        GetMinMaxInfo(&maxSize, &maxPos, &minTrack, &maxTrack);
+
+        if (swp.cx > maxTrack.x) swp.cx = maxTrack.x;
+        if (swp.cy > maxTrack.y) swp.cy = maxTrack.y;
+        if (swp.cx < minTrack.x) swp.cx = minTrack.x;
+        if (swp.cy < minTrack.y) swp.cy = minTrack.y;
+      }
 
       swp.hwnd = OS2HwndFrame;
@@ -2602 +2606 @@
 Win32BaseWindow *Win32BaseWindow::GetWindowFromOS2FrameHandle(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;
-*/
 }
 //******************************************************************************
@@ -2646 +2636 @@
 //******************************************************************************
 //******************************************************************************
+
 GenericObject *Win32BaseWindow::windows  = NULL;