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.

100 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 54a7cb635..d475d93e2 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 91e82f087..211246aed 100644
  14. --- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
  15. +++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
  16. @@ -64,9 +64,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 644774631..fed316924 100644
  28. --- a/modules/juce_gui_basics/juce_gui_basics.cpp
  29. +++ b/modules/juce_gui_basics/juce_gui_basics.cpp
  30. @@ -67,9 +67,12 @@
  31. #include <vfw.h>
  32. #include <commdlg.h>
  33. #include <commctrl.h>
  34. - #include <UIAutomation.h>
  35. #include <sapi.h>
  36. + #if JUCE_MSVC
  37. + #include <UIAutomation.h>
  38. + #endif
  39. +
  40. #if JUCE_WEB_BROWSER
  41. #include <exdisp.h>
  42. #include <exdispid.h>
  43. @@ -308,13 +311,15 @@ JUCE_END_IGNORE_WARNINGS_GCC_LIKE
  44. #include "native/juce_mac_MouseCursor.mm"
  45. #elif JUCE_WINDOWS
  46. - #include "native/accessibility/juce_win32_ComInterfaces.h"
  47. - #include "native/accessibility/juce_win32_WindowsUIAWrapper.h"
  48. - #include "native/accessibility/juce_win32_AccessibilityElement.h"
  49. - #include "native/accessibility/juce_win32_UIAHelpers.h"
  50. - #include "native/accessibility/juce_win32_UIAProviders.h"
  51. - #include "native/accessibility/juce_win32_AccessibilityElement.cpp"
  52. - #include "native/accessibility/juce_win32_Accessibility.cpp"
  53. + #if JUCE_MSVC
  54. + #include "native/accessibility/juce_win32_ComInterfaces.h"
  55. + #include "native/accessibility/juce_win32_WindowsUIAWrapper.h"
  56. + #include "native/accessibility/juce_win32_AccessibilityElement.h"
  57. + #include "native/accessibility/juce_win32_UIAHelpers.h"
  58. + #include "native/accessibility/juce_win32_UIAProviders.h"
  59. + #include "native/accessibility/juce_win32_AccessibilityElement.cpp"
  60. + #include "native/accessibility/juce_win32_Accessibility.cpp"
  61. + #endif
  62. #include "native/juce_win32_Windowing.cpp"
  63. #include "native/juce_win32_DragAndDrop.cpp"
  64. #include "native/juce_win32_FileChooser.cpp"
  65. diff --git a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
  66. index 4ffc09d9a..e5886ca31 100644
  67. --- a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
  68. +++ b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
  69. @@ -1519,8 +1519,10 @@ public:
  70. // do this first to avoid messages arriving for this window before it's destroyed
  71. JuceWindowIdentifier::setAsJUCEWindow (hwnd, false);
  72. + #if JUCE_MSVC
  73. if (isAccessibilityActive)
  74. WindowsAccessibility::revokeUIAMapEntriesForWindow (hwnd);
  75. + #endif
  76. shadower = nullptr;
  77. currentTouches.deleteAllTouchesForPeer (this);
  78. @@ -4052,6 +4054,7 @@ private:
  79. case WM_GETDLGCODE:
  80. return DLGC_WANTALLKEYS;
  81. + #if JUCE_MSVC
  82. case WM_GETOBJECT:
  83. {
  84. if (static_cast<long> (lParam) == WindowsAccessibility::getUiaRootObjectId())
  85. @@ -4070,6 +4073,7 @@ private:
  86. break;
  87. }
  88. + #endif
  89. default:
  90. break;
  91. }