mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

MinGW: Exclude native accessibility code

Browse source
This commit is contained in:
ed 2021-05-12 08:02:20 +01:00
parent 70d0657f00
commit 8b74ec2fb7
3 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/juce_gui_basics/accessibility/juce_AccessibilityHandler.cpp
View file

@ -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) {}

33
modules/juce_gui_basics/juce_gui_basics.cpp
View file

@ -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"

7
modules/juce_gui_basics/native/juce_win32_Windowing.cpp
View file

@ -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; }