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

reverted use of DeferWindowPos() instead of MoveWindow()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-12-22 01:05:13 +00:00
parent 4430ec36d1
commit 57be9aac75
2 changed files with 2 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/window.h
View File

@@ -422,10 +422,6 @@ protected:
// the old window proc (we subclass all windows)
WXFARPROC m_oldWndProc;
// the current multi-window move structure handle, NULL if window resize is
// not in process
WXHANDLE m_hDWP;
// additional (MSW specific) flags
bool m_mouseInWindow:1;
bool m_lastKeydownProcessed:1;

49
src/msw/window.cpp
View File

@@ -437,7 +437,6 @@ void wxWindowMSW::Init()
m_frozenness = 0;
m_hWnd = 0;
m_hDWP = 0;
m_xThumbSize = 0;
m_yThumbSize = 0;
@@ -1532,31 +1531,11 @@ void wxWindowMSW::DoMoveWindow(int x, int y, int width, int height)
if (height < 0)
height = 0;
// if our parent had prepared a defer window handle for us, use it
HDWP hdwp = m_parent ? (HDWP)m_parent->m_hDWP : NULL;
if ( hdwp )
{
hdwp = ::DeferWindowPos(hdwp, GetHwnd(), NULL,
x, y, width, height,
SWP_NOZORDER);
if ( !hdwp )
{
wxLogLastError(_T("DeferWindowPos"));
}
// hdwp must be updated as it may have been changed
m_parent->m_hDWP = (WXHANDLE)hdwp;
}
// otherwise (or if deferring failed) move the window in place immediately
if ( !hdwp )
{
if ( !::MoveWindow(GetHwnd(), x, y, width, height, TRUE) )
{
wxLogLastError(wxT("MoveWindow"));
}
}
}
// set the size of the window: if the dimensions are positive, just use them,
// but if any of them is equal to -1, it means that we must find the value for
@@ -2248,36 +2227,8 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
(void)HandleDestroy();
break;
case WM_WINDOWPOSCHANGING:
{
// when we resize this window, its children are probably going
// to be repositioned as well, prepare to use DeferWindowPos()
// for them
const int numChildren = GetChildren().GetCount();
if ( numChildren > 1 )
{
m_hDWP = (WXHANDLE)::BeginDeferWindowPos(numChildren);
if ( !m_hDWP )
{
wxLogLastError(_T("BeginDeferWindowPos"));
}
}
}
break;
case WM_SIZE:
processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
if ( m_hDWP )
{
// put all child controls in place at once now
if ( !::EndDeferWindowPos((HDWP)m_hDWP) )
{
wxLogLastError(_T("EndDeferWindowPos"));
}
m_hDWP = NULL;
}
break;
case WM_MOVE: