X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2c3db9d7d22b57cf64c8671afe16d6739465120..bfdc04a9bb95e6865570d59192718052b6229221:/src/msw/treectrl.cpp diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index 5dcb0867c0..eb177d058e 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "treectrl.h" #endif @@ -36,17 +36,6 @@ // comctl32.dll versions #define wxUSE_COMCTL32_SAFELY 0 -// Mingw32 is a bit mental even though this is done in winundef -#ifdef GetFirstChild - #undef GetFirstChild -#endif - -#ifdef GetNextSibling - #undef GetNextSibling -#endif - -#if defined(__WIN95__) - #include "wx/app.h" #include "wx/log.h" #include "wx/dynarray.h" @@ -55,39 +44,17 @@ #include "wx/msw/treectrl.h" #include "wx/msw/dragimag.h" -#ifdef __GNUWIN32_OLD__ - #include "wx/msw/gnuwin32/extra.h" -#endif +// include "properly" +#include "wx/msw/wrapcctl.h" -#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) - #include -#endif +// macros to hide the cast ugliness +// -------------------------------- -// Bug in headers, sometimes -#ifndef TVIS_FOCUSED - #define TVIS_FOCUSED 0x0001 -#endif +// ptr is the real item id, i.e. wxTreeItemId::m_pItem +#define HITEM_PTR(ptr) (HTREEITEM)(ptr) -#ifndef TV_FIRST - #define TV_FIRST 0x1100 -#endif - -#ifndef TVS_CHECKBOXES - #define TVS_CHECKBOXES 0x0100 -#endif - -#ifndef TVS_FULLROWSELECT - #define TVS_FULLROWSELECT 0x1000 -#endif - -// old headers might miss these messages (comctl32.dll 4.71+ only) -#ifndef TVM_SETBKCOLOR - #define TVM_SETBKCOLOR (TV_FIRST + 29) - #define TVM_SETTEXTCOLOR (TV_FIRST + 30) -#endif - -// a macro to hide the ugliness of nested casts -#define HITEM(item) (HTREEITEM)(WXHTREEITEM)(item) +// item here is a wxTreeItemId +#define HITEM(item) HITEM_PTR((item).m_pItem) // the native control doesn't support multiple selections under MSW and we // have 2 ways to emulate them: either using TVS_CHECKBOXES style and let @@ -403,6 +370,8 @@ public: private: wxArrayTreeItemIds& m_selections; + + DECLARE_NO_COPY_CLASS(TraverseSelections) }; // internal class for counting tree items @@ -430,6 +399,8 @@ public: private: size_t m_count; + + DECLARE_NO_COPY_CLASS(TraverseCounter) }; // ---------------------------------------------------------------------------- @@ -499,7 +470,69 @@ private: // wxWin macros // ---------------------------------------------------------------------------- +#if wxUSE_EXTENDED_RTTI +WX_DEFINE_FLAGS( wxTreeCtrlStyle ) + +wxBEGIN_FLAGS( wxTreeCtrlStyle ) + // new style border flags, we put them first to + // use them for streaming out + wxFLAGS_MEMBER(wxBORDER_SIMPLE) + wxFLAGS_MEMBER(wxBORDER_SUNKEN) + wxFLAGS_MEMBER(wxBORDER_DOUBLE) + wxFLAGS_MEMBER(wxBORDER_RAISED) + wxFLAGS_MEMBER(wxBORDER_STATIC) + wxFLAGS_MEMBER(wxBORDER_NONE) + + // old style border flags + wxFLAGS_MEMBER(wxSIMPLE_BORDER) + wxFLAGS_MEMBER(wxSUNKEN_BORDER) + wxFLAGS_MEMBER(wxDOUBLE_BORDER) + wxFLAGS_MEMBER(wxRAISED_BORDER) + wxFLAGS_MEMBER(wxSTATIC_BORDER) + wxFLAGS_MEMBER(wxBORDER) + + // standard window styles + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) + wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) + wxFLAGS_MEMBER(wxWANTS_CHARS) + wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) + wxFLAGS_MEMBER(wxVSCROLL) + wxFLAGS_MEMBER(wxHSCROLL) + + wxFLAGS_MEMBER(wxTR_EDIT_LABELS) + wxFLAGS_MEMBER(wxTR_NO_BUTTONS) + wxFLAGS_MEMBER(wxTR_HAS_BUTTONS) + wxFLAGS_MEMBER(wxTR_TWIST_BUTTONS) + wxFLAGS_MEMBER(wxTR_NO_LINES) + wxFLAGS_MEMBER(wxTR_FULL_ROW_HIGHLIGHT) + wxFLAGS_MEMBER(wxTR_LINES_AT_ROOT) + wxFLAGS_MEMBER(wxTR_HIDE_ROOT) + wxFLAGS_MEMBER(wxTR_ROW_LINES) + wxFLAGS_MEMBER(wxTR_HAS_VARIABLE_ROW_HEIGHT) + wxFLAGS_MEMBER(wxTR_SINGLE) + wxFLAGS_MEMBER(wxTR_MULTIPLE) + wxFLAGS_MEMBER(wxTR_EXTENDED) + wxFLAGS_MEMBER(wxTR_DEFAULT_STYLE) + +wxEND_FLAGS( wxTreeCtrlStyle ) + +IMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl,"wx/treectrl.h") + +wxBEGIN_PROPERTIES_TABLE(wxTreeCtrl) + wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent ) + wxEVENT_RANGE_PROPERTY( TreeEvent , wxEVT_COMMAND_TREE_BEGIN_DRAG , wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK , wxTreeEvent ) + wxPROPERTY_FLAGS( WindowStyle , wxTreeCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxTreeCtrl) +wxEND_HANDLERS_TABLE() + +wxCONSTRUCTOR_5( wxTreeCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) +#else IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) +#endif // ---------------------------------------------------------------------------- // constants @@ -551,7 +584,7 @@ bool wxTreeTraversal::DoTraverse(const wxTreeItemId& root, bool recursively) bool wxTreeTraversal::Traverse(const wxTreeItemId& root, bool recursively) { - long cookie; + wxTreeItemIdValue cookie; wxTreeItemId child = m_tree->GetFirstChild(root, cookie); while ( child.IsOk() ) { @@ -580,7 +613,6 @@ void wxTreeCtrl::Init() m_textCtrl = NULL; m_hasAnyAttr = false; m_dragImage = NULL; - m_htSelStart = 0; m_pVirtualRoot = NULL; // initialize the global array of events now as it can't be done statically @@ -725,10 +757,7 @@ wxTreeCtrl::~wxTreeCtrl() // delete any attributes if ( m_hasAnyAttr ) { - for ( wxNode *node = m_attrs.Next(); node; node = m_attrs.Next() ) - { - delete (wxTreeItemAttr *)node->GetData(); - } + WX_CLEAR_HASH_MAP(wxMapTreeAttr, m_attrs); // prevent TVN_DELETEITEM handler from deleting the attributes again! m_hasAnyAttr = false; @@ -795,7 +824,7 @@ wxImageList *wxTreeCtrl::GetImageList() const wxImageList *wxTreeCtrl::GetStateImageList() const { - return m_imageListNormal; + return m_imageListState; } void wxTreeCtrl::SetAnyImageList(wxImageList *imageList, int which) @@ -1012,15 +1041,29 @@ void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image, return; } - int imageNormal, imageSel; + int imageNormal, + imageSel; + switch ( which ) { default: wxFAIL_MSG( wxT("unknown tree item image type") ); + // fall through case wxTreeItemIcon_Normal: - imageNormal = image; - imageSel = GetItemSelectedImage(item); + { + const int imageNormalOld = GetItemImage(item); + const int imageSelOld = + GetItemImage(item, wxTreeItemIcon_Selected); + + // always set the normal image + imageNormal = image; + + // if the selected and normal images were the same, they should + // be the same after the update, otherwise leave the selected + // image as it was + imageSel = imageNormalOld == imageSelOld ? image : imageSelOld; + } break; case wxTreeItemIcon_Selected: @@ -1036,7 +1079,7 @@ void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image, // the wxTreeItemIndirectData GetItemXXXImage() will use it to // get the images imageNormal = GetItemImage(item); - imageSel = GetItemSelectedImage(item); + imageSel = GetItemImage(item, wxTreeItemIcon_Selected); // if it doesn't have it yet, add it wxTreeItemIndirectData *data = new @@ -1190,51 +1233,40 @@ void wxTreeCtrl::RefreshItem(const wxTreeItemId& item) wxColour wxTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const { - long id = (long)(WXHTREEITEM)item; - wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id); - if ( !attr ) - { - return wxNullColour; - } + wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem); - return attr->GetTextColour(); + return it == m_attrs.end() ? wxNullColour : it->second->GetTextColour(); } wxColour wxTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const { - long id = (long)(WXHTREEITEM)item; - wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id); - if ( !attr ) - { - return wxNullColour; - } + wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem); - return attr->GetBackgroundColour(); + return it == m_attrs.end() ? wxNullColour : it->second->GetBackgroundColour(); } wxFont wxTreeCtrl::GetItemFont(const wxTreeItemId& item) const { - long id = (long)(WXHTREEITEM)item; - wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id); - if ( !attr ) - { - return wxNullFont; - } + wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem); - return attr->GetFont(); + return it == m_attrs.end() ? wxNullFont : it->second->GetFont(); } void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item, const wxColour& col) { - m_hasAnyAttr = true; - - long id = (long)(WXHTREEITEM)item; - wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id); - if ( !attr ) + wxTreeItemAttr *attr; + wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem); + if ( it == m_attrs.end() ) { + m_hasAnyAttr = true; + + m_attrs[item.m_pItem] = attr = new wxTreeItemAttr; - m_attrs.Put(id, (wxObject *)attr); + } + else + { + attr = it->second; } attr->SetTextColour(col); @@ -1245,14 +1277,18 @@ void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item, void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item, const wxColour& col) { - m_hasAnyAttr = true; - - long id = (long)(WXHTREEITEM)item; - wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id); - if ( !attr ) + wxTreeItemAttr *attr; + wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem); + if ( it == m_attrs.end() ) { + m_hasAnyAttr = true; + + m_attrs[item.m_pItem] = attr = new wxTreeItemAttr; - m_attrs.Put(id, (wxObject *)attr); + } + else // already in the hash + { + attr = it->second; } attr->SetBackgroundColour(col); @@ -1262,14 +1298,18 @@ void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item, void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font) { - m_hasAnyAttr = true; - - long id = (long)(WXHTREEITEM)item; - wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id); - if ( !attr ) + wxTreeItemAttr *attr; + wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem); + if ( it == m_attrs.end() ) { + m_hasAnyAttr = true; + + m_attrs[item.m_pItem] = attr = new wxTreeItemAttr; - m_attrs.Put(id, (wxObject *)attr); + } + else // already in the hash + { + attr = it->second; } attr->SetFont(font); @@ -1294,10 +1334,20 @@ bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const // this ugliness comes directly from MSDN - it *is* the correct way to pass // the HTREEITEM with TVM_GETITEMRECT - *(WXHTREEITEM *)&rect = (WXHTREEITEM)item; + *(HTREEITEM *)&rect = HITEM(item); - // false means get item rect for the whole item, not only text - return SendMessage(GetHwnd(), TVM_GETITEMRECT, false, (LPARAM)&rect) != 0; + // true means to get rect for just the text, not the whole line + if ( !::SendMessage(GetHwnd(), TVM_GETITEMRECT, true, (LPARAM)&rect) ) + { + // if TVM_GETITEMRECT returned false, then the item is definitely not + // visible (because its parent is not expanded) + return false; + } + + // however if it returned true, the item might still be outside the + // currently visible part of the tree, test for it (notice that partly + // visible means visible here) + return rect.bottom > 0 && rect.top < GetClientSize().y; } bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const @@ -1345,15 +1395,15 @@ wxTreeItemId wxTreeCtrl::GetRootItem() const if ( GET_VIRTUAL_ROOT() ) return TVI_ROOT; - return wxTreeItemId((WXHTREEITEM) TreeView_GetRoot(GetHwnd())); + return wxTreeItemId(TreeView_GetRoot(GetHwnd())); } wxTreeItemId wxTreeCtrl::GetSelection() const { - wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), (long)(WXHTREEITEM)0, + wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), wxTreeItemId(), wxT("this only works with single selection controls") ); - return wxTreeItemId((WXHTREEITEM) TreeView_GetSelection(GetHwnd())); + return wxTreeItemId(TreeView_GetSelection(GetHwnd())); } wxTreeItemId wxTreeCtrl::GetItemParent(const wxTreeItemId& item) const @@ -1375,32 +1425,57 @@ wxTreeItemId wxTreeCtrl::GetItemParent(const wxTreeItemId& item) const } } - return wxTreeItemId((WXHTREEITEM)hItem); + return wxTreeItemId(hItem); } wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, - long& _cookie) const + wxTreeItemIdValue& cookie) const { // remember the last child returned in 'cookie' - _cookie = (long)TreeView_GetChild(GetHwnd(), HITEM(item)); + cookie = TreeView_GetChild(GetHwnd(), HITEM(item)); + + return wxTreeItemId(cookie); +} + +wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item), + wxTreeItemIdValue& cookie) const +{ + wxTreeItemId item(TreeView_GetNextSibling(GetHwnd(), + HITEM(wxTreeItemId(cookie)))); + cookie = item.m_pItem; + + return item; +} + +#if WXWIN_COMPATIBILITY_2_4 + +wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, + long& cookie) const +{ + cookie = (long)TreeView_GetChild(GetHwnd(), HITEM(item)); - return wxTreeItemId((WXHTREEITEM)_cookie); + return wxTreeItemId((void *)cookie); } wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item), - long& _cookie) const + long& cookie) const { - wxTreeItemId l = wxTreeItemId((WXHTREEITEM)TreeView_GetNextSibling(GetHwnd(), - HITEM(_cookie))); - _cookie = (long)l; + wxTreeItemId item(TreeView_GetNextSibling + ( + GetHwnd(), + HITEM(wxTreeItemId((void *)cookie) + ))); + cookie = (long)item.m_pItem; - return l; + return item; } +#endif // WXWIN_COMPATIBILITY_2_4 + wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const { // can this be done more efficiently? - long cookie; + wxTreeItemIdValue cookie; wxTreeItemId childLast, child = GetFirstChild(item, cookie); @@ -1415,31 +1490,31 @@ wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const { - return wxTreeItemId((WXHTREEITEM) TreeView_GetNextSibling(GetHwnd(), HITEM(item))); + return wxTreeItemId(TreeView_GetNextSibling(GetHwnd(), HITEM(item))); } wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const { - return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevSibling(GetHwnd(), HITEM(item))); + return wxTreeItemId(TreeView_GetPrevSibling(GetHwnd(), HITEM(item))); } wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const { - return wxTreeItemId((WXHTREEITEM) TreeView_GetFirstVisible(GetHwnd())); + return wxTreeItemId(TreeView_GetFirstVisible(GetHwnd())); } wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const { wxASSERT_MSG( IsVisible(item), wxT("The item you call GetNextVisible() for must be visible itself!")); - return wxTreeItemId((WXHTREEITEM) TreeView_GetNextVisible(GetHwnd(), HITEM(item))); + return wxTreeItemId(TreeView_GetNextVisible(GetHwnd(), HITEM(item))); } wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const { wxASSERT_MSG( IsVisible(item), wxT("The item you call GetPrevVisible() for must be visible itself!")); - return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevVisible(GetHwnd(), HITEM(item))); + return wxTreeItemId(TreeView_GetPrevVisible(GetHwnd(), HITEM(item))); } // ---------------------------------------------------------------------------- @@ -1548,22 +1623,26 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent, if ( data != NULL ) { // associate the application tree item with Win32 tree item handle - data->SetId((WXHTREEITEM)id); + data->SetId(id); } - return wxTreeItemId((WXHTREEITEM)id); + return wxTreeItemId(id); } // for compatibility only +#if WXWIN_COMPATIBILITY_2_4 + wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent, const wxString& text, int image, int selImage, long insertAfter) { - return DoInsertItem(parent, (WXHTREEITEM)insertAfter, text, + return DoInsertItem(parent, wxTreeItemId((void *)insertAfter), text, image, selImage, NULL); } +#endif // WXWIN_COMPATIBILITY_2_4 + wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text, int image, int selectedImage, wxTreeItemData *data) @@ -1577,7 +1656,7 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text, return TVI_ROOT; } - return DoInsertItem(wxTreeItemId((long)(WXHTREEITEM) 0), (long)(WXHTREEITEM) 0, + return DoInsertItem(wxTreeItemId(), wxTreeItemId(), text, image, selectedImage, data); } @@ -1586,7 +1665,7 @@ wxTreeItemId wxTreeCtrl::PrependItem(const wxTreeItemId& parent, int image, int selectedImage, wxTreeItemData *data) { - return DoInsertItem(parent, (WXHTREEITEM) TVI_FIRST, + return DoInsertItem(parent, TVI_FIRST, text, image, selectedImage, data); } @@ -1606,7 +1685,7 @@ wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent, wxTreeItemData *data) { // find the item from index - long cookie; + wxTreeItemIdValue cookie; wxTreeItemId idPrev, idCur = GetFirstChild(parent, cookie); while ( index != 0 && idCur.IsOk() ) { @@ -1628,7 +1707,7 @@ wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parent, int image, int selectedImage, wxTreeItemData *data) { - return DoInsertItem(parent, (WXHTREEITEM) TVI_LAST, + return DoInsertItem(parent, TVI_LAST, text, image, selectedImage, data); } @@ -1643,13 +1722,13 @@ void wxTreeCtrl::Delete(const wxTreeItemId& item) // delete all children (but don't delete the item itself) void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item) { - long cookie; + wxTreeItemIdValue cookie; - wxArrayLong children; + wxArrayTreeItemIds children; wxTreeItemId child = GetFirstChild(item, cookie); while ( child.IsOk() ) { - children.Add((long)(WXHTREEITEM)child); + children.Add(child); child = GetNextChild(item, cookie); } @@ -1657,7 +1736,7 @@ void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item) size_t nCount = children.Count(); for ( size_t n = 0; n < nCount; n++ ) { - if ( !TreeView_DeleteItem(GetHwnd(), (HTREEITEM)children[n]) ) + if ( !TreeView_DeleteItem(GetHwnd(), HITEM_PTR(children[n])) ) { wxLogLastError(wxT("TreeView_DeleteItem")); } @@ -1742,10 +1821,12 @@ void wxTreeCtrl::Toggle(const wxTreeItemId& item) DoExpand(item, TVE_TOGGLE); } +#if WXWIN_COMPATIBILITY_2_4 void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action) { DoExpand(item, action); } +#endif void wxTreeCtrl::Unselect() { @@ -1753,7 +1834,7 @@ void wxTreeCtrl::Unselect() wxT("doesn't make sense, may be you want UnselectAll()?") ); // just remove the selection - SelectItem(wxTreeItemId((long) (WXHTREEITEM) 0)); + SelectItem(wxTreeItemId()); } void wxTreeCtrl::UnselectAll() @@ -1765,9 +1846,9 @@ void wxTreeCtrl::UnselectAll() for ( size_t n = 0; n < count; n++ ) { #if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE - SetItemCheck(selections[n], false); + SetItemCheck(HITEM_PTR(selections[n]), false); #else // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE - ::UnselectItem(GetHwnd(), HITEM(selections[n])); + ::UnselectItem(GetHwnd(), HITEM_PTR(selections[n])); #endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE } } @@ -1913,7 +1994,7 @@ wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags) #undef TRANSLATE_FLAG - return wxTreeItemId((WXHTREEITEM) hitTestInfo.hItem); + return wxTreeItemId(hitTestInfo.hItem); } bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item, @@ -2053,10 +2134,10 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) switch ( nMsg ) { case WM_RBUTTONDOWN: - // if the item we are about to right click on - // is not already select, remove the entire - // previous selection - if (!::IsItemSelected(GetHwnd(), htItem)) + // if the item we are about to right click on is not already + // selected or if we click outside of any item, remove the + // entire previous selection + if ( !htItem || !::IsItemSelected(GetHwnd(), htItem) ) { UnselectAll(); } @@ -2081,7 +2162,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) ::SetFocus(GetHwnd(), htItem); // reset on any click without Shift - m_htSelStart = 0; + m_htSelStart.Unset(); processed = true; } @@ -2093,8 +2174,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) if ( !m_htSelStart ) { // take the focused item - m_htSelStart = (WXHTREEITEM) - TreeView_GetSelection(GetHwnd()); + m_htSelStart = TreeView_GetSelection(GetHwnd()); } SelectRange(GetHwnd(), HITEM(m_htSelStart), htItem, @@ -2108,24 +2188,38 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { // avoid doing anything if we click on the only // currently selected item + wxArrayTreeItemIds selections; size_t count = GetSelections(selections); if ( count == 0 || - count > 1 || - HITEM(selections[0]) != htItem ) + count > 1 || + HITEM_PTR(selections[0]) != htItem ) { - // clear the previously selected items - UnselectAll(); - - // prevent the click from starting in-place editing - // which should only happen if we click on the - // already selected item (and nothing else is - // selected) - TreeView_SelectItem(GetHwnd(), 0); + // clear the previously selected items, if the + // user clicked outside of the present selection. + // otherwise, perform the deselection on mouse-up. + // this allows multiple drag and drop to work. + + if (IsItemSelected(GetHwnd(), htItem)) + { + ::SetFocus(GetHwnd(), htItem); + } + else + { + UnselectAll(); + + // prevent the click from starting in-place editing + // which should only happen if we click on the + // already selected item (and nothing else is + // selected) + + TreeView_SelectItem(GetHwnd(), 0); + ::SelectItem(GetHwnd(), htItem); + } } // reset on any click without Shift - m_htSelStart = 0; + m_htSelStart.Unset(); } } break; @@ -2147,6 +2241,24 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) break; case WM_LBUTTONUP: + + // facilitates multiple drag-and-drop + if (htItem && isMultiple) + { + wxArrayTreeItemIds selections; + size_t count = GetSelections(selections); + + if (count > 1 && + !(wParam & MK_CONTROL) && + !(wParam & MK_SHIFT)) + { + UnselectAll(); + TreeView_SelectItem(GetHwnd(), htItem); + } + } + + // fall through + case WM_RBUTTONUP: if ( m_dragImage ) { @@ -2157,7 +2269,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) // generate the drag end event wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, m_windowId); - event.m_item = (WXHTREEITEM)htItem; + event.m_item = htItem; event.m_pointDrag = wxPoint(x, y); event.SetEventObject(this); @@ -2183,7 +2295,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { // TreeView_GetItemRect() will return false if item is not visible, // which may happen perfectly well - if ( TreeView_GetItemRect(GetHwnd(), HITEM(selections[n]), + if ( TreeView_GetItemRect(GetHwnd(), HITEM_PTR(selections[n]), &rect, true) ) { ::InvalidateRect(GetHwnd(), &rect, false); @@ -2201,7 +2313,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd()); if ( !m_htSelStart ) { - m_htSelStart = (WXHTREEITEM)htSel; + m_htSelStart = htSel; } if ( wParam == VK_SPACE ) @@ -2296,7 +2408,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam; - event.m_item = (WXHTREEITEM) tv->itemNew.hItem; + event.m_item = tv->itemNew.hItem; event.m_pointDrag = wxPoint(tv->ptDrag.x, tv->ptDrag.y); // don't allow dragging by default: the user code must @@ -2311,7 +2423,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) eventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT; TV_DISPINFO *info = (TV_DISPINFO *)lParam; - event.m_item = (WXHTREEITEM) info->item.hItem; + event.m_item = info->item.hItem; event.m_label = info->item.pszText; event.m_editCancelled = false; } @@ -2322,12 +2434,16 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) eventType = wxEVT_COMMAND_TREE_DELETE_ITEM; NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam; - event.m_item = (WXHTREEITEM)tv->itemOld.hItem; + event.m_item = tv->itemOld.hItem; if ( m_hasAnyAttr ) { - delete (wxTreeItemAttr *)m_attrs. - Delete((long)tv->itemOld.hItem); + wxMapTreeAttr::iterator it = m_attrs.find(tv->itemOld.hItem); + if ( it != m_attrs.end() ) + { + delete it->second; + m_attrs.erase(it); + } } } break; @@ -2337,16 +2453,9 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) eventType = wxEVT_COMMAND_TREE_END_LABEL_EDIT; TV_DISPINFO *info = (TV_DISPINFO *)lParam; - event.m_item = (WXHTREEITEM)info->item.hItem; + event.m_item = info->item.hItem; event.m_label = info->item.pszText; - if (info->item.pszText == NULL) - { - event.m_editCancelled = true; - } - else - { - event.m_editCancelled = false; - } + event.m_editCancelled = info->item.pszText == NULL; break; } @@ -2362,7 +2471,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) TV_DISPINFO *info = (TV_DISPINFO *)lParam; - event.m_item = (WXHTREEITEM) info->item.hItem; + event.m_item = info->item.hItem; break; } @@ -2392,7 +2501,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) eventType = gs_expandEvents[what][how]; - event.m_item = (WXHTREEITEM) tv->itemNew.hItem; + event.m_item = tv->itemNew.hItem; } break; @@ -2405,9 +2514,6 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) // similar to the ones from a "real" WM_KEYDOWN so that // CreateKeyEvent() works correctly WXLPARAM lParam = -// (::GetKeyState(VK_MENU) & 0x100 ? KF_ALTDOWN : 0) << 16; - // Returns different negative values on WinME and WinNT, - // so simply test for negative value. (::GetKeyState(VK_MENU) < 0 ? KF_ALTDOWN : 0) << 16; WXWPARAM wParam = info->wVKey; @@ -2462,19 +2568,21 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) hdr->code == TVN_SELCHANGEDW) { NM_TREEVIEWW* tv = (NM_TREEVIEWW *)lParam; - event.m_item = (WXHTREEITEM) tv->itemNew.hItem; - event.m_itemOld = (WXHTREEITEM) tv->itemOld.hItem; + event.m_item = tv->itemNew.hItem; + event.m_itemOld = tv->itemOld.hItem; } else { NM_TREEVIEWA* tv = (NM_TREEVIEWA *)lParam; - event.m_item = (WXHTREEITEM) tv->itemNew.hItem; - event.m_itemOld = (WXHTREEITEM) tv->itemOld.hItem; + event.m_item = tv->itemNew.hItem; + event.m_itemOld = tv->itemOld.hItem; } } break; -#if defined(_WIN32_IE) && _WIN32_IE >= 0x300 && !wxUSE_COMCTL32_SAFELY && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) + // instead of explicitly checking for _WIN32_IE, check if the + // required symbols are available in the headers +#if defined(CDDS_PREPAINT) && !wxUSE_COMCTL32_SAFELY case NM_CUSTOMDRAW: { LPNMTVCUSTOMDRAW lptvcd = (LPNMTVCUSTOMDRAW)lParam; @@ -2490,70 +2598,54 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) case CDDS_ITEMPREPAINT: { - wxTreeItemAttr *attr = - (wxTreeItemAttr *)m_attrs.Get(nmcd.dwItemSpec); + wxMapTreeAttr::iterator + it = m_attrs.find((void *)nmcd.dwItemSpec); - if ( !attr ) + if ( it == m_attrs.end() ) { // nothing to do for this item *result = CDRF_DODEFAULT; break; } - HFONT hFont; - if ( attr->HasFont() ) - { - hFont = GetHfontOf(attr->GetFont()); - } - else - { - hFont = 0; - } - - wxColour colText; - if ( attr->HasTextColour() ) - { - colText = attr->GetTextColour(); - } - else - { - colText = GetForegroundColour(); - } + wxTreeItemAttr * const attr = it->second; - // selection colours should override ours - if ( nmcd.uItemState & CDIS_SELECTED ) - { - lptvcd->clrTextBk = - ::GetSysColor(COLOR_HIGHLIGHT); - lptvcd->clrText = - ::GetSysColor(COLOR_HIGHLIGHTTEXT); - } - else // !selected + // selection colours should override ours, + // otherwise it is too confusing ot the user + if ( !(nmcd.uItemState & CDIS_SELECTED) ) { wxColour colBack; if ( attr->HasBackgroundColour() ) { colBack = attr->GetBackgroundColour(); + lptvcd->clrTextBk = wxColourToRGB(colBack); } - else + } + + // but we still want to keep the special foreground + // colour when we don't have focus (we can't keep + // it when we do, it would usually be unreadable on + // the almost inverted bg colour...) + if ( !(nmcd.uItemState & CDIS_SELECTED) || + FindFocus() != this ) + { + wxColour colText; + if ( attr->HasTextColour() ) { - colBack = GetBackgroundColour(); + colText = attr->GetTextColour(); + lptvcd->clrText = wxColourToRGB(colText); } - - lptvcd->clrText = wxColourToRGB(colText); - lptvcd->clrTextBk = wxColourToRGB(colBack); } - // note that if we wanted to set colours for - // individual columns (subitems), we would have - // returned CDRF_NOTIFYSUBITEMREDRAW from here - if ( hFont ) + if ( attr->HasFont() ) { + HFONT hFont = GetHfontOf(attr->GetFont()); + ::SelectObject(nmcd.hdc, hFont); *result = CDRF_NEWFONT; } - else + else // no specific font { *result = CDRF_DODEFAULT; } @@ -2567,7 +2659,24 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) // we always process it return true; -#endif // _WIN32_IE >= 0x300 +#endif // have owner drawn support in headers + + case NM_CLICK: + { + DWORD pos = GetMessagePos(); + POINT point; + point.x = LOWORD(pos); + point.y = HIWORD(pos); + ::MapWindowPoints(HWND_DESKTOP, GetHwnd(), &point, 1); + int flags = 0; + wxTreeItemId item = HitTest(wxPoint(point.x, point.y), flags); + if (flags & wxTREE_HITTEST_ONITEMSTATEICON) + { + event.m_item = item; + eventType = wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK; + } + break; + } case NM_DBLCLK: case NM_RCLICK: @@ -2579,7 +2688,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) { if ( tvhti.flags & TVHT_ONITEM ) { - event.m_item = (WXHTREEITEM) tvhti.hItem; + event.m_item = tvhti.hItem; eventType = (int)hdr->code == NM_DBLCLK ? wxEVT_COMMAND_TREE_ITEM_ACTIVATED : wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK; @@ -2708,7 +2817,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) // comctl32.dll or our code? { NM_TREEVIEW* tv = (NM_TREEVIEW *)lParam; - wxTreeItemId id = (WXHTREEITEM)tv->itemNew.hItem; + wxTreeItemId id(tv->itemNew.hItem); int image = GetItemImage(id, wxTreeItemIcon_Expanded); if ( image != -1 ) @@ -2755,6 +2864,48 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) return processed; } -#endif // __WIN95__ +// ---------------------------------------------------------------------------- +// State control. +// ---------------------------------------------------------------------------- + +// why do they define INDEXTOSTATEIMAGEMASK but not the inverse? +#define STATEIMAGEMASKTOINDEX(state) (((state) & TVIS_STATEIMAGEMASK) >> 12) + +void wxTreeCtrl::SetState(const wxTreeItemId& node, int state) +{ + TV_ITEM tvi; + tvi.hItem = (HTREEITEM)node.m_pItem; + tvi.mask = TVIF_STATE; + tvi.stateMask = TVIS_STATEIMAGEMASK; + + // Select the specified state, or -1 == cycle to the next one. + if ( state == -1 ) + { + TreeView_GetItem(GetHwnd(), &tvi); + + state = STATEIMAGEMASKTOINDEX(tvi.state) + 1; + if ( state == m_imageListState->GetImageCount() ) + state = 1; + } + + wxCHECK_RET( state < m_imageListState->GetImageCount(), + _T("wxTreeCtrl::SetState(): item index out of bounds") ); + + tvi.state = INDEXTOSTATEIMAGEMASK(state); + + TreeView_SetItem(GetHwnd(), &tvi); +} + +int wxTreeCtrl::GetState(const wxTreeItemId& node) +{ + TV_ITEM tvi; + tvi.hItem = (HTREEITEM)node.m_pItem; + tvi.mask = TVIF_STATE; + tvi.stateMask = TVIS_STATEIMAGEMASK; + TreeView_GetItem(GetHwnd(), &tvi); + + return STATEIMAGEMASKTOINDEX(tvi.state); +} #endif // wxUSE_TREECTRL +