background color set to wxSYS_COLOUR_LISTBOX

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-02-15 22:19:10 +00:00
parent ac8ae254b4
commit 91fc2bdc33
2 changed files with 10 additions and 4 deletions

View File

@@ -1175,7 +1175,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id,
m_renameTimer = new wxListRenameTimer( this ); m_renameTimer = new wxListRenameTimer( this );
m_renameAccept = FALSE; m_renameAccept = FALSE;
SetBackgroundColour( *wxWHITE ); SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
} }
wxListMainWindow::~wxListMainWindow() wxListMainWindow::~wxListMainWindow()
@@ -2743,7 +2743,7 @@ bool wxListCtrl::Create(wxWindow *parent,
m_headerWin = (wxListHeaderWindow *) NULL; m_headerWin = (wxListHeaderWindow *) NULL;
} }
SetBackgroundColour( *wxWHITE ); SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
return ret; return ret;
} }

View File

@@ -558,6 +558,11 @@ void wxTreeCtrl::Init()
wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT),
wxSOLID wxSOLID
); );
m_normalBrush = new wxBrush
(
wxSystemSettings::GetSystemColour(wxSYS_COLOUR_LISTBOX),
wxSOLID
);
m_imageListNormal = m_imageListNormal =
m_imageListState = (wxImageList *) NULL; m_imageListState = (wxImageList *) NULL;
@@ -588,7 +593,7 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
SetValidator( validator ); SetValidator( validator );
#endif #endif
SetBackgroundColour( *wxWHITE ); SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
// m_dottedPen = wxPen( "grey", 0, wxDOT ); too slow under XFree86 // m_dottedPen = wxPen( "grey", 0, wxDOT ); too slow under XFree86
m_dottedPen = wxPen( "grey", 0, 0 ); m_dottedPen = wxPen( "grey", 0, 0 );
@@ -598,6 +603,7 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
wxTreeCtrl::~wxTreeCtrl() wxTreeCtrl::~wxTreeCtrl()
{ {
wxDELETE( m_hilightBrush ); wxDELETE( m_hilightBrush );
wxDELETE( m_normalBrush );
DeleteAllItems(); DeleteAllItems();
@@ -1621,7 +1627,7 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
else else
colText = *wxBLACK; colText = *wxBLACK;
brush = wxWHITE_BRUSH; brush = m_normalBrush;
} }
// prepare to draw // prepare to draw