AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dialog support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster 2002-01-18 23:16:16 +00:00
parent e598303ae7
commit e37db69998
1 changed files with 81 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/os2/window.cpp
View File

@ -1527,10 +1527,65 @@ void wxWindowOS2::DoGetClientSize(
RECTL vRect;
::WinQueryWindowRect(hWnd, &vRect);
if (IsKindOf(CLASSINFO(wxDialog)))
{
RECTL vTitle;
HWND hWndTitle;
//
// For a Dialog we have to explicitly request the client portion.
// For a Frame the hWnd IS the client window
//
hWndTitle = ::WinWindowFromID(hWnd, FID_TITLEBAR);
if (::WinQueryWindowRect(hWndTitle, &vTitle))
{
if (vTitle.yTop - vTitle.yBottom == 0)
{
//
// Dialog has not been created yet, use a default
//
vTitle.yTop = 20;
}
vRect.yTop -= (vTitle.yTop - vTitle.yBottom);
}
ULONG uStyle = ::WinQueryWindowULong(hWnd, QWL_STYLE);
//
// Deal with borders
//
if (uStyle & FCF_DLGBORDER)
{
vRect.xLeft += 4;
vRect.xRight -= 4;
vRect.yTop -= 4;
vRect.yBottom += 4;
}
else if (uStyle & FCF_SIZEBORDER)
{
vRect.xLeft += 4;
vRect.xRight -= 4;
vRect.yTop -= 4;
vRect.yBottom += 4;
}
else if (uStyle & FCF_BORDER)
{
vRect.xLeft += 2;
vRect.xRight -= 2;
vRect.yTop -= 2;
vRect.yBottom += 2;
}
else // make some kind of adjustment or top sizers ram into the titlebar!
{
vRect.xLeft += 3;
vRect.xRight -= 3;
vRect.yTop -= 3;
vRect.yBottom += 3;
}
}
if (pWidth)
*pWidth = vRect.xRight;
*pWidth = vRect.xRight - vRect.xLeft;
if (pHeight)
*pHeight = vRect.yTop;
*pHeight = vRect.yTop - vRect.yBottom;
} // end of wxWindowOS2::DoGetClientSize
void wxWindowOS2::DoMoveWindow(
@ -2392,6 +2447,29 @@ MRESULT wxWindowOS2::OS2WindowProc(
);
break;
case WM_WINDOWPOSCHANGED:
//
// Dialogs under OS/2 do not get WM_SIZE events at all.
// Instead they get this, which can function much like WM_SIZE
// PSWP contains the new sizes and positioning, PSWP+1 the old
// We use this because ADJUSTWINDOWPOS comes BEFORE the new
// position is added and our auto layout does a WinQueryWindowRect
// to get the CURRENT client size. That is the size used to position
// child controls, so we need to already be sized
// in order to get the child controls positoned properly.
//
if (IsKindOf(CLASSINFO(wxDialog)))
{
PSWP pSwp = (PSWP)PVOIDFROMMP(wParam);
bProcessed = HandleSize( pSwp->cx
,pSwp->cy
,(WXUINT)lParam
);
}
break;
case WM_ACTIVATE:
{
WXWORD wState;
@ -4051,7 +4129,7 @@ int wxWindowOS2::GetOS2ParentHeight(
// Case 1
//
if (pParent->IsKindOf(CLASSINFO(wxDialog)))
return(pParent->GetSize().y);
return(pParent->GetClientSize().y);
//
// Case 2 -- if we are one of the separately built standard Frame