Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / msw / gdiplus.cpp

diff --git a/src/msw/gdiplus.cpp b/src/msw/gdiplus.cpp
index 724140069953d5adb06c5689d97112f91c5d125a..44126964e795da1f5c183a9a4f4903ee447f66fb 100644 (file)
--- a/src/msw/gdiplus.cpp
+++ b/src/msw/gdiplus.cpp
@@ -740,17 +740,17 @@ wxFOR_ALL_GDIPLUS_STATUS_FUNCS(wxDECL_GDIPLUS_FUNC_TYPE)
 
 #undef wxDECL_GDIPLUS_FUNC_TYPE
 
-} // 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.
-#ifdef __CYGWIN__
-extern "C" void *_GdipStringFormatCachedGenericTypographic = NULL;
-#endif // __CYGWIN__
+#if defined(__CYGWIN__) || defined(__MINGW32__)
+void *_GdipStringFormatCachedGenericTypographic = NULL;
+#endif // __CYGWIN__ || __MINGW32__
+
+} // extern "C"
 
 // ============================================================================
 // wxGdiPlus helper class