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

Corrected multiple cell property editing

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-10-31 09:57:06 +00:00
parent 4618ed5f0b
commit 108f2cc7a7
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/richtext/richtextbuffer.cpp
View File

@@ -9564,6 +9564,9 @@ bool wxRichTextCell::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
wxRichTextSizePage::ShowFloatingControls(true); wxRichTextSizePage::ShowFloatingControls(true);
if (ok) if (ok)
{
wxRichTextAttr newAttr = cellDlg.GetAttributes();
if (!(newAttr == attr))
{ {
if (multipleCells) if (multipleCells)
{ {
@@ -9578,6 +9581,7 @@ bool wxRichTextCell::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
// the style directly instead of applying (which ignores indeterminate attributes, // the style directly instead of applying (which ignores indeterminate attributes,
// leaving them as they were). // leaving them as they were).
cellDlg.ApplyStyle(buffer->GetRichTextCtrl(), wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RESET); cellDlg.ApplyStyle(buffer->GetRichTextCtrl(), wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RESET);
}
return true; return true;
} }
else else