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

Removed GetId/GetId and changed span storage to be compatible with 3.0. Fixed border control style.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-11-17 12:43:58 +00:00
parent 9c4f2cd1ca
commit c6de30bf70
6 changed files with 74 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/richtext/richtextbuffer.cpp
View File

@@ -531,7 +531,6 @@ void wxRichTextObject::Copy(const wxRichTextObject& obj)
m_properties = obj.m_properties;
m_descent = obj.m_descent;
m_show = obj.m_show;
m_id = obj.m_id;
}
// Get/set the top-level container of this object.
@@ -7184,9 +7183,6 @@ bool wxRichTextPlainText::CanMerge(wxRichTextObject* object, wxRichTextDrawingCo
if (!wxTextAttrEq(GetAttributes(), object->GetAttributes()) || !(m_properties == object->GetProperties()))
return false;
if (!otherObj->GetId().IsEmpty() && GetId() != otherObj->GetId())
return false;
// Check if differing virtual attributes makes it impossible to merge
// these strings.
@@ -9393,8 +9389,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRichTextCell, wxRichTextBox)
wxRichTextCell::wxRichTextCell(wxRichTextObject* parent):
wxRichTextBox(parent)
{
m_colSpan = 1;
m_rowSpan = 1;
}
/// Draw the item
@@ -9567,23 +9561,6 @@ bool wxRichTextCell::AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingCon
void wxRichTextCell::Copy(const wxRichTextCell& obj)
{
wxRichTextBox::Copy(obj);
m_colSpan = obj.m_colSpan;
m_rowSpan = obj.m_rowSpan;
}
void wxRichTextCell::SetColSpan(int span)
{
wxASSERT(span >= 1);
if (span >= 1)
m_colSpan = span;
}
void wxRichTextCell::SetRowSpan(int span)
{
wxASSERT(span >= 1);
if (span >= 1)
m_rowSpan = span;
}
// Edit properties via a GUI
@@ -9666,6 +9643,43 @@ bool wxRichTextCell::EditProperties(wxWindow* parent, wxRichTextBuffer* buffer)
return false;
}
void wxRichTextCell::SetColSpan(int span)
{
wxASSERT(span >= 1);
if (span >= 1)
GetProperties().SetProperty(wxT("colspan"), (long) span);
}
void wxRichTextCell::SetRowSpan(int span)
{
wxASSERT(span >= 1);
if (span >= 1)
GetProperties().SetProperty(wxT("rowspan"), (long) span);
}
// The next 2 methods return span values. Note that the default is 1, not 0
int wxRichTextCell::GetColSpan() const
{
int span = 1;
if (GetProperties().HasProperty(wxT("colspan")))
{
span = GetProperties().GetPropertyLong(wxT("colspan"));
}
return span;
}
int wxRichTextCell::GetRowSpan() const
{
int span = 1;
if (GetProperties().HasProperty(wxT("rowspan")))
{
span = GetProperties().GetPropertyLong(wxT("rowspan"));
}
return span;
}
WX_DEFINE_OBJARRAY(wxRichTextObjectPtrArrayArray)
IMPLEMENT_DYNAMIC_CLASS(wxRichTextTable, wxRichTextBox)