From 58ca0673c4e90b4324af57439f71ef0b4c7b251d Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Thu, 2 Jun 2016 09:04:45 +0100
Subject: [PATCH] Avoided spacer components in a ToolBar getting keyboard focus

---
 modules/juce_gui_basics/widgets/juce_Toolbar.cpp            | 1 +
 modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/juce_gui_basics/widgets/juce_Toolbar.cpp b/modules/juce_gui_basics/widgets/juce_Toolbar.cpp
index 458f0b5f0d..c9362c23b5 100644
--- a/modules/juce_gui_basics/widgets/juce_Toolbar.cpp
+++ b/modules/juce_gui_basics/widgets/juce_Toolbar.cpp
@@ -33,6 +33,7 @@ public:
           fixedSize (fixedSize_),
           drawBar (drawBar_)
     {
+        setWantsKeyboardFocus (false);
     }
 
     bool getToolbarItemSizes (int toolbarThickness, bool /*isToolbarVertical*/,
diff --git a/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h b/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h
index 0594e5787d..20271150fb 100644
--- a/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h
+++ b/modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h
@@ -104,7 +104,7 @@ public:
 
         @see contentAreaChanged
     */
-    const Rectangle<int>& getContentArea() const noexcept           { return contentArea; }
+    Rectangle<int> getContentArea() const noexcept                  { return contentArea; }
 
     //==============================================================================
     /** This method must return the size criteria for this item, based on a given toolbar