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

Corrected disabling of controls in cell editor.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-09-26 10:00:50 +00:00
parent e2c0faf71c
commit 3b9c5fe8b3
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/richtext/richtextbuffer.cpp
View File

@@ -9291,18 +9291,20 @@ bool wxRichTextCell::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
else else
caption = _("Cell Properties"); caption = _("Cell Properties");
// We don't want position and floating controls for a cell.
wxRichTextSizePage::ShowPositionControls(false);
wxRichTextSizePage::ShowFloatingControls(false);
wxRichTextSizePage::ShowAlignmentControls(true);
wxRichTextObjectPropertiesDialog cellDlg(this, wxGetTopLevelParent(parent), wxID_ANY, caption); wxRichTextObjectPropertiesDialog cellDlg(this, wxGetTopLevelParent(parent), wxID_ANY, caption);
cellDlg.SetAttributes(attr); cellDlg.SetAttributes(attr);
wxRichTextSizePage* sizePage = wxDynamicCast(cellDlg.FindPage(wxCLASSINFO(wxRichTextSizePage)), wxRichTextSizePage); bool ok = (cellDlg.ShowModal() == wxID_OK);
if (sizePage)
{
// We don't want position and floating controls for a cell.
sizePage->ShowPositionControls(false);
sizePage->ShowFloatingControls(false);
}
if (cellDlg.ShowModal() == wxID_OK) wxRichTextSizePage::ShowPositionControls(true);
wxRichTextSizePage::ShowFloatingControls(true);
if (ok)
{ {
if (multipleCells) if (multipleCells)
{ {