Fix wxUnknownControlContainer background handling
Don't set invalid background color. Don't set debugging magenta background
color, because it did more harm than good, particularly after
d255dc6706
.
This commit is contained in:
committed by
Václav Slavík
parent
d4d6524c63
commit
d3e35b6bb1
@@ -42,7 +42,6 @@ public:
|
|||||||
m_control(NULL)
|
m_control(NULL)
|
||||||
{
|
{
|
||||||
m_bg = UseBgCol() ? GetBackgroundColour() : wxColour();
|
m_bg = UseBgCol() ? GetBackgroundColour() : wxColour();
|
||||||
SetBackgroundColour(wxColour(255, 0, 255));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void AddChild(wxWindowBase *child) wxOVERRIDE;
|
virtual void AddChild(wxWindowBase *child) wxOVERRIDE;
|
||||||
@@ -104,7 +103,8 @@ void wxUnknownControlContainer::AddChild(wxWindowBase *child)
|
|||||||
|
|
||||||
wxPanel::AddChild(child);
|
wxPanel::AddChild(child);
|
||||||
|
|
||||||
SetBackgroundColour(m_bg);
|
if ( m_bg.IsOk() )
|
||||||
|
SetBackgroundColour(m_bg);
|
||||||
child->SetName(m_controlName);
|
child->SetName(m_controlName);
|
||||||
child->SetId(wxXmlResource::GetXRCID(m_controlName));
|
child->SetId(wxXmlResource::GetXRCID(m_controlName));
|
||||||
m_control = child;
|
m_control = child;
|
||||||
|
Reference in New Issue
Block a user