You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

101 lines
3.9KB

  1. diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
  2. index 3fcb6f54a..dd044d108 100644
  3. --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
  4. +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
  5. @@ -61,7 +61,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4996 4100)
  6. #define PRAGMA_ALIGN_SUPPORTED 1
  7. #endif
  8. -#if ! JUCE_MSVC
  9. +#if ! JUCE_WINDOWS
  10. #define __cdecl
  11. #endif
  12. diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
  13. index f3a3ba2f8..7336fff7d 100644
  14. --- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
  15. +++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
  16. @@ -57,9 +57,6 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4355)
  17. #ifndef WM_APPCOMMAND
  18. #define WM_APPCOMMAND 0x0319
  19. #endif
  20. -
  21. - extern "C" void _fpreset();
  22. - extern "C" void _clearfp();
  23. #elif ! JUCE_WINDOWS
  24. static void _fpreset() {}
  25. static void _clearfp() {}
  26. diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp
  27. index 6755bba64..3ebe35f2b 100644
  28. --- a/modules/juce_gui_basics/juce_gui_basics.cpp
  29. +++ b/modules/juce_gui_basics/juce_gui_basics.cpp
  30. @@ -67,10 +67,13 @@
  31. #include <vfw.h>
  32. #include <commdlg.h>
  33. #include <commctrl.h>
  34. - #include <UIAutomation.h>
  35. #include <sapi.h>
  36. #include <Dxgi.h>
  37. + #if JUCE_MSVC
  38. + #include <UIAutomation.h>
  39. + #endif
  40. +
  41. #if JUCE_WEB_BROWSER
  42. #include <exdisp.h>
  43. #include <exdispid.h>
  44. @@ -287,13 +290,15 @@ namespace juce
  45. #include "native/juce_mac_MouseCursor.mm"
  46. #elif JUCE_WINDOWS
  47. - #include "native/accessibility/juce_win32_ComInterfaces.h"
  48. - #include "native/accessibility/juce_win32_WindowsUIAWrapper.h"
  49. - #include "native/accessibility/juce_win32_AccessibilityElement.h"
  50. - #include "native/accessibility/juce_win32_UIAHelpers.h"
  51. - #include "native/accessibility/juce_win32_UIAProviders.h"
  52. - #include "native/accessibility/juce_win32_AccessibilityElement.cpp"
  53. - #include "native/accessibility/juce_win32_Accessibility.cpp"
  54. + #if JUCE_MSVC
  55. + #include "native/accessibility/juce_win32_ComInterfaces.h"
  56. + #include "native/accessibility/juce_win32_WindowsUIAWrapper.h"
  57. + #include "native/accessibility/juce_win32_AccessibilityElement.h"
  58. + #include "native/accessibility/juce_win32_UIAHelpers.h"
  59. + #include "native/accessibility/juce_win32_UIAProviders.h"
  60. + #include "native/accessibility/juce_win32_AccessibilityElement.cpp"
  61. + #include "native/accessibility/juce_win32_Accessibility.cpp"
  62. + #endif
  63. #include "native/juce_win32_Windowing.cpp"
  64. #include "native/juce_win32_DragAndDrop.cpp"
  65. #include "native/juce_win32_FileChooser.cpp"
  66. diff --git a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
  67. index cb247722a..7a012c39c 100644
  68. --- a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
  69. +++ b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
  70. @@ -1667,8 +1667,10 @@ public:
  71. // do this first to avoid messages arriving for this window before it's destroyed
  72. JuceWindowIdentifier::setAsJUCEWindow (hwnd, false);
  73. + #if JUCE_MSVC
  74. if (isAccessibilityActive)
  75. WindowsAccessibility::revokeUIAMapEntriesForWindow (hwnd);
  76. + #endif
  77. shadower = nullptr;
  78. currentTouches.deleteAllTouchesForPeer (this);
  79. @@ -4246,6 +4248,7 @@ private:
  80. case WM_GETDLGCODE:
  81. return DLGC_WANTALLKEYS;
  82. + #if JUCE_MSVC
  83. case WM_GETOBJECT:
  84. {
  85. if (static_cast<long> (lParam) == WindowsAccessibility::getUiaRootObjectId())
  86. @@ -4264,6 +4267,7 @@ private:
  87. break;
  88. }
  89. + #endif
  90. default:
  91. break;
  92. }