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

call SetWindowPos(SWP_FRAMECHANGED) after changing some styles (patch 1445096)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-09 14:12:35 +00:00
parent 0aed400874
commit 9ce754611c
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/msw/window.cpp
View File

@@ -1143,6 +1143,9 @@ void wxWindowMSW::SetWindowStyleFlag(long flags)
if ( !GetHwnd() ) if ( !GetHwnd() )
return; return;
// we may need to call SetWindowPos() when we change some styles
bool callSWP = false;
WXDWORD exstyle, exstyleOld; WXDWORD exstyle, exstyleOld;
long style = MSWGetStyle(flags, &exstyle), long style = MSWGetStyle(flags, &exstyle),
styleOld = MSWGetStyle(flagsOld, &exstyleOld); styleOld = MSWGetStyle(flagsOld, &exstyleOld);
@@ -1158,17 +1161,40 @@ void wxWindowMSW::SetWindowStyleFlag(long flags)
styleReal |= style; styleReal |= style;
::SetWindowLong(GetHwnd(), GWL_STYLE, styleReal); ::SetWindowLong(GetHwnd(), GWL_STYLE, styleReal);
// If any of the style changes changed any of the frame styles:
// MSDN: SetWindowLong:
// Certain window data is cached, so changes you make using
// SetWindowLong will not take effect until you call the
// SetWindowPos function. Specifically, if you change any of
// the frame styles, you must call SetWindowPos with the
// SWP_FRAMECHANGED flag for the cache to be updated properly.
callSWP = ((styleOld ^ style ) & (WS_BORDER |
WS_THICKFRAME |
WS_CAPTION |
WS_DLGFRAME |
WS_MAXIMIZEBOX |
WS_MINIMIZEBOX |
WS_SYSMENU) ) != 0;
} }
// and the extended style // and the extended style
long exstyleReal = ::GetWindowLong(GetHwnd(), GWL_EXSTYLE);
if ( exstyle != exstyleOld ) if ( exstyle != exstyleOld )
{ {
long exstyleReal = ::GetWindowLong(GetHwnd(), GWL_EXSTYLE);
exstyleReal &= ~exstyleOld; exstyleReal &= ~exstyleOld;
exstyleReal |= exstyle; exstyleReal |= exstyle;
::SetWindowLong(GetHwnd(), GWL_EXSTYLE, exstyleReal); ::SetWindowLong(GetHwnd(), GWL_EXSTYLE, exstyleReal);
// ex style changes don't take effect without calling SetWindowPos
callSWP = true;
}
if ( callSWP )
{
// we must call SetWindowPos() to flush 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
@@ -1176,7 +1202,7 @@ void wxWindowMSW::SetWindowStyleFlag(long flags)
exstyleReal & WS_EX_TOPMOST ? HWND_TOPMOST exstyleReal & WS_EX_TOPMOST ? HWND_TOPMOST
: HWND_NOTOPMOST, : HWND_NOTOPMOST,
0, 0, 0, 0, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE) ) SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED) )
{ {
wxLogLastError(_T("SetWindowPos")); wxLogLastError(_T("SetWindowPos"));
} }