From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 23 Jan 2012 12:33:03 +0000 (+0000)
Subject: Fix wxTextAttr::m_fontStrikethrough initialization.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6e43a69f069494d247da869f21e88ff5d48722d8

Fix wxTextAttr::m_fontStrikethrough initialization.

The code added in r70447 didn't initialize m_fontStrikethrough correctly.

This fixes unit test failures for wxRichTextCtrl that appeared since this
change.

See #9907.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 3b75cba9c8..a3a43e6998 100644
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -164,6 +164,7 @@ void wxTextAttr::Init()
     m_fontStyle = wxFONTSTYLE_NORMAL;
     m_fontWeight = wxFONTWEIGHT_NORMAL;
     m_fontUnderlined = false;
+    m_fontStrikethrough = false;
     m_fontEncoding = wxFONTENCODING_DEFAULT;
     m_fontFamily = wxFONTFAMILY_DEFAULT;
 
@@ -193,6 +194,7 @@ void wxTextAttr::Copy(const wxTextAttr& attr)
     m_fontStyle = attr.m_fontStyle;
     m_fontWeight = attr.m_fontWeight;
     m_fontUnderlined = attr.m_fontUnderlined;
+    m_fontStrikethrough = attr.m_fontStrikethrough;
     m_fontFaceName = attr.m_fontFaceName;
     m_fontEncoding = attr.m_fontEncoding;
     m_fontFamily = attr.m_fontFamily;