Merge remote-tracking branch 'dave/metadatacancel'

src/Tags.cpp

@@ -1365,6 +1365,9 @@ void TagsEditor::DoCancel(bool escKey)
       // To avoid memory leak, don't forget DecRef()!
       editor->DecRef();
       mGrid->HideCellEditControl();
+#if defined(__WXMSW__)
+      return;
+#endif
    }
 
    auto focus = wxWindow::FindFocus();

src/Tags.h

@@ -142,7 +142,9 @@ class TagsEditor final : public wxDialogWrapper
 
    virtual ~TagsEditor();
 
+#if !defined(__WXMSW__)
    bool IsEscapeKey(const wxKeyEvent& /*event*/) override { return false; }
+#endif
 
    void PopulateOrExchange(ShuttleGui & S);