More scrolling fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -360,6 +360,7 @@ bool wxWindow::Create(
|
|||||||
{
|
{
|
||||||
nTempy = pParent->GetSize().y + (vPos.y + rSize.y);
|
nTempy = pParent->GetSize().y + (vPos.y + rSize.y);
|
||||||
pParent->SetSize(0, 0, pParent->GetSize().x, nTempy);
|
pParent->SetSize(0, 0, pParent->GetSize().x, nTempy);
|
||||||
|
nTempy = pParent->GetSize().y - (vPos.y + rSize.y);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
vPos.y = nTempy;
|
vPos.y = nTempy;
|
||||||
@@ -807,9 +808,9 @@ void wxWindow::SetScrollbar(
|
|||||||
,(PSZ)NULL
|
,(PSZ)NULL
|
||||||
,ulStyle
|
,ulStyle
|
||||||
,vRect.xRight - 20
|
,vRect.xRight - 20
|
||||||
,vRect.yBottom
|
,vRect.yBottom + 20
|
||||||
,20
|
,20
|
||||||
,vRect.yTop - vRect.yBottom
|
,vRect.yTop - (vRect.yBottom + 20)
|
||||||
,hWnd
|
,hWnd
|
||||||
,HWND_TOP
|
,HWND_TOP
|
||||||
,FID_VERTSCROLL
|
,FID_VERTSCROLL
|
||||||
@@ -837,9 +838,9 @@ void wxWindow::SetScrollbar(
|
|||||||
::WinSetWindowPos( m_hWndScrollBarVert
|
::WinSetWindowPos( m_hWndScrollBarVert
|
||||||
,HWND_TOP
|
,HWND_TOP
|
||||||
,vRect.xRight - 20
|
,vRect.xRight - 20
|
||||||
,vRect.yBottom
|
,vRect.yBottom + 20
|
||||||
,20
|
,20
|
||||||
,vRect.yTop - vRect.yBottom
|
,vRect.yTop - (vRect.yBottom + 20)
|
||||||
,SWP_ACTIVATE | SWP_MOVE | SWP_SIZE | SWP_SHOW
|
,SWP_ACTIVATE | SWP_MOVE | SWP_SIZE | SWP_SHOW
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -1306,7 +1307,10 @@ void wxWindow::DoGetClientSize(
|
|||||||
HWND hWndClient;
|
HWND hWndClient;
|
||||||
RECTL vRect;
|
RECTL vRect;
|
||||||
|
|
||||||
|
if (IsKindOf(CLASSINFO(wxFrame)))
|
||||||
hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
|
hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
|
||||||
|
else
|
||||||
|
hWndClient = NULLHANDLE;
|
||||||
if( hWndClient == NULLHANDLE)
|
if( hWndClient == NULLHANDLE)
|
||||||
::WinQueryWindowRect(GetHwnd(), &vRect);
|
::WinQueryWindowRect(GetHwnd(), &vRect);
|
||||||
else
|
else
|
||||||
|
Reference in New Issue
Block a user