From e5153566d4eb1a90ce53a3466d4623fedfe911fd Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Sat, 22 Oct 2011 07:40:43 +0000 Subject: [PATCH] MGR: Fix project name font on Mac svn path=/trunk/boinc/; revision=24462 --- checkin_notes | 9 +++++++++ clientgui/sg_TaskPanel.cpp | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index 5a1b77ab0f..24eb7e5352 100644 --- a/checkin_notes +++ b/checkin_notes @@ -7663,3 +7663,12 @@ Charlie 21 Oct 2011 clientgui/ sg_BoincSimpleFrame.cpp,.h + +Charlie 21 Oct 2011 + - MGR: Fix project name font on Mac, which uses Lucinda Grande font + not Arial. SetFont for the parent window does not propogate to + the text controls because CTransparentStaticText uses OnPaint() + to draw. + + clientgui/ + sg_TaskPanel.cpp diff --git a/clientgui/sg_TaskPanel.cpp b/clientgui/sg_TaskPanel.cpp index 584dc14316..f9fe4c44c1 100755 --- a/clientgui/sg_TaskPanel.cpp +++ b/clientgui/sg_TaskPanel.cpp @@ -208,7 +208,6 @@ CSimpleTaskPanel::CSimpleTaskPanel( wxWindow* parent ) : m_sNotAvailableString = _("Not available"); m_progressBarRect = NULL; - SetFont(wxFont(SMALL_FONT,wxSWISS,wxNORMAL,wxNORMAL,false,wxT("Arial"))); SetForegroundColour(*wxBLACK); wxBoxSizer* bSizer1; @@ -249,7 +248,9 @@ CSimpleTaskPanel::CSimpleTaskPanel( wxWindow* parent ) : m_TaskProjectName = new CTransparentStaticText( this, wxID_ANY, wxT("SETI@home"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE ); m_TaskProjectName->Wrap( -1 ); - m_TaskProjectName->SetFont(wxFont(SMALL_FONT,wxDEFAULT,wxNORMAL,wxBOLD,false,wxT("Arial"))); + wxFont theFont = m_TaskProjectName->GetFont(); + theFont.SetWeight(wxFONTWEIGHT_BOLD); + m_TaskProjectName->SetFont(theFont); bSizer3->Add( m_TaskProjectName, 1, 0, 0 ); bSizer1->Add( bSizer3, 0, wxLEFT | wxRIGHT | wxEXPAND, SIDEMARGINS );