Changeset 1265 for trunk/src


Ignore:
Timestamp:
Oct 13, 1999, 4:24:49 PM (26 years ago)
Author:
sandervl
Message:

lots of changes

Location:
trunk/src/user32
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/Makefile

    r1258 r1265  
    1 # $Id: Makefile,v 1.30 1999-10-12 18:14:53 sandervl Exp $
     1# $Id: Makefile,v 1.31 1999-10-13 14:24:24 sandervl Exp $
    22
    33#
    … …  
    3333        combo.obj edit.obj clipboard.obj winicon.obj win32wmdiclient.obj \
    3434        oslibutil.obj oslibmsg.obj dib.obj oslibdos.obj win32wmdichild.obj \
    35         winprop.obj wingdi.obj oslibgdi.obj winaccel.obj \
     35        winprop.obj wingdi.obj oslibgdi.obj winaccel.obj win32wbasepos.obj \
    3636        nativerc.obj oslibres.obj dummy.obj oslibmenu.obj dc.obj timer.obj \
    3737        caret.obj \
    … …  
    4242
    4343
    44 $(TARGET).dll: $(OBJS) $(TARGET).def $(TARGET).res
    45         $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
    46               $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/gdi32.lib $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/libuls.lib \
    47               $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
     44$(TARGET).dll: $(OBJS) $(TARGET).def $(TARGET).res $(TARGET).lrf
     45!ifdef DEBUG
     46#       icc -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /NOD /NOFREE" @$(TARGET).lrf
     47        ilink /de /map /noe /NOD /dbgpack /NoLogo /NOFREE @$(TARGET).lrf
     48!else
     49        ilink /map  /noe /NOD /NoLogo /FREE @$(TARGET).lrf
     50!endif
    4851        rc $(TARGET).res $(TARGET).dll
    4952        $(CP) $@ $(PDWIN32_BIN)
     53
     54$(TARGET).lrf: makefile
     55        @echo Creating file <<$(@B).lrf
     56$(OBJS)
     57$(PDWIN32_LIB)/pmwinx.lib
     58$(PDWIN32_LIB)/gdi32.lib
     59$(PDWIN32_LIB)/kernel32.lib
     60$(PDWIN32_LIB)/libuls.lib
     61$(PDWIN32_LIB)/odincrt.lib
     62OS2386.LIB
     63$(RTLLIB_O)
     64$(TARGET).def
     65<<keep
    5066
    5167$(TARGET).res:
    … …  
    106122win32class.obj: win32class.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h
    107123win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h pmframe.h win32wdesktop.h
     124win32wbasepos.obj: win32wbasepos.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h pmframe.h win32wdesktop.h
    108125win32wnd.obj:   win32wnd.cpp win32class.h win32wbase.h win32wnd.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h oslibmenu.h
    109126win32dlg.obj:   win32dlg.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h oslibmsg.h

  • trunk/src/user32/listbox.cpp

    r1258 r1265  
    1 /* $Id: listbox.cpp,v 1.3 1999-10-12 18:14:55 sandervl Exp $ */
     1/* $Id: listbox.cpp,v 1.4 1999-10-13 14:24:24 sandervl Exp $ */
    22/*
    33 * Listbox controls
    … …  
    1717#include "winerror.h"
    1818#include "combo.h"
     19#include <misc.h>
    1920
    2021/* Unimplemented yet:
    … …  
    329330            (descr->height % descr->item_height))
    330331        {
    331             //TRACE("[%04x]: changing height %d -> %d\n",
    332             //             wnd->hwndSelf, descr->height,
    333             //             descr->height - descr->height%descr->item_height );
     332            dprintf(("LISTBOX: [%04x]: changing height %d -> %d\n",
     333                    hwnd, descr->height,
     334                    descr->height - descr->height%descr->item_height));
    334335            SetWindowPos( hwnd, 0, 0, 0,
    335336                            descr->width,

  • trunk/src/user32/oslibwin.cpp

    r1263 r1265  
    1 /* $Id: oslibwin.cpp,v 1.25 1999-10-12 20:16:23 sandervl Exp $ */
     1/* $Id: oslibwin.cpp,v 1.26 1999-10-13 14:24:25 sandervl Exp $ */
    22/*
    33 * Window API wrappers for OS/2
    … …  
    139139    {
    140140      *OSFrameStyle |= FCF_SIZEBORDER;
    141       *borderHeight = *borderWidth = 1;
    142 
     141      *borderHeight = *borderWidth = 2;
    143142    }
    144143    else
    … …  
    579578void OSLibMapWINDOWPOStoSWP(PWINDOWPOS pwpos, PSWP pswp, PSWP pswpOld, HWND hParent, HWND hFrame)
    580579{
     580 BOOL fCvt = FALSE;
     581
    581582   HWND hWnd            = pwpos->hwnd;
    582583   HWND hWndInsertAfter = pwpos->hwndInsertAfter;
    … …  
    625626         y = pswpOld->y;
    626627
    627 //SvL: TEST
    628 #if 0
    629628         if (!((y == 0) && (pswpOld->cy == 0)))
    630629         {
    631630            y = parentHeight - y - pswpOld->cy;
    632631         }
    633 #endif
    634632      }
    635633 
    … …  
    666664//******************************************************************************
    667665//******************************************************************************
    668 BOOL OSLibWinCalcFrameRect(HWND hwndFrame, RECTLOS2 *pRect, BOOL fClient)
    669 {
    670    return WinCalcFrameRect(hwndFrame, (PRECTL)pRect, fClient);
     666BOOL  OSLibWinCalcFrameRect(HWND hwndFrame, RECT *pRect, BOOL fClient)
     667{
     668 BOOL rc;
     669 
     670   WinMapWindowPoints(hwndFrame, HWND_DESKTOP, (PPOINTL)pRect, 2);
     671
     672   rc = WinCalcFrameRect(hwndFrame, (PRECTL)pRect, fClient);
     673   WinMapWindowPoints(HWND_DESKTOP, hwndFrame, (PPOINTL)pRect, 2);
     674
     675   return rc;
    671676}
    672677//******************************************************************************

  • trunk/src/user32/oslibwin.h

    r1258 r1265  
    1 /* $Id: oslibwin.h,v 1.14 1999-10-12 18:14:56 sandervl Exp $ */
     1/* $Id: oslibwin.h,v 1.15 1999-10-13 14:24:25 sandervl Exp $ */
    22/*
    33 * Window API wrappers for OS/2
    … …  
    219219#define RELATIVE_TO_SCREEN 1
    220220BOOL  OSLibWinQueryWindowRect(HWND hwnd, PRECT pRect, int RelativeTo = RELATIVE_TO_WINDOW);
    221 BOOL  OSLibWinCalcFrameRect(HWND hwndFrame, RECTLOS2 *pRect, BOOL fClient);
     221BOOL  OSLibWinCalcFrameRect(HWND hwnd, RECT *pRect, BOOL fClient);
    222222BOOL  OSLibGetMinMaxInfo(HWND hwndFrame, MINMAXINFO *pMinMax);
    223223

  • trunk/src/user32/user32.cpp

    r1204 r1265  
    1 /* $Id: user32.cpp,v 1.39 1999-10-08 21:29:50 cbratschi Exp $ */
     1/* $Id: user32.cpp,v 1.40 1999-10-13 14:24:25 sandervl Exp $ */
    22
    33/*
    … …  
    472472}
    473473
    474 #if 0
    475 /* Caret Functions */
    476 
    477 BOOL WIN32API CreateCaret( HWND hWnd, HBITMAP hBitmap, int nWidth, int nHeight)
    478 {
    479 #ifdef DEBUG
    480     WriteLog("USER32:  CreateCaret\n");
    481 #endif
    482     hWnd = Win32Window::Win32ToOS2Handle(hWnd);
    483     return O32_CreateCaret(hWnd,hBitmap,nWidth,nHeight);
    484 }
    485 //******************************************************************************
    486 //******************************************************************************
    487 BOOL WIN32API DestroyCaret(void)
    488 {
    489 #ifdef DEBUG
    490     WriteLog("USER32:  DestroyCaret\n");
    491 #endif
    492     return O32_DestroyCaret();
    493 }
    494 //******************************************************************************
    495 //******************************************************************************
    496 UINT WIN32API GetCaretBlinkTime(void)
    497 {
    498 #ifdef DEBUG
    499     WriteLog("USER32:  GetCaretBlinkTime\n");
    500 #endif
    501     return O32_GetCaretBlinkTime();
    502 }
    503 //******************************************************************************
    504 //******************************************************************************
    505 BOOL WIN32API GetCaretPos( LPPOINT lpPoint)
    506 {
    507 #ifdef DEBUG
    508     WriteLog("USER32:  GetCaretPos\n");
    509 #endif
    510     return O32_GetCaretPos(lpPoint);
    511 }
    512 //******************************************************************************
    513 //******************************************************************************
    514 BOOL WIN32API HideCaret( HWND hWnd)
    515 {
    516 #ifdef DEBUG
    517     WriteLog("USER32:  HideCaret\n");
    518 #endif
    519     hWnd = Win32Window::Win32ToOS2Handle(hWnd);
    520     return O32_HideCaret(hWnd);
    521 }
    522 //******************************************************************************
    523 //******************************************************************************
    524 BOOL WIN32API SetCaretBlinkTime( UINT wMSeconds)
    525 {
    526 #ifdef DEBUG
    527     WriteLog("USER32:  SetCaretBlinkTime\n");
    528 #endif
    529     return O32_SetCaretBlinkTime(wMSeconds);
    530 }
    531 //******************************************************************************
    532 //******************************************************************************
    533 BOOL WIN32API SetCaretPos( int nX, int nY)
    534 {
    535     dprintf(("USER32:  SetCaretPos\n"));
    536     return O32_SetCaretPos(nX,nY);
    537 }
    538 //******************************************************************************
    539 //******************************************************************************
    540 BOOL WIN32API ShowCaret( HWND hwnd)
    541 {
    542     dprintf(("USER32:  ShowCaret\n"));
    543     hwnd = Win32Window::Win32ToOS2Handle(hwnd);
    544     return O32_ShowCaret(hwnd);
    545 }
    546 #endif
    547 
    548474/* Cursor Functions */
    549475

  • trunk/src/user32/win32dlg.cpp

    r1263 r1265  
    1 /* $Id: win32dlg.cpp,v 1.12 1999-10-12 20:16:23 sandervl Exp $ */
     1/* $Id: win32dlg.cpp,v 1.13 1999-10-13 14:24:26 sandervl Exp $ */
    22/*
    33 * Win32 Dialog Code for OS/2
    … …  
    11701170//******************************************************************************
    11711171BOOL Win32Dialog::fInitialized = FALSE;
    1172 int  Win32Dialog::xBaseUnit    = 0;
    1173 int  Win32Dialog::yBaseUnit    = 0;
     1172int  Win32Dialog::xBaseUnit    = 10;
     1173int  Win32Dialog::yBaseUnit    = 20;

  • trunk/src/user32/win32wbase.cpp

    r1261 r1265  
    1 /* $Id: win32wbase.cpp,v 1.39 1999-10-12 18:51:38 sandervl Exp $ */
     1/* $Id: win32wbase.cpp,v 1.40 1999-10-13 14:24:27 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    4343#define HAS_DLGFRAME(style,exStyle) \
    4444    (((exStyle) & WS_EX_DLGMODALFRAME) || \
    45      (((style) & WS_DLGFRAME) && !((style) & WS_BORDER)))
    46 
    47 #define HAS_THICKFRAME(style) \
     45     (((style) & WS_DLGFRAME) && !((style) & WS_THICKFRAME)))
     46
     47#define HAS_THICKFRAME(style,exStyle) \
    4848    (((style) & WS_THICKFRAME) && \
    49      !(((style) & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME))
     49     !((exStyle) & WS_EX_DLGMODALFRAME))
     50
     51#define HAS_THINFRAME(style) \
     52    (((style) & WS_BORDER) || !((style) & (WS_CHILD | WS_POPUP)))
     53
     54#define HAS_BIGFRAME(style,exStyle) \
     55    (((style) & (WS_THICKFRAME | WS_DLGFRAME)) || \
     56     ((exStyle) & WS_EX_DLGMODALFRAME))
     57
     58#define HAS_ANYFRAME(style,exStyle) \
     59    (((style) & (WS_THICKFRAME | WS_DLGFRAME | WS_BORDER)) || \
     60     ((exStyle) & WS_EX_DLGMODALFRAME) || \
     61     !((style) & (WS_CHILD | WS_POPUP)))
    5062
    5163#define HAS_3DFRAME(exStyle) \
    … …  
    436448  }
    437449
     450  DWORD dwOSWinStyle, dwOSFrameStyle;
     451
     452  OSLibWinConvertStyle(cs->style, &cs->dwExStyle, &dwOSWinStyle, &dwOSFrameStyle, &borderWidth, &borderHeight);
     453  dwExStyle = cs->dwExStyle;
     454
     455  //SvL: Add bordersize
     456  cs->cy += 2*borderHeight;
     457  cs->cx += 2*borderWidth;
     458
    438459  rectWindow.left   = cs->x;
    439460  rectWindow.top    = cs->y;
    … …  
    441462  rectWindow.bottom = cs->y + cs->cy;
    442463  rectClient        = rectWindow;
    443 
    444   DWORD dwOSWinStyle, dwOSFrameStyle;
    445 
    446   OSLibWinConvertStyle(cs->style, &cs->dwExStyle, &dwOSWinStyle, &dwOSFrameStyle, &borderWidth, &borderHeight);
    447   dwExStyle = cs->dwExStyle;
    448464
    449465//CB: dwOSFrameStyle handled by OSLibWinConvertStyle
    … …  
    573589  maxPos.x = rectWindow.left; maxPos.y = rectWindow.top;
    574590
    575   fCreated = TRUE; //Allow WM_SIZE messages now
    576591  if(SendMessageA(WM_NCCREATE, 0, (LPARAM)cs) )
    577592  {
    578         //doesn't work right, messes up client rectangle
    579 #if 0
     593        fCreated = TRUE; //Allow WM_SIZE messages now
    580594        SendNCCalcSize(FALSE, &rectWindow, NULL, NULL, 0, &rectClient );
    581 #endif
     595
    582596        OffsetRect(&rectWindow, maxPos.x - rectWindow.left, maxPos.y - rectWindow.top);
    583597        dprintf(("Sending WM_CREATE"));
    … …  
    609623  SetLastError(ERROR_OUTOFMEMORY); //TODO: Better error
    610624  return FALSE;
    611 }
    612 #if 0
    613 /***********************************************************************
    614  *           WINPOS_MinMaximize
    615  *
    616  * Fill in lpRect and return additional flags to be used with SetWindowPos().
    617  * This function assumes that 'cmd' is different from the current window
    618  * state.
    619  */
    620 UINT Win32BaseWindow::MinMaximize(UINT cmd, LPRECT lpRect )
    621 {
    622     UINT swpFlags = 0;
    623     POINT pt, size;
    624     LPINTERNALPOS lpPos;
    625 
    626     size.x = rectWindow.left; size.y = rectWindow.top;
    627     lpPos = WINPOS_InitInternalPos( wndPtr, size, &rectWindow );
    628 
    629     if (lpPos && !HOOK_CallHooks16(WH_CBT, HCBT_MINMAX, hwndSelf, cmd))
    630     {
    631     if( dwStyle & WS_MINIMIZE )
    632     {
    633         if( !SendMessageA(WM_QUERYOPEN, 0, 0L ) )
    634         return (SWP_NOSIZE | SWP_NOMOVE);
    635         swpFlags |= SWP_NOCOPYBITS;
    636     }
    637     switch( cmd )
    638     {
    639         case SW_MINIMIZE:
    640          if( dwStyle & WS_MAXIMIZE)
    641          {
    642              flags |= WIN_RESTORE_MAX;
    643              dwStyle &= ~WS_MAXIMIZE;
    644                  }
    645                  else
    646              flags &= ~WIN_RESTORE_MAX;
    647              dwStyle |= WS_MINIMIZE;
    648 
    649 #if 0
    650          if( flags & WIN_NATIVE )
    651              if( pDriver->pSetHostAttr( wndPtr, HAK_ICONICSTATE, TRUE ) )
    652              swpFlags |= MINMAX_NOSWP;
    653 #endif
    654 
    655          lpPos->ptIconPos = WINPOS_FindIconPos( wndPtr, lpPos->ptIconPos );
    656 
    657          SetRect(lpRect, lpPos->ptIconPos.x, lpPos->ptIconPos.y,
    658              GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON) );
    659          swpFlags |= SWP_NOCOPYBITS;
    660          break;
    661 
    662         case SW_MAXIMIZE:
    663                 WINPOS_GetMinMaxInfo( wndPtr, &size, &pt, NULL, NULL );
    664 
    665          if( dwStyle & WS_MINIMIZE )
    666          {
    667              if( flags & WIN_NATIVE )
    668              if( pDriver->pSetHostAttr( wndPtr, HAK_ICONICSTATE, FALSE ) )
    669                  swpFlags |= MINMAX_NOSWP;
    670 
    671              WINPOS_ShowIconTitle( wndPtr, FALSE );
    672              dwStyle &= ~WS_MINIMIZE;
    673          }
    674                  dwStyle |= WS_MAXIMIZE;
    675 
    676          SetRect16( lpRect, lpPos->ptMaxPos.x, lpPos->ptMaxPos.y,
    677                     size.x, size.y );
    678          break;
    679 
    680         case SW_RESTORE:
    681          if( dwStyle & WS_MINIMIZE )
    682          {
    683              if( flags & WIN_NATIVE )
    684              if( pDriver->pSetHostAttr( wndPtr, HAK_ICONICSTATE, FALSE ) )
    685                  swpFlags |= MINMAX_NOSWP;
    686 
    687              dwStyle &= ~WS_MINIMIZE;
    688              WINPOS_ShowIconTitle( wndPtr, FALSE );
    689 
    690              if( flags & WIN_RESTORE_MAX)
    691              {
    692              /* Restore to maximized position */
    693                          CONV_POINT16TO32( &lpPos->ptMaxPos, &pt );
    694                          WINPOS_GetMinMaxInfo( wndPtr, &size, &pt, NULL, NULL);
    695                          CONV_POINT32TO16( &pt, &lpPos->ptMaxPos );
    696              dwStyle |= WS_MAXIMIZE;
    697              SetRect16( lpRect, lpPos->ptMaxPos.x, lpPos->ptMaxPos.y, size.x, size.y );
    698              break;
    699              }
    700          }
    701          else
    702              if( !(dwStyle & WS_MAXIMIZE) ) return (UINT16)(-1);
    703              else dwStyle &= ~WS_MAXIMIZE;
    704 
    705          /* Restore to normal position */
    706 
    707         *lpRect = lpPos->rectNormal;
    708          lpRect->right -= lpRect->left;
    709          lpRect->bottom -= lpRect->top;
    710 
    711          break;
    712     }
    713     } else swpFlags |= SWP_NOSIZE | SWP_NOMOVE;
    714     return swpFlags;
    715 }
    716 #endif
    717 /*******************************************************************
    718  *           GetMinMaxInfo
    719  *
    720  * Get the minimized and maximized information for a window.
    721  */
    722 void Win32BaseWindow::GetMinMaxInfo(POINT *maxSize, POINT *maxPos,
    723                                 POINT *minTrack, POINT *maxTrack )
    724 {
    725     MINMAXINFO MinMax;
    726     INT xinc, yinc;
    727 
    728     /* Compute default values */
    729 
    730     MinMax.ptMaxSize.x = GetSystemMetrics(SM_CXSCREEN);
    731     MinMax.ptMaxSize.y = GetSystemMetrics(SM_CYSCREEN);
    732     MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK);
    733     MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK);
    734     MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXSCREEN);
    735     MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYSCREEN);
    736 
    737     if (flags & WIN_MANAGED) xinc = yinc = 0;
    738     else if (HAS_DLGFRAME( dwStyle, dwExStyle ))
    739     {
    740         xinc = GetSystemMetrics(SM_CXDLGFRAME);
    741         yinc = GetSystemMetrics(SM_CYDLGFRAME);
    742     }
    743     else
    744     {
    745         xinc = yinc = 0;
    746         if (HAS_THICKFRAME(dwStyle))
    747         {
    748             xinc += GetSystemMetrics(SM_CXFRAME);
    749             yinc += GetSystemMetrics(SM_CYFRAME);
    750         }
    751         if (dwStyle & WS_BORDER)
    752         {
    753             xinc += GetSystemMetrics(SM_CXBORDER);
    754             yinc += GetSystemMetrics(SM_CYBORDER);
    755         }
    756     }
    757     MinMax.ptMaxSize.x += 2 * xinc;
    758     MinMax.ptMaxSize.y += 2 * yinc;
    759 
    760 #if 0
    761     lpPos = (LPINTERNALPOS)GetPropA( hwndSelf, atomInternalPos );
    762     if( lpPos && !EMPTYPOINT(lpPos->ptMaxPos) )
    763         CONV_POINT16TO32( &lpPos->ptMaxPos, &MinMax.ptMaxPosition );
    764     else
    765     {
    766 #endif
    767         MinMax.ptMaxPosition.x = -xinc;
    768         MinMax.ptMaxPosition.y = -yinc;
    769 //    }
    770 
    771     SendMessageA(WM_GETMINMAXINFO, 0, (LPARAM)&MinMax );
    772 
    773       /* Some sanity checks */
    774 
    775     dprintf(("GetMinMaxInfo: %ld %ld / %ld %ld / %ld %ld / %ld %ld\n",
    776                       MinMax.ptMaxSize.x, MinMax.ptMaxSize.y,
    777                       MinMax.ptMaxPosition.x, MinMax.ptMaxPosition.y,
    778                       MinMax.ptMaxTrackSize.x, MinMax.ptMaxTrackSize.y,
    779                       MinMax.ptMinTrackSize.x, MinMax.ptMinTrackSize.y));
    780     MinMax.ptMaxTrackSize.x = MAX( MinMax.ptMaxTrackSize.x,
    781                                    MinMax.ptMinTrackSize.x );
    782     MinMax.ptMaxTrackSize.y = MAX( MinMax.ptMaxTrackSize.y,
    783                                    MinMax.ptMinTrackSize.y );
    784 
    785     if (maxSize)    *maxSize  = MinMax.ptMaxSize;
    786     if (maxPos)     *maxPos   = MinMax.ptMaxPosition;
    787     if (minTrack)   *minTrack = MinMax.ptMinTrackSize;
    788     if (maxTrack)   *maxTrack = MinMax.ptMaxTrackSize;
    789 }
    790 /***********************************************************************
    791  *           WINPOS_SendNCCalcSize
    792  *
    793  * Send a WM_NCCALCSIZE message to a window.
    794  * All parameters are read-only except newClientRect.
    795  * oldWindowRect, oldClientRect and winpos must be non-NULL only
    796  * when calcValidRect is TRUE.
    797  */
    798 LONG Win32BaseWindow::SendNCCalcSize(BOOL calcValidRect, RECT *newWindowRect, RECT *oldWindowRect,
    799                                  RECT *oldClientRect, WINDOWPOS *winpos,
    800                                  RECT *newClientRect )
    801 {
    802    NCCALCSIZE_PARAMS params;
    803    WINDOWPOS winposCopy;
    804    LONG result;
    805 
    806    params.rgrc[0] = *newWindowRect;
    807    if (calcValidRect)
    808    {
    809         winposCopy = *winpos;
    810         params.rgrc[1] = *oldWindowRect;
    811         params.rgrc[2] = *oldClientRect;
    812         params.lppos = &winposCopy;
    813    }
    814    result = SendMessageA(WM_NCCALCSIZE, calcValidRect,
    815                          (LPARAM)&params );
    816    *newClientRect = params.rgrc[0];
    817    return result;
    818625}
    819626//******************************************************************************
    … …  
    16111418        return(TRUE);
    16121419
     1420    case WM_NCCALCSIZE:
     1421        return NCHandleCalcSize(wParam, (NCCALCSIZE_PARAMS *)lParam);
     1422
    16131423    case WM_CTLCOLORMSGBOX:
    16141424    case WM_CTLCOLOREDIT:
    … …  
    21651975   wpos.hwnd             = getWindowHandle();
    21661976
     1977   //SvL: Add bordersize
     1978   wpos.cy              += 2*borderHeight;
     1979   wpos.cx              += 2*borderWidth;
     1980
    21671981   if(~fuFlags & (SWP_NOMOVE | SWP_NOSIZE))
    21681982   {
    … …  
    21982012        if (swp.cy < minTrack.y) swp.cy = minTrack.y;
    21992013      }
    2200 
    22012014      swp.hwnd = OS2HwndFrame;
    22022015   }

  • trunk/src/user32/win32wbase.h

    r1256 r1265  
    1 /* $Id: win32wbase.h,v 1.20 1999-10-12 14:47:24 sandervl Exp $ */
     1/* $Id: win32wbase.h,v 1.21 1999-10-13 14:24:28 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    286286                             RECT *newClientRect );
    287287
     288        LONG  NCHandleCalcSize(WPARAM wParam, NCCALCSIZE_PARAMS *ncsize);
     289
    288290     LRESULT  SendInternalMessage(ULONG msg, WPARAM wParam, LPARAM lParam)
    289291     {
Note: See TracChangeset for help on using the changeset viewer.