Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

account for client area origin when returning pending position from DoGetPosition()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-07-31 18:58:39 +00:00
parent 516d38cdfd
commit a7e0e432a2
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/msw/window.cpp
View File

@@ -1489,12 +1489,12 @@ void wxWindowMSW::DoGetClientSize(int *x, int *y) const
void wxWindowMSW::DoGetPosition(int *x, int *y) const void wxWindowMSW::DoGetPosition(int *x, int *y) const
{ {
wxWindow * const parent = GetParent();
wxPoint pos;
if ( m_pendingPosition != wxDefaultPosition ) if ( m_pendingPosition != wxDefaultPosition )
{ {
if ( x ) pos = m_pendingPosition;
*x = m_pendingPosition.x;
if ( y )
*y = m_pendingPosition.y;
} }
else // use current position else // use current position
{ {
@@ -1508,33 +1508,31 @@ void wxWindowMSW::DoGetPosition(int *x, int *y) const
// children, not for the dialogs/frames // children, not for the dialogs/frames
if ( !IsTopLevel() ) if ( !IsTopLevel() )
{ {
HWND hParentWnd = 0;
wxWindow *parent = GetParent();
if ( parent )
hParentWnd = GetWinHwnd(parent);
// Since we now have the absolute screen coords, if there's a // Since we now have the absolute screen coords, if there's a
// parent we must subtract its top left corner // parent we must subtract its top left corner
if ( hParentWnd )
{
::ScreenToClient(hParentWnd, &point);
}
if ( parent ) if ( parent )
{ {
// We may be faking the client origin. So a window that's ::ScreenToClient(GetHwndOf(parent), &point);
// really at (0, 30) may appear (to wxWin apps) to be at (0, 0).
wxPoint pt(parent->GetClientAreaOrigin());
point.x -= pt.x;
point.y -= pt.y;
} }
} }
if ( x ) pos.x = point.x;
*x = point.x; pos.y = point.y;
if ( y )
*y = point.y;
} }
// we also must adjust by the client area offset: a control which is just
// under a toolbar could be at (0, 30) in Windows but at (0, 0) in wx
if ( parent && !IsTopLevel() )
{
const wxPoint pt(parent->GetClientAreaOrigin());
pos.x -= pt.x;
pos.y -= pt.y;
}
if ( x )
*x = pos.x;
if ( y )
*y = pos.y;
} }
void wxWindowMSW::DoScreenToClient(int *x, int *y) const void wxWindowMSW::DoScreenToClient(int *x, int *y) const