In MSWUniv wxWindow and wxWindowMSW are different classes so we can't access some of protected members (catched only by Borland). Therefore some of the flags related to background needs reading API.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -150,7 +150,6 @@ public:
|
||||
|
||||
// return true if we should use the colours/fonts returned by the
|
||||
// corresponding GetXXX() methods instead of the default ones
|
||||
bool UseBgCol() const { return m_hasBgCol; }
|
||||
bool UseFgCol() const { return m_hasFgCol; }
|
||||
bool UseFont() const { return m_hasFont; }
|
||||
|
||||
|
@@ -759,6 +759,14 @@ public:
|
||||
m_inheritBgCol = false;
|
||||
}
|
||||
wxColour GetBackgroundColour() const;
|
||||
bool InheritsBackgroundColour() const
|
||||
{
|
||||
return m_inheritBgCol;
|
||||
}
|
||||
bool UseBgCol() const
|
||||
{
|
||||
return m_hasBgCol;
|
||||
}
|
||||
|
||||
// if the window shouldn't inherit its colour from the parent, override
|
||||
// this function to return true
|
||||
|
@@ -4041,7 +4041,7 @@ WXHBRUSH wxWindowMSW::MSWGetBgBrush(WXHDC hDC)
|
||||
// windows for which a custom colour had been explicitly set with
|
||||
// SetOwnBackgroundColour() and so shouldn't affect its children
|
||||
if ( win->ProvidesBackground() ||
|
||||
(win->m_hasBgCol && !win->m_inheritBgCol) )
|
||||
(win->UseBgCol() && !win->InheritsBackgroundColour()) )
|
||||
break;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user