fixed infinite recursion bug in some rare cases
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -760,13 +760,15 @@ bool wxFontMapper::TestAltEncoding(const wxString& configEntry,
|
|||||||
class ReentrancyBlocker
|
class ReentrancyBlocker
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ReentrancyBlocker(bool& b) : m_b(b) { m_b = TRUE; }
|
ReentrancyBlocker(bool& flag) : m_flagOld(flag), m_flag(flag)
|
||||||
~ReentrancyBlocker() { m_b = FALSE; }
|
{ m_flag = TRUE; }
|
||||||
|
~ReentrancyBlocker() { m_flag = m_flagOld; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool& m_b;
|
bool m_flagOld;
|
||||||
|
bool& m_flag;
|
||||||
};
|
};
|
||||||
#endif
|
#endif // wxUSE_GUI
|
||||||
|
|
||||||
bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
|
bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
|
||||||
wxNativeEncodingInfo *info,
|
wxNativeEncodingInfo *info,
|
||||||
|
Reference in New Issue
Block a user