From 7fd80c6f685550715713208680e7d095b03c1632 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 22 Sep 2013 20:22:19 +0000 Subject: [PATCH] Allow absent checkbox when transferring dimension data git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextformatdlg.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp index bf976d9..fc44348 100644 --- a/src/richtext/richtextformatdlg.cpp +++ b/src/richtext/richtextformatdlg.cpp @@ -598,7 +598,8 @@ void wxRichTextFormattingDialog::SetDimensionValue(wxTextAttrDimension& dim, wxT if (!dim.IsValid()) { - checkBox->SetValue(false); + if (checkBox) + checkBox->SetValue(false); valueCtrl->SetValue(wxT("0")); unitsCtrl->SetSelection(0); #if 0 @@ -608,7 +609,8 @@ void wxRichTextFormattingDialog::SetDimensionValue(wxTextAttrDimension& dim, wxT } else { - checkBox->SetValue(true); + if (checkBox) + checkBox->SetValue(true); if (dim.GetUnits() == wxTEXT_ATTR_UNITS_TENTHS_MM) { unitsIdx = 1; @@ -632,7 +634,7 @@ void wxRichTextFormattingDialog::SetDimensionValue(wxTextAttrDimension& dim, wxT void wxRichTextFormattingDialog::GetDimensionValue(wxTextAttrDimension& dim, wxTextCtrl* valueCtrl, wxComboBox* unitsCtrl, wxCheckBox* checkBox) { - if (!checkBox->GetValue()) + if (checkBox && !checkBox->GetValue()) { dim.Reset(); } -- 2.7.4