X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/add28c55a04eb30080fc2ef9d3c5ddf66eab236a..de5ae7c6e6bd3ac764d3552a9e6fd4a287f01299:/src/msw/treectrl.cpp diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index cbecafa355..07ff06e610 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -28,34 +28,26 @@ #endif #ifndef WX_PRECOMP - #include "wx.h" + #include "wx/wx.h" #endif #if defined(__WIN95__) #include "wx/log.h" +#include "wx/dynarray.h" #include "wx/imaglist.h" +#include "wx/msw/treectrl.h" #include "wx/msw/private.h" -#ifndef __GNUWIN32__ - #include -#endif - -#ifdef GetFirstChild -#undef GetFirstChild -#endif - -#ifdef GetNextChild -#undef GetNextChild +#ifdef __GNUWIN32__ +#include "wx/msw/gnuwin32/extra.h" #endif -#ifdef GetNextSibling -#undef GetNextSibling +#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) + #include #endif -#include "wx/msw/treectrl.h" - // Bug in headers, sometimes #ifndef TVIS_FOCUSED #define TVIS_FOCUSED 0x0001 @@ -132,7 +124,8 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, m_windowId = (id == -1) ? NewControlId() : id; - DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES; + DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_SHOWSELALWAYS ; + bool want3D; WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ; @@ -254,6 +247,31 @@ void wxTreeCtrl::SetStateImageList(wxImageList *imageList) SetAnyImageList(m_imageListState = imageList, TVSIL_STATE); } +size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively) +{ + long cookie; + + size_t result = 0; + + wxArrayLong children; + wxTreeItemId child = GetFirstChild(item, cookie); + while ( child.IsOk() ) + { + if ( recursively ) + { + // recursive call + result += GetChildrenCount(child, TRUE); + } + + // add the child to the result in any case + result++; + + child = GetNextChild(item, cookie); + } + + return result; +} + // ---------------------------------------------------------------------------- // Item access // ---------------------------------------------------------------------------- @@ -343,6 +361,13 @@ void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold) DoSetItem(&tvItem); } +void wxTreeCtrl::SetItemDropHighlight(const wxTreeItemId& item, bool highlight) +{ + wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_DROPHILITED); + tvItem.state = highlight ? TVIS_DROPHILITED : 0; + DoSetItem(&tvItem); +} + // ---------------------------------------------------------------------------- // Item status // ---------------------------------------------------------------------------- @@ -421,12 +446,29 @@ wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item), long& _cookie) const { - wxTreeItemId l=wxTreeItemId((WXHTREEITEM) TreeView_GetNextSibling(wxhWnd, - (HTREEITEM) (WXHTREEITEM)_cookie)); - _cookie=(long)l; + wxTreeItemId l = wxTreeItemId((WXHTREEITEM)TreeView_GetNextSibling(wxhWnd, + (HTREEITEM)(WXHTREEITEM)_cookie)); + _cookie = (long)l; + return l; } +wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const +{ + // can this be done more efficiently? + long cookie; + + wxTreeItemId childLast, + child = GetFirstChild(item, cookie); + while ( child.IsOk() ) + { + childLast = child; + child = GetNextChild(item, cookie); + } + + return childLast; +} + wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const { return wxTreeItemId((WXHTREEITEM) TreeView_GetNextSibling(wxhWnd, (HTREEITEM) (WXHTREEITEM) item)); @@ -471,6 +513,13 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent, TV_INSERTSTRUCT tvIns; tvIns.hParent = (HTREEITEM) (WXHTREEITEM)parent; tvIns.hInsertAfter = (HTREEITEM) (WXHTREEITEM) hInsertAfter; + + // This is how we insert the item as the first child: supply a NULL hInsertAfter + if (tvIns.hInsertAfter == (HTREEITEM) 0) + { + tvIns.hInsertAfter = TVI_FIRST; + } + UINT mask = 0; if ( !text.IsEmpty() ) { @@ -572,6 +621,30 @@ void wxTreeCtrl::Delete(const wxTreeItemId& item) } } +// delete all children (but don't delete the item itself) +void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item) +{ + long cookie; + + wxArrayLong children; + wxTreeItemId child = GetFirstChild(item, cookie); + while ( child.IsOk() ) + { + children.Add((long)(WXHTREEITEM)child); + + child = GetNextChild(item, cookie); + } + + size_t nCount = children.Count(); + for ( size_t n = 0; n < nCount; n++ ) + { + if ( !TreeView_DeleteItem(wxhWnd, (HTREEITEM)children[n]) ) + { + wxLogLastError("TreeView_DeleteItem"); + } + } +} + void wxTreeCtrl::DeleteAllItems() { if ( !TreeView_DeleteAllItems(wxhWnd) ) @@ -582,8 +655,10 @@ void wxTreeCtrl::DeleteAllItems() void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag) { - wxASSERT_MSG( flag == TVE_COLLAPSE || flag == TVE_COLLAPSERESET || - flag == TVE_EXPAND || flag == TVE_TOGGLE, + wxASSERT_MSG( flag == TVE_COLLAPSE || + flag == (TVE_COLLAPSE | TVE_COLLAPSERESET) || + flag == TVE_EXPAND || + flag == TVE_TOGGLE, "Unknown flag in wxTreeCtrl::DoExpand" ); // TreeView_Expand doesn't send TVN_ITEMEXPAND(ING) messages, so we must @@ -623,7 +698,7 @@ void wxTreeCtrl::Collapse(const wxTreeItemId& item) void wxTreeCtrl::CollapseAndReset(const wxTreeItemId& item) { - DoExpand(item, TVE_COLLAPSERESET); + DoExpand(item, TVE_COLLAPSE | TVE_COLLAPSERESET); } void wxTreeCtrl::Toggle(const wxTreeItemId& item) @@ -736,24 +811,62 @@ wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags) return wxTreeItemId((WXHTREEITEM) hitTestInfo.hItem); } -void wxTreeCtrl::SortChildren(const wxTreeItemId& item, - wxTreeItemCmpFunc *cmpFunction) +bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item, + wxRect& rect, + bool textOnly) const { - if ( cmpFunction == NULL ) + RECT rc; + if ( TreeView_GetItemRect(wxhWnd, (HTREEITEM)(WXHTREEITEM)item, + &rc, textOnly) ) { - TreeView_SortChildren(wxhWnd, (HTREEITEM) (WXHTREEITEM) item, 0); + rect = wxRect(wxPoint(rc.left, rc.top), wxPoint(rc.right, rc.bottom)); + + return TRUE; } else { - // TODO: use TreeView_SortChildrenCB - wxFAIL_MSG("wxTreeCtrl::SortChildren not implemented"); + // couldn't retrieve rect: for example, item isn't visible + return FALSE; } } -// TODO -size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively) +// ---------------------------------------------------------------------------- +// sorting stuff +// ---------------------------------------------------------------------------- + +static int CALLBACK TreeView_CompareCallback(wxTreeItemData *pItem1, + wxTreeItemData *pItem2, + wxTreeCtrl *tree) +{ + wxCHECK_MSG( pItem1 && pItem2, 0, + _T("sorting tree without data doesn't make sense") ); + + return tree->OnCompareItems(pItem1->GetId(), pItem2->GetId()); +} + +int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1, + const wxTreeItemId& item2) +{ + return strcmp(GetItemText(item1), GetItemText(item2)); +} + +void wxTreeCtrl::SortChildren(const wxTreeItemId& item) { - return 0; + // rely on the fact that TreeView_SortChildren does the same thing as our + // default behaviour, i.e. sorts items alphabetically and so call it + // directly if we're not in derived class (much more efficient!) + if ( GetClassInfo() == CLASSINFO(wxTreeCtrl) ) + { + TreeView_SortChildren(wxhWnd, (HTREEITEM)(WXHTREEITEM)item, 0); + } + else + { + TV_SORTCB tvSort; + tvSort.hParent = (HTREEITEM)(WXHTREEITEM)item; + tvSort.lpfnCompare = (PFNTVCOMPARE)TreeView_CompareCallback; + tvSort.lParam = (LPARAM)this; + TreeView_SortChildrenCB(wxhWnd, &tvSort, 0 /* reserved */); + } } // ---------------------------------------------------------------------------- @@ -785,7 +898,7 @@ bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id) } // process WM_NOTIFY Windows message -bool wxTreeCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result) +bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) { wxTreeEvent event(wxEVT_NULL, m_windowId); wxEventType eventType = wxEVT_NULL; @@ -890,6 +1003,16 @@ bool wxTreeCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result) TV_KEYDOWN *info = (TV_KEYDOWN *)lParam; event.m_code = wxCharCodeMSWToWX(info->wVKey); + + // a separate event for this case + if ( info->wVKey == VK_SPACE || info->wVKey == VK_RETURN ) + { + wxTreeEvent event2(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, + m_windowId); + event2.SetEventObject(this); + + GetEventHandler()->ProcessEvent(event2); + } break; } @@ -911,7 +1034,7 @@ bool wxTreeCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result) } default: - return wxControl::MSWNotify(wParam, lParam, result); + return wxControl::MSWOnNotify(idCtrl, lParam, result); } event.SetEventObject(this); @@ -928,6 +1051,7 @@ bool wxTreeCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result) NM_TREEVIEW* tv = (NM_TREEVIEW *)lParam; wxTreeItemData *data = (wxTreeItemData *)tv->itemOld.lParam; delete data; // may be NULL, ok + processed = TRUE; // Make sure we don't get called twice } *result = !event.IsAllowed(); @@ -939,7 +1063,7 @@ bool wxTreeCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result) // Tree event // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxCommandEvent) +IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent) wxTreeEvent::wxTreeEvent(wxEventType commandType, int id) : wxNotifyEvent(commandType, id)