From cbda10a5c0158934163a741674b335affa1f8585 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 13 Feb 2014 12:01:08 +0000 Subject: [PATCH] Corrected wxTextBoxAttr::IsDefault() implementation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 33df281789..688ce55547 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -13316,8 +13316,12 @@ void wxTextBoxAttr::CollectCommonAttributes(const wxTextBoxAttr& attr, wxTextBox bool wxTextBoxAttr::IsDefault() const { return GetFlags() == 0 && m_border.IsDefault() && m_outline.IsDefault() && - !m_size.IsValid() && !m_minSize.IsValid() && !m_maxSize.IsValid() && - !m_position.IsValid() && !m_padding.IsValid() && !m_margins.IsValid(); + !m_size.GetWidth().IsValid() && !m_size.GetHeight().IsValid() && + !m_minSize.GetWidth().IsValid() && !m_minSize.GetHeight().IsValid() && + !m_maxSize.GetWidth().IsValid() && !m_maxSize.GetHeight().IsValid() && + !m_position.GetLeft().IsValid() && !m_position.GetRight().IsValid() && !m_position.GetTop().IsValid() && !m_position.GetBottom().IsValid() && + !m_padding.GetLeft().IsValid() && !m_padding.GetRight().IsValid() && !m_padding.GetTop().IsValid() && !m_padding.GetBottom().IsValid() && + !m_margins.GetLeft().IsValid() && !m_margins.GetRight().IsValid() && !m_margins.GetTop().IsValid() && !m_margins.GetBottom().IsValid(); } // wxRichTextAttr