AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corrected wxRTC IsDefault() implementations

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2013-10-20 17:42:06 +00:00
parent 09f3defad8
commit ab3c08cb53
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/richtext/richtextbuffer.h
View File

@ -946,6 +946,11 @@ public:
*/ */
void MakeValid() { m_borderWidth.SetValid(true); } void MakeValid() { m_borderWidth.SetValid(true); }
/**
True if the border has no attributes set.
*/
bool IsDefault() const { return (m_flags == 0); }
/** /**
Returns the border flags. Returns the border flags.
*/ */
@ -1054,10 +1059,15 @@ public:
void CollectCommonAttributes(const wxTextAttrBorders& attr, wxTextAttrBorders& clashingAttr, wxTextAttrBorders& absentAttr); void CollectCommonAttributes(const wxTextAttrBorders& attr, wxTextAttrBorders& clashingAttr, wxTextAttrBorders& absentAttr);
/** /**
Returns @true if all borders are valid. Returns @true if at least one border is valid.
*/ */
bool IsValid() const { return m_left.IsValid() || m_right.IsValid() || m_top.IsValid() || m_bottom.IsValid(); } bool IsValid() const { return m_left.IsValid() || m_right.IsValid() || m_top.IsValid() || m_bottom.IsValid(); }
/**
Returns @true if no border attributes were set.
*/
bool IsDefault() const { return m_left.IsDefault() && m_right.IsDefault() && m_top.IsDefault() && m_bottom.IsDefault(); }
/** /**
Returns the left border. Returns the left border.
*/ */

7
interface/wx/richtext/richtextbuffer.h
View File

@ -793,6 +793,11 @@ public:
*/ */
bool IsValid() const { return HasWidth(); } bool IsValid() const { return HasWidth(); }
/**
True if the border has no attributes set.
*/
bool IsDefault() const { return (m_flags == 0); }
/** /**
Set the valid flag for this border. Set the valid flag for this border.
*/ */
@ -906,7 +911,7 @@ public:
void CollectCommonAttributes(const wxTextAttrBorders& attr, wxTextAttrBorders& clashingAttr, wxTextAttrBorders& absentAttr); void CollectCommonAttributes(const wxTextAttrBorders& attr, wxTextAttrBorders& clashingAttr, wxTextAttrBorders& absentAttr);
/** /**
Returns @true if all borders are valid. Returns @true if at least one border is valid.
*/ */
bool IsValid() const { return m_left.IsValid() || m_right.IsValid() || m_top.IsValid() || m_bottom.IsValid(); } bool IsValid() const { return m_left.IsValid() || m_right.IsValid() || m_top.IsValid() || m_bottom.IsValid(); }

2
src/richtext/richtextbuffer.cpp
View File

@ -13145,7 +13145,7 @@ void wxTextBoxAttr::CollectCommonAttributes(const wxTextBoxAttr& attr, wxTextBox
bool wxTextBoxAttr::IsDefault() const bool wxTextBoxAttr::IsDefault() const
{ {
return GetFlags() == 0 && !m_border.IsValid() && !m_outline.IsValid() && return GetFlags() == 0 && m_border.IsDefault() && m_outline.IsDefault() &&
!m_size.IsValid() && !m_minSize.IsValid() && !m_maxSize.IsValid() && !m_size.IsValid() && !m_minSize.IsValid() && !m_maxSize.IsValid() &&
!m_position.IsValid() && !m_padding.IsValid() && !m_margins.IsValid(); !m_position.IsValid() && !m_padding.IsValid() && !m_margins.IsValid();
} }