Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement missing wxTextBoxAttr::IsDefault function

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2012-01-04 16:32:08 +00:00
parent 2f783a2390
commit eb3d8a3319
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -517,6 +517,12 @@ public:
const wxTextAttrDimension& GetBottom() const { return m_bottom; } const wxTextAttrDimension& GetBottom() const { return m_bottom; }
wxTextAttrDimension& GetBottom() { return m_bottom; } wxTextAttrDimension& GetBottom() { return m_bottom; }
/**
Are all dimensions valid?
*/
bool IsValid() const { return m_left.IsValid() && m_top.IsValid() && m_right.IsValid() && m_bottom.IsValid(); }
wxTextAttrDimension m_left; wxTextAttrDimension m_left;
wxTextAttrDimension m_top; wxTextAttrDimension m_top;
wxTextAttrDimension m_right; wxTextAttrDimension m_right;

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

@@ -401,6 +401,12 @@ public:
const wxTextAttrDimension& GetBottom() const { return m_bottom; } const wxTextAttrDimension& GetBottom() const { return m_bottom; }
wxTextAttrDimension& GetBottom() { return m_bottom; } wxTextAttrDimension& GetBottom() { return m_bottom; }
/**
Are all dimensions valid?
*/
bool IsValid() const { return m_left.IsValid() && m_top.IsValid() && m_right.IsValid() && m_bottom.IsValid(); }
wxTextAttrDimension m_left; wxTextAttrDimension m_left;
wxTextAttrDimension m_top; wxTextAttrDimension m_top;
wxTextAttrDimension m_right; wxTextAttrDimension m_right;

7
src/richtext/richtextbuffer.cpp
View File

@@ -11016,6 +11016,13 @@ void wxTextBoxAttr::CollectCommonAttributes(const wxTextBoxAttr& attr, wxTextBox
m_outline.CollectCommonAttributes(attr.m_outline, clashingAttr.m_outline, absentAttr.m_outline); m_outline.CollectCommonAttributes(attr.m_outline, clashingAttr.m_outline, absentAttr.m_outline);
} }
bool wxTextBoxAttr::IsDefault() const
{
return GetFlags() == 0 && !m_border.IsValid() && !m_outline.IsValid() &&
!m_size.GetWidth().IsValid() && !m_size.GetHeight().IsValid() &&
!m_position.IsValid() && !m_padding.IsValid() && !m_margins.IsValid();
}
// wxRichTextAttr // wxRichTextAttr
void wxRichTextAttr::Copy(const wxRichTextAttr& attr) void wxRichTextAttr::Copy(const wxRichTextAttr& attr)