X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc6c62a931cd31cff4bd7c621301d443a41dee5c..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/generic/treectrl.cpp diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp index c47906f3e6..bd47f172a7 100644 --- a/src/generic/treectrl.cpp +++ b/src/generic/treectrl.cpp @@ -47,6 +47,12 @@ class WXDLLEXPORT wxGenericTreeItem; WX_DEFINE_ARRAY(wxGenericTreeItem *, wxArrayGenericTreeItems); WX_DEFINE_OBJARRAY(wxArrayTreeItemIds); +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +static const int NO_IMAGE = -1; + // ----------------------------------------------------------------------------- // private classes // ----------------------------------------------------------------------------- @@ -69,13 +75,16 @@ public: wxArrayGenericTreeItems& GetChildren() { return m_children; } const wxString& GetText() const { return m_text; } - int GetImage() const { return m_image; } - int GetSelectedImage() const { return m_selImage; } + int GetImage(wxTreeItemIcon which = wxTreeItemIcon_Normal) const + { return m_images[which]; } wxTreeItemData *GetData() const { return m_data; } + // returns the current image for the item (depending on its + // selected/expanded/whatever state) + int GetCurrentImage() const; + void SetText( const wxString &text ); - void SetImage(int image) { m_image = image; } - void SetSelectedImage(int image) { m_selImage = image; } + void SetImage(int image, wxTreeItemIcon which) { m_images[which] = image; } void SetData(wxTreeItemData *data) { m_data = data; } void SetHasPlus(bool has = TRUE) { m_hasPlus = has; } @@ -125,7 +134,7 @@ public: // status inquiries bool HasChildren() const { return !m_children.IsEmpty(); } - bool HasHilight() const { return m_hasHilight; } + bool IsSelected() const { return m_hasHilight; } bool IsExpanded() const { return !m_isCollapsed; } bool HasPlus() const { return m_hasPlus || HasChildren(); } bool IsBold() const { return m_isBold; } @@ -133,8 +142,9 @@ public: private: wxString m_text; - int m_image, - m_selImage; + // tree ctrl images for the normal, selected, expanded and expanded+selected + // states + int m_images[wxTreeItemIcon_Max]; wxTreeItemData *m_data; @@ -186,7 +196,13 @@ END_EVENT_TABLE() wxTreeTextCtrl::wxTreeTextCtrl( wxWindow *parent, const wxWindowID id, bool *accept, wxString *res, wxTreeCtrl *owner, const wxString &value, const wxPoint &pos, const wxSize &size, +#if wxUSE_VALIDATORS +# if defined(__VISAGECPP__) + int style, const wxValidator* validator, const wxString &name ) : +# else int style, const wxValidator& validator, const wxString &name ) : +# endif +#endif wxTextCtrl( parent, id, value, pos, size, style, validator, name ) { m_res = res; @@ -251,8 +267,11 @@ wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent, wxTreeItemData *data) : m_text(text) { - m_image = image; - m_selImage = selImage; + m_images[wxTreeItemIcon_Normal] = image; + m_images[wxTreeItemIcon_Selected] = selImage; + m_images[wxTreeItemIcon_Expanded] = NO_IMAGE; + m_images[wxTreeItemIcon_SelectedExpanded] = NO_IMAGE; + m_data = data; m_x = m_y = 0; m_xCross = m_yCross = 0; @@ -278,7 +297,7 @@ wxGenericTreeItem::~wxGenericTreeItem() delete m_data; wxASSERT_MSG( m_children.IsEmpty(), - _T("please call DeleteChildren() before deleting the item") ); + wxT("please call DeleteChildren() before deleting the item") ); } void wxGenericTreeItem::DeleteChildren(wxTreeCtrl *tree) @@ -307,8 +326,11 @@ void wxGenericTreeItem::SetText( const wxString &text ) void wxGenericTreeItem::Reset() { m_text.Empty(); - m_image = - m_selImage = -1; + for ( int i = 0; i < wxTreeItemIcon_Max; i++ ) + { + m_images[i] = NO_IMAGE; + } + m_data = NULL; m_x = m_y = m_height = m_width = 0; @@ -367,11 +389,12 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point, { if ((point.y > m_y) && (point.y < m_y + theTree->GetLineHeight(this))) { - if (point.yGetLineHeight(this)/2) flags|=wxTREE_HITTEST_ONITEMUPPERPART; - else flags|=wxTREE_HITTEST_ONITEMLOWERPART; + if (point.yGetLineHeight(this)/2) + flags |= wxTREE_HITTEST_ONITEMUPPERPART; + else + flags |= wxTREE_HITTEST_ONITEMLOWERPART; - // FIXME why +5? - // Because that is the size of the plus sign, RR + // 5 is the size of the plus sign if ((point.x > m_xCross-5) && (point.x < m_xCross+5) && (point.y > m_yCross-5) && (point.y < m_yCross+5) && (IsExpanded() || HasPlus())) @@ -386,19 +409,21 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point, int image_h; // assuming every image (normal and selected ) has the same size ! - if ((m_image!=-1) && theTree->m_imageListNormal) - theTree->m_imageListNormal->GetSize(m_image, image_w, image_h); + if ( (GetImage() != NO_IMAGE) && theTree->m_imageListNormal ) + theTree->m_imageListNormal->GetSize(GetImage(), image_w, image_h); if ((image_w != -1) && (point.x <= m_x + image_w + 1)) - flags|=wxTREE_HITTEST_ONITEMICON; + flags |= wxTREE_HITTEST_ONITEMICON; else - flags|=wxTREE_HITTEST_ONITEMLABEL; + flags |= wxTREE_HITTEST_ONITEMLABEL; return this; } - if (point.x < m_x) flags|=wxTREE_HITTEST_ONITEMIDENT; - if (point.x > m_x+m_width) flags|=wxTREE_HITTEST_ONITEMRIGHT; + if (point.x < m_x) + flags |= wxTREE_HITTEST_ONITEMIDENT; + if (point.x > m_x+m_width) + flags |= wxTREE_HITTEST_ONITEMRIGHT; return this; } @@ -420,6 +445,39 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point, return NULL; } +int wxGenericTreeItem::GetCurrentImage() const +{ + int image = NO_IMAGE; + if ( IsExpanded() ) + { + if ( IsSelected() ) + { + image = GetImage(wxTreeItemIcon_SelectedExpanded); + } + + if ( image == NO_IMAGE ) + { + // we usually fall back to the normal item, but try just the + // expanded one (and not selected) first in this case + image = GetImage(wxTreeItemIcon_Expanded); + } + } + else // not expanded + { + if ( IsSelected() ) + image = GetImage(wxTreeItemIcon_Selected); + } + + // may be it doesn't have the specific image we want, try the default one + // instead + if ( image == NO_IMAGE ) + { + image = GetImage(); + } + + return image; +} + // ----------------------------------------------------------------------------- // wxTreeCtrl implementation // ----------------------------------------------------------------------------- @@ -465,12 +523,25 @@ void wxTreeCtrl::Init() m_dragCount = 0; m_renameTimer = new wxTreeRenameTimer( this ); + + m_normalFont = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ); + m_boldFont = wxFont( m_normalFont.GetPointSize(), + m_normalFont.GetFamily(), + m_normalFont.GetStyle(), + wxBOLD, + m_normalFont.GetUnderlined()); } bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, +#if wxUSE_VALIDATORS +# if defined(__VISAGECPP__) + const wxValidator *validator, +# else const wxValidator &validator, +# endif +#endif const wxString& name ) { Init(); @@ -522,7 +593,7 @@ void wxTreeCtrl::SetSpacing(unsigned int spacing) size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively) { - wxCHECK_MSG( item.IsOk(), 0u, _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), 0u, wxT("invalid tree item") ); return item.m_pItem->GetChildrenCount(recursively); } @@ -533,35 +604,29 @@ size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively) wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), _T(""), _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), wxT(""), wxT("invalid tree item") ); return item.m_pItem->GetText(); } -int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const +int wxTreeCtrl::GetItemImage(const wxTreeItemId& item, + wxTreeItemIcon which) const { - wxCHECK_MSG( item.IsOk(), -1, _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), -1, wxT("invalid tree item") ); - return item.m_pItem->GetImage(); -} - -int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const -{ - wxCHECK_MSG( item.IsOk(), -1, _T("invalid tree item") ); - - return item.m_pItem->GetSelectedImage(); + return item.m_pItem->GetImage(which); } wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), NULL, _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), NULL, wxT("invalid tree item") ); return item.m_pItem->GetData(); } void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text) { - wxCHECK_RET( item.IsOk(), _T("invalid tree item") ); + wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); wxClientDC dc(this); wxGenericTreeItem *pItem = item.m_pItem; @@ -570,38 +635,30 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text) RefreshLine(pItem); } -void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image) +void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, + int image, + wxTreeItemIcon which) { - wxCHECK_RET( item.IsOk(), _T("invalid tree item") ); - - wxClientDC dc(this); - wxGenericTreeItem *pItem = item.m_pItem; - pItem->SetImage(image); - CalculateSize(pItem, dc); - RefreshLine(pItem); -} + wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); -void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image) -{ - wxCHECK_RET( item.IsOk(), _T("invalid tree item") ); + wxGenericTreeItem *pItem = item.m_pItem; + pItem->SetImage(image, which); - wxClientDC dc(this); - wxGenericTreeItem *pItem = item.m_pItem; - pItem->SetSelectedImage(image); - CalculateSize(pItem, dc); - RefreshLine(pItem); + wxClientDC dc(this); + CalculateSize(pItem, dc); + RefreshLine(pItem); } void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data) { - wxCHECK_RET( item.IsOk(), _T("invalid tree item") ); + wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); item.m_pItem->SetData(data); } void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has) { - wxCHECK_RET( item.IsOk(), _T("invalid tree item") ); + wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); wxGenericTreeItem *pItem = item.m_pItem; pItem->SetHasPlus(has); @@ -610,7 +667,7 @@ void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has) void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold) { - wxCHECK_RET( item.IsOk(), _T("invalid tree item") ); + wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); // avoid redrawing the tree if no real change wxGenericTreeItem *pItem = item.m_pItem; @@ -627,35 +684,35 @@ void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold) bool wxTreeCtrl::IsVisible(const wxTreeItemId& WXUNUSED(item)) const { - wxFAIL_MSG(_T("not implemented")); + wxFAIL_MSG(wxT("not implemented")); return TRUE; } bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") ); return !item.m_pItem->GetChildren().IsEmpty(); } bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") ); return item.m_pItem->IsExpanded(); } bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") ); - return item.m_pItem->HasHilight(); + return item.m_pItem->IsSelected(); } bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") ); return item.m_pItem->IsBold(); } @@ -666,14 +723,14 @@ bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); return item.m_pItem->GetParent(); } wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) const { - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); cookie = 0; return GetNextChild(item, cookie); @@ -681,7 +738,7 @@ wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) c wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) const { - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); wxArrayGenericTreeItems& children = item.m_pItem->GetChildren(); if ( (size_t)cookie < children.Count() ) @@ -697,7 +754,7 @@ wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) co wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); wxArrayGenericTreeItems& children = item.m_pItem->GetChildren(); return (children.IsEmpty() ? wxTreeItemId() : wxTreeItemId(children.Last())); @@ -705,7 +762,7 @@ wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); wxGenericTreeItem *i = item.m_pItem; wxGenericTreeItem *parent = i->GetParent(); @@ -725,7 +782,7 @@ wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); wxGenericTreeItem *i = item.m_pItem; wxGenericTreeItem *parent = i->GetParent(); @@ -745,25 +802,25 @@ wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const { - wxFAIL_MSG(_T("not implemented")); + wxFAIL_MSG(wxT("not implemented")); return wxTreeItemId(); } wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); - wxFAIL_MSG(_T("not implemented")); + wxFAIL_MSG(wxT("not implemented")); return wxTreeItemId(); } wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") ); - wxFAIL_MSG(_T("not implemented")); + wxFAIL_MSG(wxT("not implemented")); return wxTreeItemId(); } @@ -778,49 +835,53 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parentId, int image, int selImage, wxTreeItemData *data) { - wxGenericTreeItem *parent = parentId.m_pItem; - if ( !parent ) - { - // should we give a warning here? - return AddRoot(text, image, selImage, data); - } + wxGenericTreeItem *parent = parentId.m_pItem; + if ( !parent ) + { + // should we give a warning here? + return AddRoot(text, image, selImage, data); + } - wxClientDC dc(this); - wxGenericTreeItem *item = new wxGenericTreeItem(parent, - text, dc, - image, selImage, - data); + wxClientDC dc(this); + wxGenericTreeItem *item = + new wxGenericTreeItem( parent, text, dc, image, selImage, data ); - if ( data != NULL ) - { - data->m_pItem = item; - } + if ( data != NULL ) + { + data->m_pItem = item; + } - parent->Insert( item, previous ); + parent->Insert( item, previous ); - m_dirty = TRUE; + m_dirty = TRUE; - return item; + return item; } wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text, int image, int selImage, wxTreeItemData *data) { - wxCHECK_MSG( !m_anchor, wxTreeItemId(), _T("tree can have only one root") ); + wxCHECK_MSG( !m_anchor, wxTreeItemId(), wxT("tree can have only one root") ); - wxClientDC dc(this); - m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text, dc, + wxClientDC dc(this); + m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text, dc, image, selImage, data); - if ( data != NULL ) - { - data->m_pItem = m_anchor; - } + if ( data != NULL ) + { + data->m_pItem = m_anchor; + } + + if (!HasFlag(wxTR_MULTIPLE)) + { + m_current = m_key_current = m_anchor; + m_current->SetHilight( TRUE ); + } - Refresh(); - AdjustMyScrollbars(); + Refresh(); + AdjustMyScrollbars(); - return m_anchor; + return m_anchor; } wxTreeItemId wxTreeCtrl::PrependItem(const wxTreeItemId& parent, @@ -846,7 +907,7 @@ wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parentId, int index = parent->GetChildren().Index(idPrevious.m_pItem); wxASSERT_MSG( index != wxNOT_FOUND, - _T("previous item in wxTreeCtrl::InsertItem() is not a sibling") ); + wxT("previous item in wxTreeCtrl::InsertItem() is not a sibling") ); return DoInsertItem(parentId, (size_t)++index, text, image, selImage, data); } @@ -925,7 +986,9 @@ void wxTreeCtrl::Expand(const wxTreeItemId& itemId) wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, GetId() ); event.m_item = item; event.SetEventObject( this ); - if ( ProcessEvent( event ) && event.m_code ) + +// if ( ProcessEvent( event ) && event.m_code ) TODO: Was this a typo ? + if ( ProcessEvent( event ) && !event.IsAllowed() ) { // cancelled by program return; @@ -950,7 +1013,7 @@ void wxTreeCtrl::Collapse(const wxTreeItemId& itemId) wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId() ); event.m_item = item; event.SetEventObject( this ); - if ( ProcessEvent( event ) && event.m_code ) + if ( ProcessEvent( event ) && !event.IsAllowed() ) { // cancelled by program return; @@ -1066,19 +1129,20 @@ void wxTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *it // choice first' and 'last' between item1 and item2 if (item1->GetY()GetY()) - { + { first=item1; last=item2; - } + } else - { + { first=item2; last=item1; - } + } - bool select=m_current->HasHilight(); + bool select = m_current->IsSelected(); - if (TagAllChildrenUntilLast(first,last,select)) return; + if ( TagAllChildrenUntilLast(first,last,select) ) + return; TagNextChildren(first,last,select); } @@ -1087,28 +1151,29 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId, bool unselect_others, bool extended_select) { - wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") ); + wxCHECK_RET( itemId.IsOk(), wxT("invalid tree item") ); bool is_single=!(GetWindowStyleFlag() & wxTR_MULTIPLE); wxGenericTreeItem *item = itemId.m_pItem; //wxCHECK_RET( ( (!unselect_others) && is_single), - // _T("this is a single selection tree") ); + // wxT("this is a single selection tree") ); // to keep going anyhow !!! if (is_single) - { - if (item->HasHilight()) return; // nothing to do - unselect_others=TRUE; - extended_select=FALSE; - } - else // check if selection will really change - if (unselect_others && item->HasHilight()) - { - // selection change if there is more than one item currently selected - wxArrayTreeItemIds selected_items; - if (GetSelections(selected_items)==1) return; - } + { + if (item->IsSelected()) + return; // nothing to do + unselect_others = TRUE; + extended_select = FALSE; + } + else if ( unselect_others && item->IsSelected() ) + { + // selection change if there is more than one item currently selected + wxArrayTreeItemIds selected_items; + if ( GetSelections(selected_items) == 1 ) + return; + } wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGING, GetId() ); event.m_item = item; @@ -1139,7 +1204,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId, // Check if we need to toggle hilight (ctrl mode) if (!unselect_others) - select=!item->HasHilight(); + select=!item->IsSelected(); m_current = m_key_current = item; m_current->SetHilight(select); @@ -1153,7 +1218,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId, void wxTreeCtrl::FillArray(wxGenericTreeItem *item, wxArrayTreeItemIds &array) const { - if ( item->HasHilight() ) + if ( item->IsSelected() ) array.Add(wxTreeItemId(item)); if ( item->HasChildren() ) @@ -1183,7 +1248,7 @@ void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item) wxGenericTreeItem *parent = gitem->GetParent(); while ( parent ) { - Expand(parent); + Expand(parent); parent = parent->GetParent(); } @@ -1205,7 +1270,7 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId &item) // now scroll to the item int item_y = gitem->GetY(); - + int start_x = 0; int start_y = 0; ViewStart( &start_x, &start_y ); @@ -1243,10 +1308,10 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId &item) // FIXME: tree sorting functions are not reentrant and not MT-safe! static wxTreeCtrl *s_treeBeingSorted = NULL; -static int tree_ctrl_compare_func(wxGenericTreeItem **item1, +static int LINKAGEMODE tree_ctrl_compare_func(wxGenericTreeItem **item1, wxGenericTreeItem **item2) { - wxCHECK_MSG( s_treeBeingSorted, 0, _T("bug in wxTreeCtrl::SortChildren()") ); + wxCHECK_MSG( s_treeBeingSorted, 0, wxT("bug in wxTreeCtrl::SortChildren()") ); return s_treeBeingSorted->OnCompareItems(*item1, *item2); } @@ -1259,12 +1324,12 @@ int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1, void wxTreeCtrl::SortChildren(const wxTreeItemId& itemId) { - wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") ); + wxCHECK_RET( itemId.IsOk(), wxT("invalid tree item") ); wxGenericTreeItem *item = itemId.m_pItem; wxCHECK_RET( !s_treeBeingSorted, - _T("wxTreeCtrl::SortChildren is not reentrant") ); + wxT("wxTreeCtrl::SortChildren is not reentrant") ); wxArrayGenericTreeItems& children = item->GetChildren(); if ( children.Count() > 1 ) @@ -1296,7 +1361,7 @@ void wxTreeCtrl::SetImageList(wxImageList *imageList) // May be toggle off. Then wxTreeCtrl will spread when // necessary (which might look ugly). #if 1 - wxPaintDC dc(this); + wxClientDC dc(this); m_lineHeight = (int)(dc.GetCharHeight() + 4); int width = 0, @@ -1352,28 +1417,8 @@ int wxTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) { - // render bold items in bold - wxFont fontOld; - wxFont fontNew; - if (item->IsBold()) - { - fontOld = dc.GetFont(); - if (fontOld.Ok()) - { - // VZ: is there any better way to make a bold variant of old font? - fontNew = wxFont( fontOld.GetPointSize(), - fontOld.GetFamily(), - fontOld.GetStyle(), - wxBOLD, - fontOld.GetUnderlined()); - dc.SetFont(fontNew); - } - else - { - wxFAIL_MSG(_T("wxDC::GetFont() failed!")); - } - } + dc.SetFont(m_boldFont); long text_w = 0; long text_h = 0; @@ -1381,14 +1426,10 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) int image_h = 0; int image_w = 0; - if ((item->IsExpanded()) && (item->GetSelectedImage() != -1)) - { - m_imageListNormal->GetSize( item->GetSelectedImage(), image_w, image_h ); - image_w += 4; - } - else if (item->GetImage() != -1) + int image = item->GetCurrentImage(); + if ( image != NO_IMAGE ) { - m_imageListNormal->GetSize( item->GetImage(), image_w, image_h ); + m_imageListNormal->GetSize( image, image_w, image_h ); image_w += 4; } @@ -1396,19 +1437,10 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) dc.DrawRectangle( item->GetX()-2, item->GetY(), item->GetWidth()+2, total_h ); - if ((item->IsExpanded()) && (item->GetSelectedImage() != -1)) + if ( image != NO_IMAGE ) { dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h ); - m_imageListNormal->Draw( item->GetSelectedImage(), dc, - item->GetX(), - item->GetY() +((total_h > image_h)?((total_h-image_h)/2):0), - wxIMAGELIST_DRAW_TRANSPARENT ); - dc.DestroyClippingRegion(); - } - else if (item->GetImage() != -1) - { - dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h ); - m_imageListNormal->Draw( item->GetImage(), dc, + m_imageListNormal->Draw( image, dc, item->GetX(), item->GetY() +((total_h > image_h)?((total_h-image_h)/2):0), wxIMAGELIST_DRAW_TRANSPARENT ); @@ -1419,11 +1451,8 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY() + ((total_h > text_h) ? (total_h - text_h)/2 : 0)); - // restore normal font for bold items - if (fontOld.Ok()) - { - dc.SetFont( fontOld); - } + // restore normal font + dc.SetFont( m_normalFont ); } // Now y stands for the top of the item, whereas it used to stand for middle ! @@ -1467,7 +1496,7 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & dc.SetPen( m_dottedPen ); } - if (item->HasHilight()) + if (item->IsSelected()) { dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); @@ -1527,7 +1556,7 @@ void wxTreeCtrl::DrawBorder(wxTreeItemId &item) wxGenericTreeItem *i=item.m_pItem; - wxPaintDC dc(this); + wxClientDC dc(this); PrepareDC( dc ); dc.SetLogicalFunction(wxINVERT); @@ -1546,7 +1575,7 @@ void wxTreeCtrl::DrawLine(wxTreeItemId &item, bool below) wxGenericTreeItem *i=item.m_pItem; - wxPaintDC dc(this); + wxClientDC dc(this); PrepareDC( dc ); dc.SetLogicalFunction(wxINVERT); @@ -1571,9 +1600,10 @@ void wxTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxPaintDC dc(this); PrepareDC( dc ); - dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ) ); - + dc.SetFont( m_normalFont ); dc.SetPen( m_dottedPen ); + + // this is now done dynamically //if(GetImageList() == NULL) // m_lineHeight = (int)(dc.GetCharHeight() + 4); @@ -1818,7 +1848,7 @@ void wxTreeCtrl::Edit( const wxTreeItemId& item ) GetEventHandler()->ProcessEvent( te ); if (!te.IsAllowed()) return; - + // We have to call this here because the label in // question might just have been added and no screen // update taken place. @@ -1832,14 +1862,11 @@ void wxTreeCtrl::Edit( const wxTreeItemId& item ) int image_h = 0; int image_w = 0; - if ((m_currentEdit->IsExpanded()) && (m_currentEdit->GetSelectedImage() != -1)) - { - m_imageListNormal->GetSize( m_currentEdit->GetSelectedImage(), image_w, image_h ); - image_w += 4; - } - else if (m_currentEdit->GetImage() != -1) + + int image = m_currentEdit->GetCurrentImage(); + if ( image != NO_IMAGE ) { - m_imageListNormal->GetSize( m_currentEdit->GetImage(), image_w, image_h ); + m_imageListNormal->GetSize( image, image_w, image_h ); image_w += 4; } x += image_w; @@ -1875,9 +1902,7 @@ void wxTreeCtrl::OnRenameAccept() void wxTreeCtrl::OnMouse( wxMouseEvent &event ) { - if (!event.LeftIsDown()) m_dragCount = 0; - - if ( !(event.LeftUp() || event.LeftDClick() || event.Dragging()) ) return; + if ( !(event.LeftUp() || event.RightDown() || event.LeftDClick() || event.Dragging()) ) return; if ( !m_anchor ) return; @@ -1890,25 +1915,39 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event ) wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), this, flags); bool onButton = flags & wxTREE_HITTEST_ONITEMBUTTON; - if (item == NULL) return; /* we hit the blank area */ - if (event.Dragging()) { - if (m_dragCount == 2) /* small drag latency (3?) */ - { - m_dragCount = 0; + if (m_dragCount == 0) + m_dragStart = wxPoint(x,y); - wxTreeEvent nevent(wxEVT_COMMAND_TREE_BEGIN_DRAG, GetId()); - nevent.m_item = m_current; - nevent.SetEventObject(this); - GetEventHandler()->ProcessEvent(nevent); - } - else - { - m_dragCount++; - } + m_dragCount++; + + if (m_dragCount != 3) return; + + int command = wxEVT_COMMAND_TREE_BEGIN_DRAG; + if (event.RightIsDown()) command = wxEVT_COMMAND_TREE_BEGIN_RDRAG; + + wxTreeEvent nevent( command, GetId() ); + nevent.m_item = m_current; + nevent.SetEventObject(this); + GetEventHandler()->ProcessEvent(nevent); return; } + else + { + m_dragCount = 0; + } + + if (item == NULL) return; /* we hit the blank area */ + + if (event.RightDown()) { + wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK,GetId()); + nevent.m_item=item; + nevent.m_code=0; + nevent.SetEventObject(this); + GetEventHandler()->ProcessEvent(nevent); + return; + } if (event.LeftUp() && (item == m_current) && (flags & wxTREE_HITTEST_ONITEMLABEL) && @@ -1961,44 +2000,21 @@ void wxTreeCtrl::CalculateSize( wxGenericTreeItem *item, wxDC &dc ) long text_w = 0; long text_h = 0; - wxFont fontOld; - wxFont fontNew; if (item->IsBold()) - { - fontOld = dc.GetFont(); - if (fontOld.Ok()) - { - // VZ: is there any better way to make a bold variant of old font? - fontNew = wxFont( fontOld.GetPointSize(), - fontOld.GetFamily(), - fontOld.GetStyle(), - wxBOLD, - fontOld.GetUnderlined()); - dc.SetFont(fontNew); - } - else - { - wxFAIL_MSG(_T("wxDC::GetFont() failed!")); - } - } + dc.SetFont(m_boldFont); dc.GetTextExtent( item->GetText(), &text_w, &text_h ); text_h+=2; - // restore normal font for bold items - if (fontOld.Ok()) - dc.SetFont( fontOld); + // restore normal font + dc.SetFont( m_normalFont ); int image_h = 0; int image_w = 0; - if ((item->IsExpanded()) && (item->GetSelectedImage() != -1)) + int image = item->GetCurrentImage(); + if ( image != NO_IMAGE ) { - m_imageListNormal->GetSize( item->GetSelectedImage(), image_w, image_h ); - image_w += 4; - } - else if (item->GetImage() != -1) - { - m_imageListNormal->GetSize( item->GetImage(), image_w, image_h ); + m_imageListNormal->GetSize( image, image_w, image_h ); image_w += 4; } @@ -2046,13 +2062,13 @@ void wxTreeCtrl::CalculatePositions() wxClientDC dc(this); PrepareDC( dc ); - dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ) ); + dc.SetFont( m_normalFont ); dc.SetPen( m_dottedPen ); //if(GetImageList() == NULL) // m_lineHeight = (int)(dc.GetCharHeight() + 4); - int y = 2; + int y = 2; CalculateLevel( m_anchor, dc, 0, y ); // start recursion }