disable pixel size comparison in operator==() for wxGTK1 as it results in infinite recursion there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
462deb5dce
commit
82d0e7fe66
@ -328,7 +328,12 @@ bool wxFontBase::operator==(const wxFont& font) const
|
||||
(
|
||||
Ok() == font.Ok() &&
|
||||
GetPointSize() == font.GetPointSize() &&
|
||||
// in wxGTK1 GetPixelSize() calls GetInternalFont() which uses
|
||||
// operator==() resulting in infinite recursion so we can't use it
|
||||
// in that port
|
||||
#if !defined(__WXGTK__) || defined(__WXGTK20__)
|
||||
GetPixelSize() == font.GetPixelSize() &&
|
||||
#endif
|
||||
GetFamily() == font.GetFamily() &&
|
||||
GetStyle() == font.GetStyle() &&
|
||||
GetWeight() == font.GetWeight() &&
|
||||
|
Loading…
Reference in New Issue
Block a user