Merge remote-tracking branch 'upstream/master' into darkaudacity

src/effects/Effect.cpp

@@ -3178,7 +3178,10 @@ void EffectUIHost::OnInitDialog(wxInitDialogEvent & evt)
       focused->SelectAll();
    }
 
+#ifdef __WXMAC__ // PRL:  Bug1329, partial fix, but really it's the fault of
+   // wxWidgets 3.0.2
    mApplyBtn->SetFocus();
+#endif
 }
 
 void EffectUIHost::OnErase(wxEraseEvent & WXUNUSED(evt))

src/toolbars/ToolBar.cpp

@@ -68,8 +68,9 @@ public:
    virtual ~ToolBarResizer();
 
    // We don't need or want to accept focus.
-   // PRL: except for ESC key now.
-   // bool AcceptsFocus() const;
+   // Note that AcceptsFocusFromKeyboard() is overriden rather than
+   // AcceptsFocus(), so that resize can be cancelled by ESC
+   bool AcceptsFocusFromKeyboard() const override {return false;}
 
 private:
    void OnErase(wxEraseEvent & event);
@@ -117,13 +118,6 @@ ToolBarResizer::~ToolBarResizer()
       ReleaseMouse();
 }
 
-/*
-bool ToolBarResizer::AcceptsFocus() const
-{
-   return false;
-}
- */
-
 //
 // Handle background erasure
 //