wxDATAVIEW_CELL_ACTIVATABLE translates Editable under OS X. Maybe we should remove the distinction.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -133,7 +133,8 @@ static bool InitializeColumnDescription(DataBrowserListViewColumnDesc& columnDes
|
|||||||
}
|
}
|
||||||
if (columnPtr->IsSortable())
|
if (columnPtr->IsSortable())
|
||||||
columnDescription.propertyDesc.propertyFlags |= kDataBrowserListViewSortableColumn;
|
columnDescription.propertyDesc.propertyFlags |= kDataBrowserListViewSortableColumn;
|
||||||
if (columnPtr->GetRenderer()->GetMode() == wxDATAVIEW_CELL_EDITABLE)
|
if ((columnPtr->GetRenderer()->GetMode() == wxDATAVIEW_CELL_EDITABLE) ||
|
||||||
|
(columnPtr->GetRenderer()->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE))
|
||||||
columnDescription.propertyDesc.propertyFlags |= kDataBrowserPropertyIsEditable;
|
columnDescription.propertyDesc.propertyFlags |= kDataBrowserPropertyIsEditable;
|
||||||
if ((columnDescription.propertyDesc.propertyType == kDataBrowserCustomType) ||
|
if ((columnDescription.propertyDesc.propertyType == kDataBrowserCustomType) ||
|
||||||
(columnDescription.propertyDesc.propertyType == kDataBrowserDateTimeType) ||
|
(columnDescription.propertyDesc.propertyType == kDataBrowserDateTimeType) ||
|
||||||
@@ -489,7 +490,7 @@ void wxDataViewRenderer::SetMode(wxDataViewCellMode mode)
|
|||||||
DataBrowserPropertyFlags flags;
|
DataBrowserPropertyFlags flags;
|
||||||
|
|
||||||
verify_noerr(macDataViewListCtrlPtr->GetPropertyFlags(dataViewColumnPtr->GetPropertyID(),&flags));
|
verify_noerr(macDataViewListCtrlPtr->GetPropertyFlags(dataViewColumnPtr->GetPropertyID(),&flags));
|
||||||
if (mode == wxDATAVIEW_CELL_EDITABLE)
|
if ((mode == wxDATAVIEW_CELL_EDITABLE) || (mode == wxDATAVIEW_CELL_ACTIVATABLE))
|
||||||
flags |= kDataBrowserPropertyIsEditable;
|
flags |= kDataBrowserPropertyIsEditable;
|
||||||
else
|
else
|
||||||
flags &= ~kDataBrowserPropertyIsEditable;
|
flags &= ~kDataBrowserPropertyIsEditable;
|
||||||
|
Reference in New Issue
Block a user