Corrected disabling of controls in cell editor.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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);
|
||||
|
||||
if (cellDlg.ShowModal() == wxID_OK)
|
||||
wxRichTextSizePage::ShowPositionControls(true);
|
||||
wxRichTextSizePage::ShowFloatingControls(true);
|
||||
|
||||
if (ok)
|
||||
{
|
||||
if (multipleCells)
|
||||
{
|
||||
|
Reference in New Issue
Block a user