From c59e2a829f301a3dddf68e48f130cba2a9d8ee73 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 8 Dec 1998 09:30:54 +0000 Subject: [PATCH] Corrected bold fonts git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/treectrl.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp index c51c4a020d..ef1742d5c6 100644 --- a/src/generic/treectrl.cpp +++ b/src/generic/treectrl.cpp @@ -935,19 +935,20 @@ void wxTreeCtrl::AdjustMyScrollbars() void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) { // render bold items in bold - wxFont *fontOld = (wxFont *)NULL, - *fontNew = (wxFont *)NULL; + wxFont fontOld; + wxFont fontNew; + if ( item->IsBold() ) { fontOld = dc.GetFont(); - if ( fontOld ) + if (fontOld.Ok()) { // @@ is there any better way to make a bold variant of old font? - fontNew = new wxFont(fontOld->GetPointSize(), - fontOld->GetFamily(), - fontOld->GetStyle(), - wxBOLD, - fontOld->GetUnderlined()); + fontNew = wxFont( fontOld.GetPointSize(), + fontOld.GetFamily(), + fontOld.GetStyle(), + wxBOLD, + fontOld.GetUnderlined()); dc.SetFont(fontNew); } else @@ -982,10 +983,9 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY() ); // restore normal font for bold items - if ( fontOld ) + if (fontOld.Ok()) { - dc.SetFont(fontOld); - delete fontNew; + dc.SetFont( fontOld); } } -- 2.47.2