Ensure that the wxNativeFontInfo internal data is copied when the
wxFontRefData is. This solves a wxGTK2 problem where the PangoFontDescription pointer is copied by the default assignment operator, in a binary compatible way . git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -408,7 +408,10 @@ wxFontRefData::wxFontRefData( const wxFontRefData& data )
|
|||||||
|
|
||||||
m_noAA = data.m_noAA;
|
m_noAA = data.m_noAA;
|
||||||
|
|
||||||
m_nativeFontInfo = data.m_nativeFontInfo;
|
// Forces a copy of the internal data. wxNativeFontInfo should probably
|
||||||
|
// have a copy ctor and assignment operator to fix this properly but that
|
||||||
|
// would break binary compatibility...
|
||||||
|
m_nativeFontInfo.FromString(data.m_nativeFontInfo.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
wxFontRefData::wxFontRefData(int size, int family, int style,
|
wxFontRefData::wxFontRefData(int size, int family, int style,
|
||||||
|
@@ -408,7 +408,10 @@ wxFontRefData::wxFontRefData( const wxFontRefData& data )
|
|||||||
|
|
||||||
m_noAA = data.m_noAA;
|
m_noAA = data.m_noAA;
|
||||||
|
|
||||||
m_nativeFontInfo = data.m_nativeFontInfo;
|
// Forces a copy of the internal data. wxNativeFontInfo should probably
|
||||||
|
// have a copy ctor and assignment operator to fix this properly but that
|
||||||
|
// would break binary compatibility...
|
||||||
|
m_nativeFontInfo.FromString(data.m_nativeFontInfo.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
wxFontRefData::wxFontRefData(int size, int family, int style,
|
wxFontRefData::wxFontRefData(int size, int family, int style,
|
||||||
|
Reference in New Issue
Block a user