#undef CreateFont to fix cygwin compilation now that wxRichTextCtrl uses it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
127eab18f8
commit
136b3b1914
@ -43,6 +43,40 @@
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// CreateFont
|
||||||
|
|
||||||
|
#ifdef CreateFont
|
||||||
|
#undef CreateFont
|
||||||
|
|
||||||
|
inline HFONT CreateFont(int height,
|
||||||
|
int width,
|
||||||
|
int escapement,
|
||||||
|
int orientation,
|
||||||
|
int weight,
|
||||||
|
DWORD italic,
|
||||||
|
DWORD underline,
|
||||||
|
DWORD strikeout,
|
||||||
|
DWORD charset,
|
||||||
|
DWORD outprecision,
|
||||||
|
DWORD clipprecision,
|
||||||
|
DWORD quality,
|
||||||
|
DWORD family,
|
||||||
|
LPCTSTR facename)
|
||||||
|
{
|
||||||
|
#ifdef _UNICODE
|
||||||
|
return CreateFontW(height, width, escapement, orientation,
|
||||||
|
weight, italic, underline, strikeout, charset,
|
||||||
|
outprecision, clipprecision, quality,
|
||||||
|
family, facename);
|
||||||
|
#else
|
||||||
|
return CreateFontA(height, width, escapement, orientation,
|
||||||
|
weight, italic, underline, strikeout, charset,
|
||||||
|
outprecision, clipprecision, quality,
|
||||||
|
family, facename);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif // CreateFont
|
||||||
|
|
||||||
// CreateWindow
|
// CreateWindow
|
||||||
|
|
||||||
#if defined(CreateWindow)
|
#if defined(CreateWindow)
|
||||||
|
Loading…
Reference in New Issue
Block a user