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

decoupled attributes inheritance and m_hasXXX flags

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-30 13:05:20 +00:00
parent b70b68a9ba
commit f8ff87ed6d
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/wx/window.h
View File

@@ -725,13 +725,13 @@ public:
// set/retrieve the window colours (system defaults are used by
// default): SetXXX() functions return true if colour was changed,
// SetDefaultXXX() reset the "m_hasXXX" flag after setting the value
// to prevent it from being inherited by our children
// SetDefaultXXX() reset the "m_inheritXXX" flag after setting the
// value to prevent it from being inherited by our children
virtual bool SetBackgroundColour(const wxColour& colour);
void SetDefaultBackgroundColour(const wxColour& colour)
{
if ( SetBackgroundColour(colour) )
m_hasBgCol = false;
m_inheritBgCol = false;
}
wxColour GetBackgroundColour() const;
@@ -739,7 +739,7 @@ public:
void SetDefaultForegroundColour(const wxColour& colour)
{
if ( SetForegroundColour(colour) )
m_hasFgCol = false;
m_inheritFgCol = false;
}
wxColour GetForegroundColour() const;
@@ -749,7 +749,7 @@ public:
void SetDefaultFont(const wxFont& font)
{
if ( SetFont(font) )
m_hasFont = false;
m_inheritFont = false;
}
wxFont GetFont() const;
@@ -1120,6 +1120,11 @@ protected:
bool m_hasBgCol:1;
bool m_hasFgCol:1;
bool m_hasFont:1;
// and should it be inherited by children?
bool m_inheritBgCol:1;
bool m_inheritFgCol:1;
bool m_inheritFont:1;
// window attributes
long m_windowStyle,