From 0dfee2106e1cf72152e063a64e03793f22a71a74 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@gmail.com>
Date: Wed, 1 Jun 2016 14:35:20 -0400
Subject: [PATCH 1/2] fix Windows build

---
 src/widgets/Ruler.cpp | 3 +++
 src/widgets/Ruler.h   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp
index ef80f0023..db55268b5 100644
--- a/src/widgets/Ruler.cpp
+++ b/src/widgets/Ruler.cpp
@@ -1956,6 +1956,9 @@ AdornedRulerPanel::AdornedRulerPanel(AudacityProject* parent,
 , mProject(parent)
 , mViewInfo(viewinfo)
 {
+   for (auto &button : mButtons)
+      button = nullptr;
+
    ReCreateButtons();
 
    SetLabel( _("Timeline") );
diff --git a/src/widgets/Ruler.h b/src/widgets/Ruler.h
index 3be39e59d..cc5910ad1 100644
--- a/src/widgets/Ruler.h
+++ b/src/widgets/Ruler.h
@@ -446,7 +446,7 @@ private:
 
    friend QuickPlayRulerOverlay;
 
-   wxWindow *mButtons[1] { {} };
+   wxWindow *mButtons[1];
    bool mNeedButtonUpdate { true };
 };
 

From 63c7d47378a298dd0eacd5b1f1185939d15eafc1 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Thu, 2 Jun 2016 11:22:42 -0400
Subject: [PATCH 2/2] A certain string does not need translation

---
 src/widgets/Ruler.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp
index db55268b5..a28e84912 100644
--- a/src/widgets/Ruler.cpp
+++ b/src/widgets/Ruler.cpp
@@ -2767,18 +2767,20 @@ void AdornedRulerPanel::OnContextMenu(wxContextMenuEvent & WXUNUSED(event))
 
 void AdornedRulerPanel::UpdateButtonStates()
 {
-   bool state = PlaybackPrefs::GetPinnedHeadPreference();
-   auto pinButton = static_cast<AButton*>(FindWindow(OnTogglePinnedStateID));
-   pinButton->PopUp();
-   pinButton->SetAlternateIdx(state ? 0 : 1);
-   const auto label = state
+   {
+      bool state = PlaybackPrefs::GetPinnedHeadPreference();
+      auto pinButton = static_cast<AButton*>(FindWindow(OnTogglePinnedStateID));
+      pinButton->PopUp();
+      pinButton->SetAlternateIdx(state ? 0 : 1);
+      const auto label = state
       // Label descibes the present state, not what the click does
       // (which is, to toggle the state)
       ? _("Pinned play/record Head")
       : _("Unpinned play/record Head");
-   const auto &fullLabel = ComposeButtonLabel(*mProject, _("PinnedHead"), label);
-   pinButton->SetLabel(fullLabel);
-   pinButton->SetToolTip(fullLabel);
+      const auto &fullLabel = ComposeButtonLabel(*mProject, wxT("PinnedHead"), label);
+      pinButton->SetLabel(fullLabel);
+      pinButton->SetToolTip(fullLabel);
+   }
 }
 
 void AdornedRulerPanel::OnTogglePinnedState(wxCommandEvent & event)