X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..8166ab4343099511fbd6f013fbeb9afc87c69a25:/src/gtk/font.cpp diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 2fd0ad6f5f..23a8b2b1f0 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -95,7 +95,7 @@ public: void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; } bool GetNoAntiAliasing() { return m_noAA; } - + // and this one also modifies all the other font data fields void SetNativeFontInfo(const wxNativeFontInfo& info); @@ -158,7 +158,7 @@ private: }; // ---------------------------------------------------------------------------- -// wxFontRefData +// wxFontRefData // ---------------------------------------------------------------------------- void wxFontRefData::Init(int pointSize, @@ -185,7 +185,7 @@ void wxFontRefData::Init(int pointSize, m_underlined = underlined; m_encoding = encoding; - + m_noAA = FALSE; #ifdef __WXGTK20__ @@ -215,7 +215,7 @@ void wxFontRefData::Init(int pointSize, break; } } - + SetStyle( m_style ); SetPointSize( m_pointSize ); SetWeight( m_weight ); @@ -407,8 +407,11 @@ wxFontRefData::wxFontRefData( const wxFontRefData& data ) m_encoding = data.m_encoding; 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,