From 726f33e802d64ac8e85c05cfe1145f3789da254a Mon Sep 17 00:00:00 2001
From: andheh <36114788+andheh@users.noreply.github.com>
Date: Wed, 28 Feb 2018 11:51:52 +0100
Subject: [PATCH 1/2] fixed an initalization order warning in ShuttleGui.cpp

---
 src/ShuttleGui.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp
index 206aad126..4ec4aa5f8 100644
--- a/src/ShuttleGui.cpp
+++ b/src/ShuttleGui.cpp
@@ -2332,8 +2332,8 @@ void ShuttleGui::SetSizeHints( int minX, int minY )
 
 ShuttleGuiGetDefinition::ShuttleGuiGetDefinition(
    wxWindow * pParent,CommandMessageTarget & target )
-: CommandMessageTargetDecorator( target ),
-ShuttleGui( pParent, eIsGettingMetadata ) 
+: ShuttleGui( pParent, eIsGettingMetadata ),
+  CommandMessageTargetDecorator( target )
 {
 
 }

From 89315bd5e6024a2fe6779989909446afea86f393 Mon Sep 17 00:00:00 2001
From: andheh <36114788+andheh@users.noreply.github.com>
Date: Wed, 28 Feb 2018 12:34:38 +0100
Subject: [PATCH 2/2] made ShuttleGui destructor virtual

since it has virtual member functions and is used
polymorphically in commands/GetInfoCommand.cpp
---
 src/ShuttleGui.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/ShuttleGui.h b/src/ShuttleGui.h
index 7d60d369e..53423bed4 100644
--- a/src/ShuttleGui.h
+++ b/src/ShuttleGui.h
@@ -78,7 +78,7 @@ class AUDACITY_DLL_API ShuttleGuiBase /* not final */
 {
 public:
    ShuttleGuiBase(wxWindow * pParent,teShuttleMode ShuttleMode);
-   ~ShuttleGuiBase(void);
+   virtual ~ShuttleGuiBase();
    void Init();
    void ResetId();
 
@@ -403,7 +403,7 @@ class ShuttleGuiGetDefinition : public ShuttleGui, public CommandMessageTargetDe
 {
 public:
    ShuttleGuiGetDefinition(wxWindow * pParent,CommandMessageTarget & target );
-   ~ShuttleGuiGetDefinition(void);
+   virtual ~ShuttleGuiGetDefinition();
 
    wxCheckBox * TieCheckBox(
       const wxString &Prompt,
@@ -457,9 +457,6 @@ public:
       const int Value,
       const int max,
       const int min) override;
-
-
-
 };
 
 #endif