Merge branch 'recurrence' into 2.6.0
This commit is contained in:
@@ -31,8 +31,9 @@
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
ColumnEntry::ColumnEntry ()
|
||||
{
|
||||
_name = "entry";
|
||||
_label = STRING_COLUMN_LABEL_ADDED;
|
||||
_name = "entry";
|
||||
_modifiable = true;
|
||||
_label = STRING_COLUMN_LABEL_ADDED;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
@@ -40,7 +41,7 @@ ColumnEntry::ColumnEntry ()
|
||||
// Note that you can not determine which gets called first.
|
||||
void ColumnEntry::setStyle (const std::string& value)
|
||||
{
|
||||
_style = value;
|
||||
Column::setStyle (value);
|
||||
|
||||
if (_style == "age" &&
|
||||
_label == STRING_COLUMN_LABEL_ADDED)
|
||||
|
||||
Reference in New Issue
Block a user