SetDefaultStyle(wxTextAttr()) now resets the default style instead of not changing...

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

diff --git a/docs/latex/wx/text.tex b/docs/latex/wx/text.tex
index 92cde1a23379f67cbcc8ea3738718cdfe3d3e754..af0fd125565794f986a5fd4f926831102b4e23eb 100644 (file)
--- a/docs/latex/wx/text.tex
+++ b/docs/latex/wx/text.tex
@@ -681,6 +681,10 @@ If either of the font, foreground, or background colour is not set in\rtfsp
 the previous default style didn't set them neither, the global font or colours
 of the text control itself are used as fall back.
 
 the previous default style didn't set them neither, the global font or colours
 of the text control itself are used as fall back.
 

+However if the {\it style} parameter is the default wxTextAttr, then the
+default style is just reset (instead of being combined with the new style which
+wouldn't change it at all).
+

 \wxheading{Parameters}
 
 \docparam{style}{The style for the new text.}
 \wxheading{Parameters}
 
 \docparam{style}{The style for the new text.}

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 7e081b9037dd0a918a616ac8df50ae23c6c17342..6a494d434cf125c3231f3dc36c471c14ece6b105 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -115,8 +115,13 @@ bool wxTextCtrlBase::SetStyle(long WXUNUSED(start), long WXUNUSED(end),
 // change default text attributes
 bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style)
 {
 // change default text attributes
 bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style)
 {

-    // keep the old attributes if the new style doesn't specify them
-    m_defaultStyle = wxTextAttr::Combine(style, m_defaultStyle, this);
+    // keep the old attributes if the new style doesn't specify them unless the
+    // new style is empty - then reset m_defaultStyle (as there is no other way
+    // to do it)
+    if ( style.IsDefault() )
+        m_defaultStyle = style;
+    else
+        m_defaultStyle = wxTextAttr::Combine(style, m_defaultStyle, this);

 
     return TRUE;
 }
 
     return TRUE;
 }