From f6ceba3e5b777037b01f8f67c00802122af5c8a4 Mon Sep 17 00:00:00 2001
From: ed <eddavies95@gmail.com>
Date: Thu, 1 Jul 2021 12:30:47 +0100
Subject: [PATCH] Accessibility:  Disable accessibility for Drawable base class

---
 modules/juce_gui_basics/drawables/juce_Drawable.cpp | 8 ++------
 modules/juce_gui_basics/drawables/juce_Drawable.h   | 2 --
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/juce_gui_basics/drawables/juce_Drawable.cpp b/modules/juce_gui_basics/drawables/juce_Drawable.cpp
index 14ad1d65d4..4b39d74fae 100644
--- a/modules/juce_gui_basics/drawables/juce_Drawable.cpp
+++ b/modules/juce_gui_basics/drawables/juce_Drawable.cpp
@@ -30,6 +30,7 @@ Drawable::Drawable()
 {
     setInterceptsMouseClicks (false, false);
     setPaintingIsUnclipped (true);
+    setAccessible (false);
 }
 
 Drawable::Drawable (const Drawable& other)
@@ -37,6 +38,7 @@ Drawable::Drawable (const Drawable& other)
 {
     setInterceptsMouseClicks (false, false);
     setPaintingIsUnclipped (true);
+    setAccessible (false);
 
     setComponentID (other.getComponentID());
     setTransform (other.getTransform());
@@ -196,10 +198,4 @@ std::unique_ptr<Drawable> Drawable::createFromImageFile (const File& file)
     return {};
 }
 
-//==============================================================================
-std::unique_ptr<AccessibilityHandler> Drawable::createAccessibilityHandler()
-{
-    return std::make_unique<AccessibilityHandler> (*this, AccessibilityRole::ignored);
-}
-
 } // namespace juce
diff --git a/modules/juce_gui_basics/drawables/juce_Drawable.h b/modules/juce_gui_basics/drawables/juce_Drawable.h
index 2798218952..2cddd85d40 100644
--- a/modules/juce_gui_basics/drawables/juce_Drawable.h
+++ b/modules/juce_gui_basics/drawables/juce_Drawable.h
@@ -199,8 +199,6 @@ protected:
     void setBoundsToEnclose (Rectangle<float>);
     /** @internal */
     void applyDrawableClipPath (Graphics&);
-    /** @internal */
-    std::unique_ptr<AccessibilityHandler> createAccessibilityHandler() override;
 
     Point<int> originRelativeToComponent;
     std::unique_ptr<Drawable> drawableClipPath;