From 6fd448d1be846ef520d5893b6734c46548fdf4da Mon Sep 17 00:00:00 2001 From: lllucius Date: Tue, 7 Oct 2014 18:26:50 +0000 Subject: [PATCH] Fix incorrect font setting introduced in r13403 https://code.google.com/p/audacity/source/detail?r=13403 --- src/widgets/TimeTextCtrl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/widgets/TimeTextCtrl.cpp b/src/widgets/TimeTextCtrl.cpp index d86cfad51..b20866a7e 100644 --- a/src/widgets/TimeTextCtrl.cpp +++ b/src/widgets/TimeTextCtrl.cpp @@ -1056,18 +1056,18 @@ bool TimeTextCtrl::Layout() wxString exampleText = wxT("0"); // Keep making the font bigger until it's too big, then subtract one. - memDC.SetFont(wxFont(fontSize, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); + memDC.SetFont(wxFont(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); memDC.GetTextExtent(exampleText, &strW, &strH); while(strW <= mDigitBoxW && strH <= mDigitBoxH) { fontSize++; - memDC.SetFont(wxFont(fontSize, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); + memDC.SetFont(wxFont(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); memDC.GetTextExtent(exampleText, &strW, &strH); } fontSize--; if (mDigitFont) delete mDigitFont; - mDigitFont = new wxFont(fontSize, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); + mDigitFont = new wxFont(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); memDC.SetFont(*mDigitFont); memDC.GetTextExtent(exampleText, &strW, &strH); mDigitW = strW; @@ -1077,7 +1077,7 @@ bool TimeTextCtrl::Layout() fontSize--; if (mLabelFont) delete mLabelFont; - mLabelFont = new wxFont(fontSize, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); + mLabelFont = new wxFont(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); // Figure out the x-position of each field and label in the box x = mBorderLeft;