AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added stubs for wxTreeCtrl functions not yet implemented under MSW

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1998-12-18 15:47:08 +00:00
parent e1ee62bd79
commit 95aabccc3a
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/msw/treectrl.h
View File

@ -43,7 +43,6 @@ struct WXDLLEXPORT wxTreeViewItem;
// first item precedes the second, +1 if the second precedes the first or 0 if // first item precedes the second, +1 if the second precedes the first or 0 if
// they're equivalent // they're equivalent
class wxTreeItemData; class wxTreeItemData;
typedef int (*wxTreeItemCmpFunc)(wxTreeItemData *item1, wxTreeItemData *item2);
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants
@ -377,13 +376,17 @@ public:
// end editing and accept or discard the changes to item label // end editing and accept or discard the changes to item label
void EndEditLabel(const wxTreeItemId& item, bool discardChanges = FALSE); void EndEditLabel(const wxTreeItemId& item, bool discardChanges = FALSE);
// sort the children of this item using the specified callback function // sorting
// (it should return -1, 0 or +1 as usual), if it's not specified // this function is called to compare 2 items and should return -1, 0
// alphabetical comparaison is performed. // or +1 if the first item is less than, equal to or greater than the
// second one. The base class version performs alphabetic comparaison
// of item labels (GetText)
virtual int OnCompareItems(const wxTreeItemId& item1,
const wxTreeItemId& item2);
// sort the children of this item using OnCompareItems
// //
// NB: this function is not reentrant! // NB: this function is not reentrant and not MT-safe (FIXME)!
void SortChildren(const wxTreeItemId& item, void SortChildren(const wxTreeItemId& item);
wxTreeItemCmpFunc *cmpFunction = NULL);
// helpers // helpers
// ------- // -------

18
src/msw/treectrl.cpp
View File

@ -736,10 +736,17 @@ wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
return wxTreeItemId((WXHTREEITEM) hitTestInfo.hItem); return wxTreeItemId((WXHTREEITEM) hitTestInfo.hItem);
} }
void wxTreeCtrl::SortChildren(const wxTreeItemId& item, int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
wxTreeItemCmpFunc *cmpFunction) const wxTreeItemId& item2)
{ {
if ( cmpFunction == NULL ) return strcmp(GetItemText(item1), GetItemText(item2));
}
void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
{
// rely on the fact that TreeView_SortChildren does the same thing as our
// default behaviour, i.e. sorts items alphabetically
if ( wxIS_KIND_OF(this, wxTreeCtrl) )
{ {
TreeView_SortChildren(wxhWnd, (HTREEITEM) (WXHTREEITEM) item, 0); TreeView_SortChildren(wxhWnd, (HTREEITEM) (WXHTREEITEM) item, 0);
} }
@ -750,9 +757,11 @@ void wxTreeCtrl::SortChildren(const wxTreeItemId& item,
} }
} }
// TODO
size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively) size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
{ {
// TODO
wxFAIL_MSG("wxTreeCtrl::GetChildrenCount not implemented");
return 0; return 0;
} }
@ -761,6 +770,7 @@ size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item) void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item)
{ {
// TODO // TODO
wxFAIL_MSG("wxTreeCtrl::DeleteChildren not implemented");
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------