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

use logical operator, rather than bitwise, on bools, closes #16824

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2015-02-02 17:23:55 +00:00
parent ecd32f0583
commit 1b14371f07
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/richtext/richtextbuffer.cpp
View File

@@ -3583,7 +3583,7 @@ bool wxRichTextParagraphLayoutBox::SetStyle(const wxRichTextRange& range, const
// we only want the paragraphs to hold this character style, then we _don't_ want to // we only want the paragraphs to hold this character style, then we _don't_ want to
// apply the character style. So we need to be able to choose. // apply the character style. So we need to be able to choose.
if (!parasOnly && (characterStyle|charactersOnly) && range.GetStart() != newPara->GetRange().GetEnd()) if (!parasOnly && (characterStyle || charactersOnly) && range.GetStart() != newPara->GetRange().GetEnd())
{ {
wxRichTextRange childRange(range); wxRichTextRange childRange(range);
childRange.LimitTo(newPara->GetRange()); childRange.LimitTo(newPara->GetRange());