GetParent() was always used in test for wxHSCROLL checked in in last commit; use the parent window recursively as intended instead; slightly simplified the code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -143,24 +143,23 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
|
||||
|
||||
if ( exstyle )
|
||||
{
|
||||
// If any of the ancestors are scrolling windows, style has to be WS_EX_TRANSPARENT
|
||||
// or the static box won't be painted when the window is scrolled. We try
|
||||
// not to do this normally, because we get a lot of flicker.
|
||||
wxWindow* p = GetParent();
|
||||
bool ancestorScrolls = false;
|
||||
while (p && !p->IsTopLevel())
|
||||
*exstyle = 0;
|
||||
|
||||
// If any of the ancestors are scrolling windows, style has to be
|
||||
// WS_EX_TRANSPARENT or the static box won't be painted when the window
|
||||
// is scrolled. We try not to do this normally, because we get a lot of
|
||||
// flicker.
|
||||
for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
|
||||
{
|
||||
if (p->HasFlag(wxVSCROLL) || GetParent()->HasFlag(wxHSCROLL))
|
||||
if ( win->HasFlag(wxVSCROLL) || win->HasFlag(wxHSCROLL) )
|
||||
{
|
||||
ancestorScrolls = true;
|
||||
*exstyle = WS_EX_TRANSPARENT;
|
||||
break;
|
||||
}
|
||||
p = p->GetParent();
|
||||
|
||||
if ( win->IsTopLevel() )
|
||||
break;
|
||||
}
|
||||
if (ancestorScrolls)
|
||||
*exstyle = WS_EX_TRANSPARENT;
|
||||
else
|
||||
*exstyle = 0;
|
||||
}
|
||||
|
||||
return styleWin | BS_GROUPBOX;
|
||||
|
Reference in New Issue
Block a user