Corrected bold fonts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
b527aac54a
commit
c59e2a829f
@ -935,19 +935,20 @@ void wxTreeCtrl::AdjustMyScrollbars()
|
|||||||
void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
|
void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
|
||||||
{
|
{
|
||||||
// render bold items in bold
|
// render bold items in bold
|
||||||
wxFont *fontOld = (wxFont *)NULL,
|
wxFont fontOld;
|
||||||
*fontNew = (wxFont *)NULL;
|
wxFont fontNew;
|
||||||
|
|
||||||
if ( item->IsBold() )
|
if ( item->IsBold() )
|
||||||
{
|
{
|
||||||
fontOld = dc.GetFont();
|
fontOld = dc.GetFont();
|
||||||
if ( fontOld )
|
if (fontOld.Ok())
|
||||||
{
|
{
|
||||||
// @@ is there any better way to make a bold variant of old font?
|
// @@ is there any better way to make a bold variant of old font?
|
||||||
fontNew = new wxFont(fontOld->GetPointSize(),
|
fontNew = wxFont( fontOld.GetPointSize(),
|
||||||
fontOld->GetFamily(),
|
fontOld.GetFamily(),
|
||||||
fontOld->GetStyle(),
|
fontOld.GetStyle(),
|
||||||
wxBOLD,
|
wxBOLD,
|
||||||
fontOld->GetUnderlined());
|
fontOld.GetUnderlined());
|
||||||
dc.SetFont(fontNew);
|
dc.SetFont(fontNew);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -982,10 +983,9 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
|
|||||||
dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY() );
|
dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY() );
|
||||||
|
|
||||||
// restore normal font for bold items
|
// restore normal font for bold items
|
||||||
if ( fontOld )
|
if (fontOld.Ok())
|
||||||
{
|
{
|
||||||
dc.SetFont(fontOld);
|
dc.SetFont( fontOld);
|
||||||
delete fontNew;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user