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

Don't clip hidden windows from the staticbox's refresh. Also handle

Browse Source 
non wxWindows better.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-04-15 03:00:15 +00:00
parent b068dfe292
commit 4249e33407
1 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/msw/statbox.cpp
View File

@@ -258,35 +258,44 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren()
child; child;
child = ::GetWindow(child, GW_HWNDNEXT) ) child = ::GetWindow(child, GW_HWNDNEXT) )
{ {
wxWindow *childWindow = wxGetWindowFromHWND((WXHWND) child); if ( ! ::IsWindowVisible(child) )
// can't just test for (this != child) here since if a wxStaticBox
// overlaps another wxStaticBox then neither are drawn. The overlapping
// region will flicker but we shouldn't have overlapping windows anyway.
if ( !childWindow || !wxDynamicCast(childWindow, wxStaticBox) )
{ {
::GetWindowRect(child, &rc); // if the window isn't visible then it doesn't need clipped
if ( ::RectInRegion(hrgn, &rc) ) continue;
}
LONG style = ::GetWindowLong(child, GWL_STYLE);
wxString str(wxGetWindowClass(child));
str.UpperCase();
if ( str == wxT("BUTTON") && (style & BS_GROUPBOX) != 0 )
{
// Don't clip any static boxes, not just this one. This will
// result in flicker in overlapping static boxes, but at least
// they will all be drawn correctly and we shouldn't have
// overlapping windows anyway.
continue;
}
::GetWindowRect(child, &rc);
if ( ::RectInRegion(hrgn, &rc) )
{
// need to remove WS_CLIPSIBLINGS from all sibling windows
// that are within this staticbox if set
if ( style & WS_CLIPSIBLINGS )
{ {
// need to remove WS_CLIPSIBLINGS from all sibling windows style &= ~WS_CLIPSIBLINGS;
// that are within this staticbox if set ::SetWindowLong(child, GWL_STYLE, style);
LONG style = ::GetWindowLong(child, GWL_STYLE);
if ( style & WS_CLIPSIBLINGS )
{
style &= ~WS_CLIPSIBLINGS;
::SetWindowLong(child, GWL_STYLE, style);
// MSDN: "If you have changed certain window data using // MSDN: "If you have changed certain window data using
// SetWindowLong, you must call SetWindowPos to have the // SetWindowLong, you must call SetWindowPos to have the
// changes take effect." // changes take effect."
::SetWindowPos(child, NULL, 0, 0, 0, 0, ::SetWindowPos(child, NULL, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER |
SWP_FRAMECHANGED); SWP_FRAMECHANGED);
}
AutoHRGN hrgnChild(::CreateRectRgnIndirect(&rc));
::CombineRgn(hrgn, hrgn, hrgnChild, RGN_DIFF);
} }
AutoHRGN hrgnChild(::CreateRectRgnIndirect(&rc));
::CombineRgn(hrgn, hrgn, hrgnChild, RGN_DIFF);
} }
} }