Browse Source

Fix juce mingw issues

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.5.0
falkTX 2 years ago
parent
commit
7316e3a89a
3 changed files with 17 additions and 11 deletions
  1. +0
    -3
      source/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
  2. +13
    -8
      source/modules/juce_gui_basics/juce_gui_basics.cpp
  3. +4
    -0
      source/modules/juce_gui_basics/native/juce_win32_Windowing.cpp

+ 0
- 3
source/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp View File

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


+ 13
- 8
source/modules/juce_gui_basics/juce_gui_basics.cpp View File

@@ -62,9 +62,12 @@
#include <vfw.h>
#include <commdlg.h>
#include <commctrl.h>
#include <UIAutomation.h>
#include <sapi.h>
#if JUCE_MSVC
#include <UIAutomation.h>
#endif
#if JUCE_WEB_BROWSER
#include <exdisp.h>
#include <exdispid.h>
@@ -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"


+ 4
- 0
source/modules/juce_gui_basics/native/juce_win32_Windowing.cpp View File

@@ -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<long> (lParam) == WindowsAccessibility::getUiaRootObjectId())
@@ -4075,6 +4078,7 @@ private:
break;
}
#endif
default:
break;
}


Loading…
Cancel
Save