Browse Source

Do not use fancy win32 dialog on mingw

tags/2020-12-27
falkTX 3 years ago
parent
commit
5d3771671d
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 35 additions and 0 deletions
  1. +31
    -0
      libs/juce-current/patches/22_mingw-filechooser-no-vista.patch
  2. +4
    -0
      libs/juce-current/source/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp

+ 31
- 0
libs/juce-current/patches/22_mingw-filechooser-no-vista.patch View File

@@ -0,0 +1,31 @@
diff --git a/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp b/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp
index 065d873e1..fb9cfc999 100644
--- a/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp
+++ b/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp
@@ -167,6 +167,7 @@ private:
Atomic<HWND> nativeDialogRef;
Atomic<int> shouldCancel;
+ #if JUCE_MSVC
bool showDialog (IFileDialog& dialog, bool async) const
{
FILEOPENDIALOGOPTIONS flags = {};
@@ -303,6 +304,7 @@ private:
return result;
}
+ #endif
Array<URL> openDialogPreVista (bool async)
{
@@ -412,8 +414,10 @@ private:
const Remover remover (*this);
+ #if JUCE_MSVC
if (SystemStats::getOperatingSystemType() >= SystemStats::WinVista)
return openDialogVistaAndUp (async);
+ #endif
return openDialogPreVista (async);
}

+ 4
- 0
libs/juce-current/source/modules/juce_gui_basics/native/juce_win32_FileChooser.cpp View File

@@ -167,6 +167,7 @@ private:
Atomic<HWND> nativeDialogRef;
Atomic<int> shouldCancel;
#if JUCE_MSVC
bool showDialog (IFileDialog& dialog, bool async) const
{
FILEOPENDIALOGOPTIONS flags = {};
@@ -303,6 +304,7 @@ private:
return result;
}
#endif
Array<URL> openDialogPreVista (bool async)
{
@@ -412,8 +414,10 @@ private:
const Remover remover (*this);
#if JUCE_MSVC
if (SystemStats::getOperatingSystemType() >= SystemStats::WinVista)
return openDialogVistaAndUp (async);
#endif
return openDialogPreVista (async);
}


Loading…
Cancel
Save