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

disable pixel size comparison in operator==() for wxGTK1 as it results in infinite recursion there

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-07-16 20:15:55 +00:00
parent 462deb5dce
commit 82d0e7fe66
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/fontcmn.cpp
View File

@@ -328,7 +328,12 @@ bool wxFontBase::operator==(const wxFont& font) const
( (
Ok() == font.Ok() && Ok() == font.Ok() &&
GetPointSize() == font.GetPointSize() && 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() && GetPixelSize() == font.GetPixelSize() &&
#endif
GetFamily() == font.GetFamily() && GetFamily() == font.GetFamily() &&
GetStyle() == font.GetStyle() && GetStyle() == font.GetStyle() &&
GetWeight() == font.GetWeight() && GetWeight() == font.GetWeight() &&