diff --git a/source/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/source/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp index 4322dd24d..3725b2331 100644 --- a/source/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp +++ b/source/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp @@ -50,9 +50,6 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4355) #ifndef WM_APPCOMMAND #define WM_APPCOMMAND 0x0319 #endif - - extern "C" void _fpreset(); - extern "C" void _clearfp(); #elif ! JUCE_WINDOWS static void _fpreset() {} static void _clearfp() {} diff --git a/source/modules/juce_gui_basics/juce_gui_basics.cpp b/source/modules/juce_gui_basics/juce_gui_basics.cpp index 2727a4507..bd19f7bec 100644 --- a/source/modules/juce_gui_basics/juce_gui_basics.cpp +++ b/source/modules/juce_gui_basics/juce_gui_basics.cpp @@ -62,9 +62,12 @@ #include #include #include - #include #include + #if JUCE_MSVC + #include + #endif + #if JUCE_WEB_BROWSER #include #include @@ -279,13 +282,15 @@ namespace juce #include "native/juce_mac_MouseCursor.mm" #elif JUCE_WINDOWS - #include "native/accessibility/juce_win32_ComInterfaces.h" - #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_MSVC + #include "native/accessibility/juce_win32_ComInterfaces.h" + #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" + #endif #include "native/juce_win32_Windowing.cpp" #include "native/juce_win32_DragAndDrop.cpp" #include "native/juce_win32_FileChooser.cpp" diff --git a/source/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/source/modules/juce_gui_basics/native/juce_win32_Windowing.cpp index 954200135..a62f8521e 100644 --- a/source/modules/juce_gui_basics/native/juce_win32_Windowing.cpp +++ b/source/modules/juce_gui_basics/native/juce_win32_Windowing.cpp @@ -1524,8 +1524,10 @@ public: // do this first to avoid messages arriving for this window before it's destroyed JuceWindowIdentifier::setAsJUCEWindow (hwnd, false); + #if JUCE_MSVC if (isAccessibilityActive) WindowsAccessibility::revokeUIAMapEntriesForWindow (hwnd); + #endif shadower = nullptr; currentTouches.deleteAllTouchesForPeer (this); @@ -4057,6 +4059,7 @@ private: case WM_GETDLGCODE: return DLGC_WANTALLKEYS; + #if JUCE_MSVC case WM_GETOBJECT: { if (static_cast (lParam) == WindowsAccessibility::getUiaRootObjectId()) @@ -4075,6 +4078,7 @@ private: break; } + #endif default: break; }