solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Remove apparently unnecessary m_hasExplicitFont

Browse source 
Just use wxWindow::m_hasFont instead.
This commit is contained in:
Vadim Zeitlin 2020-07-14 15:47:35 +02:00
parent 0d7ab26e7d
commit 8535cde836
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/wx/generic/treectlg.h
View file

@ -352,8 +352,6 @@ protected:
virtual wxSize DoGetBestSize() const wxOVERRIDE;
private:
bool m_hasExplicitFont;
void OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
{
InitVisualAttributes();

3
src/generic/treectlg.cpp
View file

@ -982,7 +982,6 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent,
m_spacing = 10;
}
m_hasExplicitFont = m_hasFont;
InitVisualAttributes();
SetInitialSize(size);
@ -1011,7 +1010,7 @@ void wxGenericTreeCtrl::InitVisualAttributes()
const wxVisualAttributes attr(GetDefaultAttributes());
SetOwnForegroundColour(attr.colFg);
SetOwnBackgroundColour(attr.colBg);
if (!m_hasExplicitFont)
if (!m_hasFont)
SetOwnFont(attr.font);
m_hilightBrush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));