Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SetDefaultStyle(wxTextAttr()) now resets the default style instead of not changing it at all

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-12-02 13:29:21 +00:00
parent 2dc5bacc01
commit c598f22518
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/latex/wx/text.tex
View File

@@ -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 the previous default style didn't set them neither, the global font or colours
of the text control itself are used as fall back. 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} \wxheading{Parameters}
\docparam{style}{The style for the new text.} \docparam{style}{The style for the new text.}

9
src/common/textcmn.cpp
View File

@@ -115,8 +115,13 @@ bool wxTextCtrlBase::SetStyle(long WXUNUSED(start), long WXUNUSED(end),
// change default text attributes // change default text attributes
bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style) bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style)
{ {
// keep the old attributes if the new style doesn't specify them // keep the old attributes if the new style doesn't specify them unless the
m_defaultStyle = wxTextAttr::Combine(style, m_defaultStyle, this); // 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;
} }