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

Remove the ability to sort by column in virtual wxListCtrl, and remove movable columns as we don't currently support it.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2006-10-02 22:48:14 +00:00
parent 6f1fb1acbb
commit 3ed1dc0add
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mac/carbon/listctrl_mac.cpp
View File

@@ -1217,15 +1217,18 @@ long wxListCtrl::InsertColumn(long col, wxListItem& item)
} }
m_dbImpl->InsertColumn(col, type, item.GetText(), just, item.GetWidth()); m_dbImpl->InsertColumn(col, type, item.GetText(), just, item.GetWidth());
if (GetWindowStyleFlag() & wxLC_EDIT_LABELS) // set/remove options based on the wxListCtrl type.
{
DataBrowserTableViewColumnID id; DataBrowserTableViewColumnID id;
m_dbImpl->GetColumnIDFromIndex(col, &id); m_dbImpl->GetColumnIDFromIndex(col, &id);
DataBrowserPropertyFlags flags; DataBrowserPropertyFlags flags;
verify_noerr(m_dbImpl->GetPropertyFlags(id, &flags)); verify_noerr(m_dbImpl->GetPropertyFlags(id, &flags));
if (GetWindowStyleFlag() & wxLC_EDIT_LABELS)
flags |= kDataBrowserPropertyIsEditable; flags |= kDataBrowserPropertyIsEditable;
verify_noerr(m_dbImpl->SetPropertyFlags(id, flags));
if (GetWindowStyleFlag() & wxLC_VIRTUAL){
flags &= ~kDataBrowserListViewSortableColumn;
} }
verify_noerr(m_dbImpl->SetPropertyFlags(id, flags));
} }
return col; return col;

2
src/mac/carbon/utils.cpp
View File

@@ -1900,7 +1900,7 @@ void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyTyp
columnDesc.propertyDesc.propertyID = (kMinColumnId + colId); columnDesc.propertyDesc.propertyID = (kMinColumnId + colId);
columnDesc.propertyDesc.propertyType = colType; columnDesc.propertyDesc.propertyType = colType;
columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewDefaultColumnFlags | kDataBrowserListViewTypeSelectColumn; columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewSortableColumn | kDataBrowserListViewTypeSelectColumn;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton; columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton;
#endif #endif