missing commit

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

diff --git a/src/msw/gdiplus.cpp b/src/msw/gdiplus.cpp
index fa3717bc46bef518173aab03478cebda94282848..44126964e795da1f5c183a9a4f4903ee447f66fb 100644 (file)
--- a/src/msw/gdiplus.cpp
+++ b/src/msw/gdiplus.cpp
@@ -36,6 +36,14 @@
 
 #include "wx/msw/wrapgdip.h"
 
 
 #include "wx/msw/wrapgdip.h"
 

+// w32api headers used by both MinGW and Cygwin wrongly define UINT16 inside
+// Gdiplus namespace in gdiplus.h which results in ambiguity errors when using
+// this type as UINT16 is also defined in global scope by windows.h (or rather
+// basetsd.h included from it), so we redefine it to work around this problem.
+#if defined(__CYGWIN__) || defined(__MINGW32__)
+    #define UINT16 unsigned short
+#endif
+

 // ----------------------------------------------------------------------------
 // helper macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // helper macros
 // ----------------------------------------------------------------------------


@@ -732,6 +740,16 @@ wxFOR_ALL_GDIPLUS_STATUS_FUNCS(wxDECL_GDIPLUS_FUNC_TYPE)
 
 #undef wxDECL_GDIPLUS_FUNC_TYPE
 
 
 #undef wxDECL_GDIPLUS_FUNC_TYPE
 

+// 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.
+#if defined(__CYGWIN__) || defined(__MINGW32__)
+void *_GdipStringFormatCachedGenericTypographic = NULL;
+#endif // __CYGWIN__ || __MINGW32__
+

 } // extern "C"
 
 // ============================================================================
 } // extern "C"
 
 // ============================================================================