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

Switch deferred sizing off by default

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-03-24 09:28:51 +00:00
parent 0832aaafb8
commit 85d8df29aa
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/latex/wx/sysopt.tex
View File

@@ -28,6 +28,8 @@ pages).}
\twocolitem{msw.staticbitmap.htclient}{If set to 1, allows the static bitmap to respond to mouse \twocolitem{msw.staticbitmap.htclient}{If set to 1, allows the static bitmap to respond to mouse
events. The default is 0, since a value of 1 can interfere with refresh in static boxes. Note that once set, events. The default is 0, since a value of 1 can interfere with refresh in static boxes. Note that once set,
this option cannot be unset later in the application.} this option cannot be unset later in the application.}
\twocolitem{msw.window.defersize}{If set to 1, optimizes window sizing and positioning when a size event is
received. This can occasionally have unwanted side-effects, so is off by default.}
\end{twocollist} \end{twocollist}
\wxheading{Mac} \wxheading{Mac}

40
src/msw/window.cpp
View File

@@ -1122,7 +1122,7 @@ void wxWindowMSW::SetWindowStyleFlag(long flags)
::SetWindowLong(GetHwnd(), GWL_EXSTYLE, exstyleReal); ::SetWindowLong(GetHwnd(), GWL_EXSTYLE, exstyleReal);
// we must call SetWindowPos() to flash the cached extended style and // we must call SetWindowPos() to flush the cached extended style and
// also to make the change to wxSTAY_ON_TOP style take effect: just // also to make the change to wxSTAY_ON_TOP style take effect: just
// setting the style simply doesn't work // setting the style simply doesn't work
if ( !::SetWindowPos(GetHwnd(), if ( !::SetWindowPos(GetHwnd(),
@@ -1504,22 +1504,27 @@ void wxWindowMSW::DoMoveWindow(int x, int y, int width, int height)
if (height < 0) if (height < 0)
height = 0; height = 0;
// if our parent had prepared a defer window handle for us, use it (unless HDWP hdwp = 0;
// we are a top level window)
wxWindowMSW *parent = GetParent(); if ( wxSystemOptions::GetOptionInt(wxT("msw.window.defersize")) == 1 )
HDWP hdwp = (parent && !IsTopLevel()) ? (HDWP)parent->m_hDWP : NULL;
if ( hdwp )
{ {
hdwp = ::DeferWindowPos(hdwp, GetHwnd(), NULL, // if our parent had prepared a defer window handle for us, use it (unless
// we are a top level window)
wxWindowMSW *parent = GetParent();
hdwp = (parent && !IsTopLevel()) ? (HDWP)parent->m_hDWP : NULL;
if ( hdwp )
{
hdwp = ::DeferWindowPos(hdwp, GetHwnd(), NULL,
x, y, width, height, x, y, width, height,
SWP_NOZORDER); SWP_NOZORDER);
if ( !hdwp ) if ( !hdwp )
{ {
wxLogLastError(_T("DeferWindowPos")); wxLogLastError(_T("DeferWindowPos"));
} }
// hdwp must be updated as it may have been changed // hdwp must be updated as it may have been changed
parent->m_hDWP = (WXHANDLE)hdwp; parent->m_hDWP = (WXHANDLE)hdwp;
}
} }
// otherwise (or if deferring failed) move the window in place immediately // otherwise (or if deferring failed) move the window in place immediately
@@ -4105,10 +4110,13 @@ bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam)
const int numChildren = GetChildren().GetCount(); const int numChildren = GetChildren().GetCount();
if ( numChildren > 1 ) if ( numChildren > 1 )
{ {
m_hDWP = (WXHANDLE)::BeginDeferWindowPos(numChildren); if ( wxSystemOptions::GetOptionInt(wxT("msw.window.defersize")) == 1 )
if ( !m_hDWP )
{ {
wxLogLastError(_T("BeginDeferWindowPos")); m_hDWP = (WXHANDLE)::BeginDeferWindowPos(numChildren);
if ( !m_hDWP )
{
wxLogLastError(_T("BeginDeferWindowPos"));
}
} }
} }