From 2df4c4c194da023b117b79d83b7eea03c7641619 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 10 Jul 2014 11:31:10 -0700 Subject: [PATCH] Use wxDCFontChanger correctly Fixes the audio display timeline font changing based on what else is being painted. --- src/audio_display.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/audio_display.cpp b/src/audio_display.cpp index d8c6fb56c..9632b14a1 100644 --- a/src/audio_display.cpp +++ b/src/audio_display.cpp @@ -882,7 +882,7 @@ void AudioDisplay::PaintLabels(wxDC &dc, TimeRange updtime) wxDCFontChanger fc(dc); wxFont font = dc.GetFont(); font.SetWeight(wxFONTWEIGHT_BOLD); - dc.SetFont(font); + fc.Set(font); dc.SetTextForeground(*wxWHITE); for (auto const& label : labels) { @@ -917,7 +917,7 @@ void AudioDisplay::PaintTrackCursor(wxDC &dc) { if (!face_name.empty()) font.SetFaceName(face_name); font.SetWeight(wxFONTWEIGHT_BOLD); - dc.SetFont(font); + fc.Set(font); wxSize label_size(dc.GetTextExtent(track_cursor_label)); wxPoint label_pos(track_cursor_pos - scroll_left - label_size.x/2, audio_top + 2);