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

Fixed default style setting to take into account text boxes; fixed AddBoxStyle

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2012-01-08 18:27:47 +00:00
parent 1076e695b4
commit 1199fbd4e0
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/richtext/richtextctrl.cpp
View File

@@ -4086,7 +4086,15 @@ bool wxRichTextCtrl::SetDefaultStyleToCursorStyle()
// If at the start of a paragraph, use the next position. // If at the start of a paragraph, use the next position.
long pos = GetAdjustedCaretPosition(GetCaretPosition()); long pos = GetAdjustedCaretPosition(GetCaretPosition());
if (GetUncombinedStyle(pos, attr)) wxRichTextObject* obj = GetFocusObject()->GetLeafObjectAtPosition(pos);
if (obj && obj->IsTopLevel())
{
// Don't use the attributes of a top-level object, since they might apply
// to content of the object, e.g. background colour.
SetDefaultStyle(wxRichTextAttr());
return true;
}
else if (GetUncombinedStyle(pos, attr))
{ {
SetDefaultStyle(attr); SetDefaultStyle(attr);
return true; return true;

2
src/richtext/richtextstyles.cpp
View File

@@ -442,7 +442,7 @@ bool wxRichTextStyleSheet::AddListStyle(wxRichTextListStyleDefinition* def)
/// Add a definition to the box style list /// Add a definition to the box style list
bool wxRichTextStyleSheet::AddBoxStyle(wxRichTextBoxStyleDefinition* def) bool wxRichTextStyleSheet::AddBoxStyle(wxRichTextBoxStyleDefinition* def)
{ {
def->GetStyle().SetParagraphStyleName(def->GetName()); def->GetStyle().GetTextBoxAttr().SetBoxStyleName(def->GetName());
return AddStyle(m_boxStyleDefinitions, def); return AddStyle(m_boxStyleDefinitions, def);
} }