AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use ShouldInheritColours()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-10-16 09:38:04 +00:00
parent cb820f8075
commit 230205aec5
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/ctrlcmn.cpp
View File

@ -92,13 +92,15 @@ bool wxControlBase::CreateControl(wxWindowBase *parent,
// inherit colour and font settings from the parent window // inherit colour and font settings from the parent window
void wxControlBase::InheritAttributes() void wxControlBase::InheritAttributes()
{ {
// it definitely doesn't make sense to inherit the background colour as the if ( ShouldInheritColours() )
// controls typically have their own standard one and probably not the {
// foreground neither? wxWindow *parent = GetParent();
#if 0
SetBackgroundColour(GetParent()->GetBackgroundColour()); wxCHECK_RET( parent, _T("a control without parent?") );
SetForegroundColour(GetParent()->GetForegroundColour());
#endif // 0 SetBackgroundColour(parent->GetBackgroundColour());
SetForegroundColour(parent->GetForegroundColour());
}
#ifdef __WXPM__ #ifdef __WXPM__
// //

2
src/univ/themes/gtk.cpp
View File

@ -775,7 +775,7 @@ wxColour wxGTKColourScheme::GetBackground(wxWindow *win) const
col = win->GetBackgroundColour(); col = win->GetBackgroundColour();
} }
if ( win->IsContainerWindow() ) if ( !win->ShouldInheritColours() )
{ {
// doesn't depend on the state // doesn't depend on the state
if ( !col.Ok() ) if ( !col.Ok() )

2
src/univ/themes/win32.cpp
View File

@ -1330,7 +1330,7 @@ wxColour wxWin32ColourScheme::GetBackground(wxWindow *win) const
col = win->GetBackgroundColour(); col = win->GetBackgroundColour();
} }
if ( win->IsContainerWindow() ) if ( !win->ShouldInheritColours() )
{ {
wxTextCtrl *text = wxDynamicCast(win, wxTextCtrl); wxTextCtrl *text = wxDynamicCast(win, wxTextCtrl);
if ( text ) if ( text )