Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use GdipStringFormatCachedGenericTypographic hack for MinGW as well.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2011-06-17 21:53:28 +00:00
parent 49d2c0adc3
commit 6a5f121bf9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/gdiplus.cpp
View File

@@ -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 // Special hack for w32api headers that reference this variable which is
// normally defined in Cygwin-specific gdiplus.lib but as we don't link with it // 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 // 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 // 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 // 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. // 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