Use GdipStringFormatCachedGenericTypographic hack for MinGW as well.

When using GDI+ with MinGW, the same hack as for Cygwin is needed (see r66787)
as it uses the same w32api headers and libraries for GDI+ support (if it has
them at all).

See #11716.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/gdiplus.cpp b/src/msw/gdiplus.cpp
index 724140069953d5adb06c5689d97112f91c5d125a..8dc70566eba5a34cf0f1fbfb8192eefe226c8dd2 100644 (file)
--- a/src/msw/gdiplus.cpp
+++ b/src/msw/gdiplus.cpp
@@ -742,15 +742,15 @@ wxFOR_ALL_GDIPLUS_STATUS_FUNCS(wxDECL_GDIPLUS_FUNC_TYPE)
 
 } // extern "C"
 
 
 } // extern "C"
 

-// Special hack for Cygwin: its headers reference this variable which is
-// normally defined in Cygwin-specific gdiplus.lib but as we don't link with it
+// Special hack for w32api headers that reference this variable which is
+// normally defined in w32api-specific gdiplus.lib but as we don't link with it

 // and load gdiplus.dll dynamically, it's not defined in our case resulting in
 // linking errors -- so just provide it ourselves, it doesn't matter where it
 // is and if Cygwin headers are modified to not use it in the future, it's not
 // a big deal neither, we'll just have an unused pointer.
 // and load gdiplus.dll dynamically, it's not defined in our case resulting in
 // linking errors -- so just provide it ourselves, it doesn't matter where it
 // is and if Cygwin headers are modified to not use it in the future, it's not
 // a big deal neither, we'll just have an unused pointer.

-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) || defined(__MINGW32__)

 extern "C" void *_GdipStringFormatCachedGenericTypographic = NULL;
 extern "C" void *_GdipStringFormatCachedGenericTypographic = NULL;

-#endif // __CYGWIN__
+#endif // __CYGWIN__ || __MINGW32__

 
 // ============================================================================
 // wxGdiPlus helper class
 
 // ============================================================================
 // wxGdiPlus helper class