fixed bold font setting in wxGenericTreeCtrl to account for font face and encoding
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -762,11 +762,13 @@ void wxGenericTreeCtrl::Init()
|
|||||||
m_lastOnSame = FALSE;
|
m_lastOnSame = FALSE;
|
||||||
|
|
||||||
m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
|
m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
|
||||||
m_boldFont = wxFont( m_normalFont.GetPointSize(),
|
m_boldFont = wxFont(m_normalFont.GetPointSize(),
|
||||||
m_normalFont.GetFamily(),
|
m_normalFont.GetFamily(),
|
||||||
m_normalFont.GetStyle(),
|
m_normalFont.GetStyle(),
|
||||||
wxBOLD,
|
wxBOLD,
|
||||||
m_normalFont.GetUnderlined());
|
m_normalFont.GetUnderlined(),
|
||||||
|
m_normalFont.GetFaceName(),
|
||||||
|
m_normalFont.GetEncoding());
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxGenericTreeCtrl::Create(wxWindow *parent,
|
bool wxGenericTreeCtrl::Create(wxWindow *parent,
|
||||||
@@ -1007,11 +1009,13 @@ bool wxGenericTreeCtrl::SetFont( const wxFont &font )
|
|||||||
wxScrolledWindow::SetFont(font);
|
wxScrolledWindow::SetFont(font);
|
||||||
|
|
||||||
m_normalFont = font ;
|
m_normalFont = font ;
|
||||||
m_boldFont = wxFont( m_normalFont.GetPointSize(),
|
m_boldFont = wxFont(m_normalFont.GetPointSize(),
|
||||||
m_normalFont.GetFamily(),
|
m_normalFont.GetFamily(),
|
||||||
m_normalFont.GetStyle(),
|
m_normalFont.GetStyle(),
|
||||||
wxBOLD,
|
wxBOLD,
|
||||||
m_normalFont.GetUnderlined());
|
m_normalFont.GetUnderlined(),
|
||||||
|
m_normalFont.GetFaceName(),
|
||||||
|
m_normalFont.GetEncoding());
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user