guard against nullptr

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

diff --git a/src/msw/gdiplus.cpp b/src/msw/gdiplus.cpp
index 6aca8143bda78dbc2680bed4f8a99ef644be6e20..df688b1135f92e77c2a3f1c9252475d191baf8b4 100644 (file)
--- a/src/msw/gdiplus.cpp
+++ b/src/msw/gdiplus.cpp
@@ -27,6 +27,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/cpp.h"
+    #include "wx/log.h"
     #include "wx/module.h"
     #include "wx/string.h"
 #endif // WX_PRECOMP
@@ -733,6 +734,16 @@ wxFOR_ALL_GDIPLUS_STATUS_FUNCS(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
+// 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__
+
 // ============================================================================
 // wxGdiPlus helper class
 // ============================================================================