No changes whatsoever, just remove trailing whitespace.
There are no real changes in this commit but it removes all trailing white space from our source files. This avoids problems when applying patches and making diffs and it would be nice to prevent it from reappearing. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -58,7 +58,7 @@ wxTextAttr wxRichTextStyleDefinition::GetStyleMergedWithBase(const wxRichTextSty
|
||||
{
|
||||
if (m_baseStyle.IsEmpty())
|
||||
return m_style;
|
||||
|
||||
|
||||
// Collect the styles, detecting loops
|
||||
wxArrayString styleNames;
|
||||
wxList styles;
|
||||
@@ -67,14 +67,14 @@ wxTextAttr wxRichTextStyleDefinition::GetStyleMergedWithBase(const wxRichTextSty
|
||||
{
|
||||
styles.Insert((wxObject*) def);
|
||||
styleNames.Add(def->GetName());
|
||||
|
||||
|
||||
wxString baseStyleName = def->GetBaseStyle();
|
||||
if (!baseStyleName.IsEmpty() && styleNames.Index(baseStyleName) == wxNOT_FOUND)
|
||||
def = sheet->FindStyle(baseStyleName);
|
||||
else
|
||||
def = NULL;
|
||||
}
|
||||
|
||||
|
||||
wxRichTextAttr attr;
|
||||
wxList::compatibility_iterator node = styles.GetFirst();
|
||||
while (node)
|
||||
@@ -83,7 +83,7 @@ wxTextAttr wxRichTextStyleDefinition::GetStyleMergedWithBase(const wxRichTextSty
|
||||
attr.Apply(def->GetStyle(), NULL);
|
||||
node = node->GetNext();
|
||||
}
|
||||
|
||||
|
||||
return attr;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user