Changeset 2292 for trunk/src/user32/new/win32wbasepos.cpp

Timestamp:

Jan 2, 2000, 8:30:47 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

• trunk/src/user32/new/win32wbasepos.cpp (modified) (3 diffs)

trunk/src/user32/new/win32wbasepos.cpp

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.1 2000-01-01 14:57:31 cbratschi Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.2 2000-01-02 19:30:45 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -72 +72 @@
 #define HAS_MENU()  (!(getStyle() & WS_CHILD) && (GetMenu() != 0))
 
-#if 0
-/***********************************************************************
- *           WINPOS_MinMaximize
- *
- * Fill in lpRect and return additional flags to be used with SetWindowPos().
- * This function assumes that 'cmd' is different from the current window
- * state.
- */
-UINT Win32BaseWindow::MinMaximize(UINT cmd, LPRECT lpRect )
-{
-    UINT swpFlags = 0;
-    POINT pt, size;
-    LPINTERNALPOS lpPos;
-
-    size.x = rectWindow.left; size.y = rectWindow.top;
-    lpPos = WINPOS_InitInternalPos( wndPtr, size, &rectWindow );
-
-    if (lpPos && !HOOK_CallHooks16(WH_CBT, HCBT_MINMAX, hwndSelf, cmd))
-    {
-    if( dwStyle & WS_MINIMIZE )
-    {
-        if( !SendInternalMessageA(WM_QUERYOPEN, 0, 0L ) )
-        return (SWP_NOSIZE | SWP_NOMOVE);
-        swpFlags |= SWP_NOCOPYBITS;
-    }
-    switch( cmd )
-    {
-        case SW_MINIMIZE:
-         if( dwStyle & WS_MAXIMIZE)
-         {
-             flags |= WIN_RESTORE_MAX;
-             dwStyle &= ~WS_MAXIMIZE;
-                 }
-                 else
-             flags &= ~WIN_RESTORE_MAX;
-             dwStyle |= WS_MINIMIZE;
-
-#if 0
-         if( flags & WIN_NATIVE )
-             if( pDriver->pSetHostAttr( wndPtr, HAK_ICONICSTATE, TRUE ) )
-             swpFlags |= MINMAX_NOSWP;
-#endif
-
-         lpPos->ptIconPos = WINPOS_FindIconPos( wndPtr, lpPos->ptIconPos );
-
-         SetRect(lpRect, lpPos->ptIconPos.x, lpPos->ptIconPos.y,
-             GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON) );
-         swpFlags |= SWP_NOCOPYBITS;
-         break;
-
-        case SW_MAXIMIZE:
-                WINPOS_GetMinMaxInfo( wndPtr, &size, &pt, NULL, NULL );
-
-         if( dwStyle & WS_MINIMIZE )
-         {
-             if( flags & WIN_NATIVE )
-             if( pDriver->pSetHostAttr( wndPtr, HAK_ICONICSTATE, FALSE ) )
-                 swpFlags |= MINMAX_NOSWP;
-
-             WINPOS_ShowIconTitle( wndPtr, FALSE );
-             dwStyle &= ~WS_MINIMIZE;
-         }
-                 dwStyle |= WS_MAXIMIZE;
-
-         SetRect16( lpRect, lpPos->ptMaxPos.x, lpPos->ptMaxPos.y,
-                    size.x, size.y );
-         break;
-
-        case SW_RESTORE:
-         if( dwStyle & WS_MINIMIZE )
-         {
-             if( flags & WIN_NATIVE )
-             if( pDriver->pSetHostAttr( wndPtr, HAK_ICONICSTATE, FALSE ) )
-                 swpFlags |= MINMAX_NOSWP;
-
-             dwStyle &= ~WS_MINIMIZE;
-             WINPOS_ShowIconTitle( wndPtr, FALSE );
-
-             if( flags & WIN_RESTORE_MAX)
-             {
-             /* Restore to maximized position */
-                         CONV_POINT16TO32( &lpPos->ptMaxPos, &pt );
-                         WINPOS_GetMinMaxInfo( wndPtr, &size, &pt, NULL, NULL);
-                         CONV_POINT32TO16( &pt, &lpPos->ptMaxPos );
-             dwStyle |= WS_MAXIMIZE;
-             SetRect16( lpRect, lpPos->ptMaxPos.x, lpPos->ptMaxPos.y, size.x, size.y );
-             break;
-             }
-         }
-         else
-             if( !(dwStyle & WS_MAXIMIZE) ) return (UINT16)(-1);
-             else dwStyle &= ~WS_MAXIMIZE;
-
-         /* Restore to normal position */
-
-        *lpRect = lpPos->rectNormal;
-         lpRect->right -= lpRect->left;
-         lpRect->bottom -= lpRect->top;
-
-         break;
-    }
-    } else swpFlags |= SWP_NOSIZE | SWP_NOMOVE;
-    return swpFlags;
-}
-#endif
 /*******************************************************************
  *           GetMinMaxInfo
@@ -280 +175 @@
    return result;
 }
-//******************************************************************************
-//******************************************************************************
-LONG Win32BaseWindow::NCHandleCalcSize(WPARAM wParam, NCCALCSIZE_PARAMS *ncsize)
-{
-  LONG    result = 0;
-
-        if (getStyle() & CS_VREDRAW) result |= WVR_VREDRAW;
-        if (getStyle() & CS_HREDRAW) result |= WVR_HREDRAW;
-
-//TODO: Wine calculates new size of client area even when window is iconic (client edges)
-        if(!(getStyle() & (WS_MINIMIZE | WS_ICONIC)))
-        {
-            dprintf(("NCHandleCalcSize %x (%d,%d) (%d,%d)", getWindowHandle(), ncsize->rgrc[0].left, ncsize->rgrc[0].top, ncsize->rgrc[0].right, ncsize->rgrc[0].bottom));
-            OSLibWinCalcFrameRect(getOS2FrameWindowHandle(), &ncsize->rgrc[0], TRUE); //frame -> client
-            dprintf(("NCHandleCalcSize Adjusted client rect (%d,%d) (%d,%d)", ncsize->rgrc[0].left, ncsize->rgrc[0].top, ncsize->rgrc[0].right, ncsize->rgrc[0].bottom));
-
-            OffsetRect(&ncsize->rgrc[0], -ncsize->rgrc[0].left, -ncsize->rgrc[0].top);
-        }
-#if 0
-//TODO: Docs say app should return 0 when fCalcValidRects == 0; Wine doesn't do this
-        if(wParam == 0) //fCalcValidRects
-            return 0;
-#endif
-        return result;
-}
-/***********************************************************************
- *           WIN_WindowNeedsWMBorder
- *
- * This method defines the rules for a window to have a WM border,
- * caption...  It is used for consitency purposes.
- */
-BOOL Win32BaseWindow::WindowNeedsWMBorder( DWORD style, DWORD exStyle )
-{
-//    if (!(style & WS_CHILD) && Options.managed  &&
-    if (!(style & WS_CHILD)  &&
-        (((style & WS_CAPTION) == WS_CAPTION) ||
-         (style & WS_THICKFRAME)))
-        return TRUE;
-    return FALSE;
-}
-/******************************************************************************
- * NC_AdjustRectOuter95
- *
- * Computes the size of the "outside" parts of the window based on the
- * parameters of the client area.
- *
- + PARAMS
- *     LPRECT16  rect
- *     DWORD  style
- *     BOOL32  menu
- *     DWORD  exStyle
- *
- * NOTES
- *     "Outer" parts of a window means the whole window frame, caption and
- *     menu bar. It does not include "inner" parts of the frame like client
- *     edge, static edge or scroll bars.
- *
- * Revision history
- *     05-Jul-1997 Dave Cuthbert (dacut@ece.cmu.edu)
- *        Original (NC_AdjustRect95) cut & paste from NC_AdjustRect
- *
- *     20-Jun-1998 Eric Kohl (ekohl@abo.rhein-zeitung.de)
- *        Split NC_AdjustRect95 into NC_AdjustRectOuter95 and
- *        NC_AdjustRectInner95 and added handling of Win95 styles.
- *
- *     28-Jul-1999 Ove Kåven (ovek@arcticnet.no)
- *        Streamlined window style checks.
- *
- *****************************************************************************/
-void Win32BaseWindow::NC_AdjustRectOuter(LPRECT rect, DWORD style, BOOL menu, DWORD exStyle)
-{
-    if(style & WS_ICONIC) return;
-
-    /* Decide if the window will be managed (see CreateWindowEx) */
-//    if (!WindowNeedsWMBorder(style, exStyle))
-//    {
-       if (HAS_THICKFRAME( style, exStyle ))
-            InflateRect( rect, GetSystemMetrics(SM_CXFRAME), GetSystemMetrics(SM_CYFRAME) );
-        else
-        if (HAS_DLGFRAME( style, exStyle ))
-            InflateRect(rect, GetSystemMetrics(SM_CXDLGFRAME), GetSystemMetrics(SM_CYDLGFRAME) );
-        else
-        if (HAS_THINFRAME( style ))
-            InflateRect( rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
-
-        if ((style & WS_CAPTION) == WS_CAPTION)
-        {
-            if (exStyle & WS_EX_TOOLWINDOW)
-                rect->top -= GetSystemMetrics(SM_CYSMCAPTION);
-            else
-                rect->top -= GetSystemMetrics(SM_CYCAPTION);
-        }
-//    }
-
-    if (menu)
-        rect->top -= GetSystemMetrics(SM_CYMENU);
-}
-/******************************************************************************
- * NC_AdjustRectInner95
- *
- * Computes the size of the "inside" part of the window based on the
- * parameters of the client area.
- *
- + PARAMS
- *     LPRECT16 rect
- *     DWORD    style
- *     DWORD    exStyle
- *
- * NOTES
- *     "Inner" part of a window means the window frame inside of the flat
- *     window frame. It includes the client edge, the static edge and the
- *     scroll bars.
- *
- * Revision history
- *     05-Jul-1997 Dave Cuthbert (dacut@ece.cmu.edu)
- *        Original (NC_AdjustRect95) cut & paste from NC_AdjustRect
- *
- *     20-Jun-1998 Eric Kohl (ekohl@abo.rhein-zeitung.de)
- *        Split NC_AdjustRect95 into NC_AdjustRectOuter95 and
- *        NC_AdjustRectInner95 and added handling of Win95 styles.
- *
- *****************************************************************************/
-void Win32BaseWindow::NC_AdjustRectInner(LPRECT rect, DWORD style, DWORD exStyle)
-{
-    if(style & WS_ICONIC) return;
-
-    if (exStyle & WS_EX_CLIENTEDGE)
-        InflateRect(rect, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE));
-
-    if (exStyle & WS_EX_STATICEDGE)
-        InflateRect(rect, GetSystemMetrics(SM_CXBORDER), GetSystemMetrics(SM_CYBORDER));
-
-    if (style & WS_VSCROLL) rect->right  += GetSystemMetrics(SM_CXVSCROLL);
-    if (style & WS_HSCROLL) rect->bottom += GetSystemMetrics(SM_CYHSCROLL);
-}
 /***********************************************************************
  *           WINPOS_HandleWindowPosChanging16