From 8b74ec2fb7c20a728a53bc0915bea38733a0771b Mon Sep 17 00:00:00 2001
From: ed <eddavies95@gmail.com>
Date: Wed, 12 May 2021 08:02:20 +0100
Subject: [PATCH] MinGW:  Exclude native accessibility code

---
 .../juce_AccessibilityHandler.cpp             |  2 +-
 modules/juce_gui_basics/juce_gui_basics.cpp   | 33 ++++++++++++++-----
 .../native/juce_win32_Windowing.cpp           |  7 ----
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp b/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp
index fe464bc880..74932355d8 100644
--- a/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp
+++ b/modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp
@@ -333,7 +333,7 @@ void AccessibilityHandler::takeFocus()
 }
 
 //==============================================================================
-#if ! (JUCE_MAC || JUCE_WINDOWS)
+#if ! (JUCE_MAC || (JUCE_WINDOWS && ! JUCE_MINGW))
 class AccessibilityHandler::AccessibilityNativeImpl { public: AccessibilityNativeImpl (AccessibilityHandler&) {} };
 void AccessibilityHandler::notifyAccessibilityEvent (AccessibilityEvent) const {}
 void AccessibilityHandler::postAnnouncement (const String&, AnnouncementPriority) {}
diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp
index 3555570c94..8261f09192 100644
--- a/modules/juce_gui_basics/juce_gui_basics.cpp
+++ b/modules/juce_gui_basics/juce_gui_basics.cpp
@@ -66,8 +66,11 @@
  #include <windowsx.h>
  #include <vfw.h>
  #include <commdlg.h>
- #include <UIAutomation.h>
- #include <sapi.h>
+
+ #if ! JUCE_MINGW
+  #include <UIAutomation.h>
+  #include <sapi.h>
+ #endif
 
  #if JUCE_WEB_BROWSER
   #include <exdisp.h>
@@ -254,12 +257,26 @@ namespace juce
  #include "native/juce_mac_MouseCursor.mm"
 
 #elif JUCE_WINDOWS
- #include "native/accessibility/juce_win32_WindowsUIAWrapper.h"
- #include "native/accessibility/juce_win32_AccessibilityElement.h"
- #include "native/accessibility/juce_win32_UIAHelpers.h"
- #include "native/accessibility/juce_win32_UIAProviders.h"
- #include "native/accessibility/juce_win32_AccessibilityElement.cpp"
- #include "native/accessibility/juce_win32_Accessibility.cpp"
+
+ #if ! JUCE_MINGW
+  #include "native/accessibility/juce_win32_WindowsUIAWrapper.h"
+  #include "native/accessibility/juce_win32_AccessibilityElement.h"
+  #include "native/accessibility/juce_win32_UIAHelpers.h"
+  #include "native/accessibility/juce_win32_UIAProviders.h"
+  #include "native/accessibility/juce_win32_AccessibilityElement.cpp"
+  #include "native/accessibility/juce_win32_Accessibility.cpp"
+ #else
+  namespace juce
+  {
+      namespace WindowsAccessibility
+      {
+          long getUiaRootObjectId()  { return -1; }
+          bool handleWmGetObject (AccessibilityHandler*, WPARAM, LPARAM, LRESULT*) { return false; }
+          void revokeUIAMapEntriesForWindow (HWND) {}
+      }
+  }
+ #endif
+
  #include "native/juce_win32_Windowing.cpp"
  #include "native/juce_win32_DragAndDrop.cpp"
  #include "native/juce_win32_FileChooser.cpp"
diff --git a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
index a1219fe712..016da69dc2 100644
--- a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
+++ b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
@@ -63,13 +63,6 @@ static bool shouldDeactivateTitleBar = true;
 
 void* getUser32Function (const char*);
 
-namespace WindowsAccessibility
-{
-    long getUiaRootObjectId();
-    bool handleWmGetObject (AccessibilityHandler*, WPARAM, LPARAM, LRESULT*);
-    void revokeUIAMapEntriesForWindow (HWND);
-}
-
 #if JUCE_DEBUG
  int numActiveScopedDpiAwarenessDisablers = 0;
  bool isInScopedDPIAwarenessDisabler() { return numActiveScopedDpiAwarenessDisablers > 0; }