From 3b9c5fe8b3ace89e705b21a3318ffe74d904a434 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 26 Sep 2013 10:00:50 +0000 Subject: [PATCH] Corrected disabling of controls in cell editor. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 1ba7c4f859..2eb12f119a 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -9291,18 +9291,20 @@ bool wxRichTextCell::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer) else 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); cellDlg.SetAttributes(attr); - wxRichTextSizePage* sizePage = wxDynamicCast(cellDlg.FindPage(wxCLASSINFO(wxRichTextSizePage)), wxRichTextSizePage); - if (sizePage) - { - // We don't want position and floating controls for a cell. - sizePage->ShowPositionControls(false); - sizePage->ShowFloatingControls(false); - } + bool ok = (cellDlg.ShowModal() == wxID_OK); + + wxRichTextSizePage::ShowPositionControls(true); + wxRichTextSizePage::ShowFloatingControls(true); - if (cellDlg.ShowModal() == wxID_OK) + if (ok) { if (multipleCells) { -- 2.45.2