X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c67202dee33f95fa48b176dec8994340c70eaa2..3dfb93fd8225558306cb41fd6f4b1a2516859565:/src/generic/treectrl.cpp?ds=sidebyside diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp index 90284a5ee3..e81bbabc66 100644 --- a/src/generic/treectrl.cpp +++ b/src/generic/treectrl.cpp @@ -197,7 +197,7 @@ wxGenericTreeItem::~wxGenericTreeItem() delete m_data; wxASSERT_MSG( m_children.IsEmpty(), - "please call DeleteChildren() before deleting the item" ); + _T("please call DeleteChildren() before deleting the item") ); } void wxGenericTreeItem::DeleteChildren(wxTreeCtrl *tree) @@ -287,6 +287,7 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point, if ((point.y > m_y) && (point.y < m_y + m_height)) { // FIXME why +5? + // Because that is the size of the plus sign, RR if ((point.x > m_xCross-5) && (point.x < m_xCross+5) && (point.y > m_yCross-5) && (point.y < m_yCross+5) && (IsExpanded() || HasPlus())) @@ -294,9 +295,11 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point, onButton = TRUE; return this; } - + + /* TODO: we should do a query here like + m_imageListNormal->GetSize( item->GetImage(), image_w, image_h ); */ int w = m_width; - if (m_image != -1) w += 20; + if (m_image != -1) w += 24; if ((point.x > m_x) && (point.x < m_x+w)) { @@ -350,6 +353,7 @@ void wxTreeCtrl::Init() m_yScroll = 0; m_lineHeight = 10; m_indent = 15; + m_spacing = 18; m_hilightBrush = new wxBrush ( @@ -359,20 +363,20 @@ void wxTreeCtrl::Init() m_imageListNormal = m_imageListState = (wxImageList *) NULL; - + m_dragCount = 0; } bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - long style, - const wxValidator &validator, - const wxString& name ) + long style, + const wxValidator &validator, + const wxString& name ) { Init(); wxScrolledWindow::Create( parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name ); - + SetValidator( validator ); SetBackgroundColour( *wxWHITE ); @@ -400,12 +404,20 @@ size_t wxTreeCtrl::GetCount() const void wxTreeCtrl::SetIndent(unsigned int indent) { m_indent = indent; + m_dirty = TRUE; + Refresh(); +} + +void wxTreeCtrl::SetSpacing(unsigned int spacing) +{ + m_spacing = spacing; + m_dirty = TRUE; Refresh(); } size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively) { - wxCHECK_MSG( item.IsOk(), 0u, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), 0u, _T("invalid tree item") ); return item.m_pItem->GetChildrenCount(recursively); } @@ -416,71 +428,79 @@ size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively) wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), "", "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), _T(""), _T("invalid tree item") ); return item.m_pItem->GetText(); } int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), -1, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), -1, _T("invalid tree item") ); return item.m_pItem->GetImage(); } int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), -1, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), -1, _T("invalid tree item") ); return item.m_pItem->GetSelectedImage(); } wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), NULL, _T("invalid tree item") ); return item.m_pItem->GetData(); } void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text) { - wxCHECK_RET( item.IsOk(), "invalid tree item" ); + wxCHECK_RET( item.IsOk(), _T("invalid tree item") ); wxClientDC dc(this); - item.m_pItem->SetText(text, dc); + wxGenericTreeItem *pItem = item.m_pItem; + pItem->SetText(text, dc); + RefreshLine(pItem); } void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image) { - wxCHECK_RET( item.IsOk(), "invalid tree item" ); + wxCHECK_RET( item.IsOk(), _T("invalid tree item") ); - item.m_pItem->SetImage(image); + wxGenericTreeItem *pItem = item.m_pItem; + pItem->SetImage(image); + RefreshLine(pItem); } void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image) { - wxCHECK_RET( item.IsOk(), "invalid tree item" ); + wxCHECK_RET( item.IsOk(), _T("invalid tree item") ); - item.m_pItem->SetSelectedImage(image); + wxGenericTreeItem *pItem = item.m_pItem; + pItem->SetSelectedImage(image); + RefreshLine(pItem); } void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data) { - wxCHECK_RET( item.IsOk(), "invalid tree item" ); + wxCHECK_RET( item.IsOk(), _T("invalid tree item") ); item.m_pItem->SetData(data); } void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has) { - wxCHECK_RET( item.IsOk(), "invalid tree item" ); + wxCHECK_RET( item.IsOk(), _T("invalid tree item") ); - item.m_pItem->SetHasPlus(has); + wxGenericTreeItem *pItem = item.m_pItem; + pItem->SetHasPlus(has); + RefreshLine(pItem); } void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold) { - wxCHECK_RET( item.IsOk(), "invalid tree item" ); + wxCHECK_RET( item.IsOk(), _T("invalid tree item") ); // avoid redrawing the tree if no real change wxGenericTreeItem *pItem = item.m_pItem; @@ -497,35 +517,35 @@ void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold) bool wxTreeCtrl::IsVisible(const wxTreeItemId& WXUNUSED(item)) const { - wxFAIL_MSG("not implemented"); + wxFAIL_MSG(_T("not implemented")); return TRUE; } bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), FALSE, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") ); return !item.m_pItem->GetChildren().IsEmpty(); } bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), FALSE, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") ); return item.m_pItem->IsExpanded(); } bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), FALSE, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") ); return item.m_pItem->HasHilight(); } bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), FALSE, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") ); return item.m_pItem->IsBold(); } @@ -536,14 +556,14 @@ bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); return item.m_pItem->GetParent(); } wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) const { - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); cookie = 0; return GetNextChild(item, cookie); @@ -551,12 +571,12 @@ wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) c wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) const { - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); wxArrayTreeItems& children = item.m_pItem->GetChildren(); if ( (size_t)cookie < children.Count() ) { - return item.m_pItem->GetChildren().Item(cookie++); + return children.Item(cookie++); } else { @@ -565,9 +585,17 @@ 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") ); + + wxArrayTreeItems& children = item.m_pItem->GetChildren(); + return (children.IsEmpty() ? wxTreeItemId() : wxTreeItemId(children.Last())); +} + wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); wxGenericTreeItem *i = item.m_pItem; wxGenericTreeItem *parent = i->GetParent(); @@ -587,7 +615,7 @@ wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); wxGenericTreeItem *i = item.m_pItem; wxGenericTreeItem *parent = i->GetParent(); @@ -607,25 +635,25 @@ wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const { - wxFAIL_MSG("not implemented"); + wxFAIL_MSG(_T("not implemented")); return wxTreeItemId(); } wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); - wxFAIL_MSG("not implemented"); + wxFAIL_MSG(_T("not implemented")); return wxTreeItemId(); } wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); - wxFAIL_MSG("not implemented"); + wxFAIL_MSG(_T("not implemented")); return wxTreeItemId(); } @@ -669,7 +697,7 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text, int image, int selImage, wxTreeItemData *data) { - wxCHECK_MSG( !m_anchor, wxTreeItemId(), "tree can have only one root" ); + wxCHECK_MSG( !m_anchor, wxTreeItemId(), _T("tree can have only one root") ); wxClientDC dc(this); m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text, dc, @@ -708,7 +736,7 @@ wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parentId, int index = parent->GetChildren().Index(idPrevious.m_pItem); wxASSERT_MSG( index != wxNOT_FOUND, - "previous item in wxTreeCtrl::InsertItem() is not a sibling" ); + _T("previous item in wxTreeCtrl::InsertItem() is not a sibling") ); return DoInsertItem(parentId, (size_t)index, text, image, selImage, data); } @@ -778,9 +806,9 @@ void wxTreeCtrl::Expand(const wxTreeItemId& itemId) { wxGenericTreeItem *item = itemId.m_pItem; - if ( !item->HasPlus() ) + if ( !item->HasPlus() ) return; - + if ( item->IsExpanded() ) return; @@ -892,13 +920,23 @@ void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item) { wxGenericTreeItem *gitem = item.m_pItem; + // first expand all parent branches + wxGenericTreeItem *parent = gitem->GetParent(); + while ( parent && !parent->IsExpanded() ) + { + Expand(parent); + + parent = parent->GetParent(); + } + + // now scroll to the item int item_y = gitem->GetY(); int start_x = 0; int start_y = 0; ViewStart( &start_x, &start_y ); start_y *= 10; - + int client_h = 0; int client_w = 0; GetClientSize( &client_w, &client_h ); @@ -910,11 +948,9 @@ void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item) m_anchor->GetSize( x, y ); y += 2*m_lineHeight; int x_pos = GetScrollPos( wxHORIZONTAL ); - SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-client_h/2)/10 ); - return; + SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-client_h/2)/10 ); } - - if (item_y > start_y+client_h-16) + else if (item_y > start_y+client_h-20) { int x = 0; int y = 0; @@ -922,33 +958,32 @@ void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item) y += 2*m_lineHeight; int x_pos = GetScrollPos( wxHORIZONTAL ); SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-client_h/2)/10 ); - return; } } void wxTreeCtrl::ScrollTo(const wxTreeItemId& WXUNUSED(item)) { - wxFAIL_MSG("not implemented"); + wxFAIL_MSG(_T("not implemented")); } wxTextCtrl *wxTreeCtrl::EditLabel( const wxTreeItemId& WXUNUSED(item), wxClassInfo* WXUNUSED(textCtrlClass) ) { - wxFAIL_MSG("not implemented"); + wxFAIL_MSG(_T("not implemented")); return (wxTextCtrl*)NULL; } wxTextCtrl *wxTreeCtrl::GetEditControl() const { - wxFAIL_MSG("not implemented"); + wxFAIL_MSG(_T("not implemented")); return (wxTextCtrl*)NULL; } void wxTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), bool WXUNUSED(discardChanges)) { - wxFAIL_MSG("not implemented"); + wxFAIL_MSG(_T("not implemented")); } // FIXME: tree sorting functions are not reentrant and not MT-safe! @@ -957,7 +992,7 @@ static wxTreeCtrl *s_treeBeingSorted = NULL; static int tree_ctrl_compare_func(wxGenericTreeItem **item1, wxGenericTreeItem **item2) { - wxCHECK_MSG( s_treeBeingSorted, 0, "bug in wxTreeCtrl::SortChildren()" ); + wxCHECK_MSG( s_treeBeingSorted, 0, _T("bug in wxTreeCtrl::SortChildren()") ); return s_treeBeingSorted->OnCompareItems(*item1, *item2); } @@ -965,17 +1000,17 @@ static int tree_ctrl_compare_func(wxGenericTreeItem **item1, int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1, const wxTreeItemId& item2) { - return strcmp(GetItemText(item1), GetItemText(item2)); + return wxStrcmp(GetItemText(item1), GetItemText(item2)); } void wxTreeCtrl::SortChildren(const wxTreeItemId& itemId) { - wxCHECK_RET( itemId.IsOk(), "invalid tree item" ); + wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") ); wxGenericTreeItem *item = itemId.m_pItem; - + wxCHECK_RET( !s_treeBeingSorted, - "wxTreeCtrl::SortChildren is not reentrant" ); + _T("wxTreeCtrl::SortChildren is not reentrant") ); wxArrayTreeItems& children = item->GetChildren(); if ( children.Count() > 1 ) @@ -983,7 +1018,7 @@ void wxTreeCtrl::SortChildren(const wxTreeItemId& itemId) s_treeBeingSorted = this; children.Sort(tree_ctrl_compare_func); s_treeBeingSorted = NULL; - + m_dirty = TRUE; } //else: don't make the tree dirty as nothing changed @@ -1001,7 +1036,21 @@ wxImageList *wxTreeCtrl::GetStateImageList() const void wxTreeCtrl::SetImageList(wxImageList *imageList) { - m_imageListNormal = imageList; + m_imageListNormal = imageList; + // calculate a m_lineHeight value from the image sizes + wxPaintDC dc(this); + PrepareDC( dc ); + m_lineHeight = (int)(dc.GetCharHeight() + 4); + int + width = 0, + height = 0, + n = m_imageListNormal->GetImageCount(); + for(int i = 0; i < n ; i++) + { + m_imageListNormal->GetSize(i, width, height); + height += height/5; //20% extra spacing + if(height > m_lineHeight) m_lineHeight = height; + } } void wxTreeCtrl::SetStateImageList(wxImageList *imageList) @@ -1033,16 +1082,16 @@ void wxTreeCtrl::AdjustMyScrollbars() void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) { - /* render bold items in bold */ + // render bold items in bold wxFont fontOld; wxFont fontNew; - + if (item->IsBold()) { fontOld = dc.GetFont(); if (fontOld.Ok()) { - /* @@ is there any better way to make a bold variant of old font? */ + // VZ: is there any better way to make a bold variant of old font? fontNew = wxFont( fontOld.GetPointSize(), fontOld.GetFamily(), fontOld.GetStyle(), @@ -1052,7 +1101,7 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) } else { - wxFAIL_MSG("wxDC::GetFont() failed!"); + wxFAIL_MSG(_T("wxDC::GetFont() failed!")); } } @@ -1066,36 +1115,42 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) { 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 ); image_w += 4; } - dc.DrawRectangle( item->GetX()-2, item->GetY()-2, image_w+text_w+4, text_h+4 ); + int total_h = (image_h > text_h) ? image_h : text_h; + if(m_lineHeight > total_h) total_h = m_lineHeight; + + dc.DrawRectangle( item->GetX()-2, item->GetY(), image_w+text_w+4, total_h ); if ((item->IsExpanded()) && (item->GetSelectedImage() != -1)) { - dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, text_h ); + dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h ); m_imageListNormal->Draw( item->GetSelectedImage(), dc, - item->GetX(), item->GetY()-1, + 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, text_h ); + dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h ); m_imageListNormal->Draw( item->GetImage(), dc, - item->GetX(), item->GetY()-1, + item->GetX(), + item->GetY() +((total_h > image_h)?((total_h-image_h)/2):0), wxIMAGELIST_DRAW_TRANSPARENT ); dc.DestroyClippingRegion(); } dc.SetBackgroundMode(wxTRANSPARENT); - dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY() ); + 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 */ + // restore normal font for bold items if (fontOld.Ok()) { dc.SetFont( fontOld); @@ -1106,11 +1161,11 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & { int horizX = level*m_indent; - item->SetX( horizX+33 ); - item->SetY( y-m_lineHeight/3 ); + item->SetX( horizX+m_indent+m_spacing ); + item->SetY( y-m_lineHeight/2 ); item->SetHeight( m_lineHeight ); - item->SetCross( horizX+15, y ); + item->SetCross( horizX+m_indent, y ); int oldY = y; @@ -1120,25 +1175,26 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & if (IsExposed( exposed_x, exposed_y, 10000, m_lineHeight+4 )) // 10000 = very much { int startX = horizX; - int endX = horizX + 10; + int endX = horizX + (m_indent-5); +// if (!item->HasChildren()) endX += (m_indent+5); if (!item->HasChildren()) endX += 20; dc.DrawLine( startX, y, endX, y ); if (item->HasPlus()) { - dc.DrawLine( horizX+20, y, horizX+30, y ); + dc.DrawLine( horizX+(m_indent+5), y, horizX+(m_indent+15), y ); dc.SetPen( *wxGREY_PEN ); dc.SetBrush( *wxWHITE_BRUSH ); - dc.DrawRectangle( horizX+10, y-4, 11, 9 ); + dc.DrawRectangle( horizX+(m_indent-5), y-4, 11, 9 ); dc.SetPen( *wxBLACK_PEN ); - dc.DrawLine( horizX+13, y, horizX+18, y ); + dc.DrawLine( horizX+(m_indent-2), y, horizX+(m_indent+3), y ); if (!item->IsExpanded()) - { - dc.DrawLine( horizX+15, y-2, horizX+15, y+3 ); - } + { + dc.DrawLine( horizX+m_indent, y-2, horizX+m_indent, y+3 ); + } } if (item->HasHilight()) @@ -1182,10 +1238,11 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & PaintLevel( children[n], dc, level+1, y ); } - /* it may happen that the item is expanded but has no items (when you - * delete all its children for example) - don't draw the vertical line - * in this case */ - if (count > 0) dc.DrawLine( horizX+15, oldY+5, horizX+15, semiOldY ); + // it may happen that the item is expanded but has no items (when you + // delete all its children for example) - don't draw the vertical line + // in this case + if (count > 0) + dc.DrawLine( horizX+m_indent, oldY+5, horizX+m_indent, semiOldY ); } } @@ -1204,7 +1261,8 @@ void wxTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ) ); dc.SetPen( m_dottedPen ); - m_lineHeight = (int)(dc.GetCharHeight() + 4); + if(GetImageList() == NULL) + m_lineHeight = (int)(dc.GetCharHeight() + 4); int y = m_lineHeight / 2 + 2; PaintLevel( m_anchor, dc, 0, y ); @@ -1213,160 +1271,202 @@ void wxTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) ) void wxTreeCtrl::OnSetFocus( wxFocusEvent &WXUNUSED(event) ) { m_hasFocus = TRUE; - + if (m_current) RefreshLine( m_current ); } void wxTreeCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) ) { m_hasFocus = FALSE; - + if (m_current) RefreshLine( m_current ); } void wxTreeCtrl::OnChar( wxKeyEvent &event ) { - wxTreeEvent te( wxEVT_COMMAND_TREE_KEY_DOWN, GetId() ); - te.m_code = event.KeyCode(); - te.SetEventObject( this ); - GetEventHandler()->ProcessEvent( te ); + wxTreeEvent te( wxEVT_COMMAND_TREE_KEY_DOWN, GetId() ); + te.m_code = event.KeyCode(); + te.SetEventObject( this ); + GetEventHandler()->ProcessEvent( te ); - if (m_current == 0) - { - event.Skip(); - return; - } + if (m_current == 0) + { + event.Skip(); + return; + } - switch (event.KeyCode()) - { - case '+': - case WXK_ADD: - if (m_current->HasPlus() && !IsExpanded(m_current)) - { - Expand(m_current); - } - break; + switch (event.KeyCode()) + { + case '+': + case WXK_ADD: + if (m_current->HasPlus() && !IsExpanded(m_current)) + { + Expand(m_current); + } + break; - case '-': - case WXK_SUBTRACT: - if (IsExpanded(m_current)) - { - Collapse(m_current); - } - break; + case '-': + case WXK_SUBTRACT: + if (IsExpanded(m_current)) + { + Collapse(m_current); + } + break; - case '*': - case WXK_MULTIPLY: - Toggle(m_current); - break; + case '*': + case WXK_MULTIPLY: + Toggle(m_current); + break; - case ' ': - case WXK_RETURN: - { - wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() ); - event.m_item = m_current; - event.m_code = 0; - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); - } - break; + case ' ': + case WXK_RETURN: + { + wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() ); + event.m_item = m_current; + event.m_code = 0; + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent( event ); + } + break; - case WXK_UP: - { - wxTreeItemId prev = GetPrevSibling( m_current ); - if (!prev) - { - prev = GetParent( m_current ); - long cockie = 0; - wxTreeItemId current = m_current; - if (current == GetFirstChild( prev, cockie )) - { - // otherwise we return to where we came from - SelectItem( prev ); - EnsureVisible( prev ); - break; - } - } - if (prev) - { - while (IsExpanded(prev)) - { - int c = (int)GetChildrenCount( prev, FALSE ); - long cockie = 0; - prev = GetFirstChild( prev, cockie ); - for (int i = 0; i < c-1; i++) - prev = GetNextSibling( prev ); - } - SelectItem( prev ); - EnsureVisible( prev ); - } - } - break; - case WXK_LEFT: - { - wxTreeItemId prev = GetPrevSibling( m_current ); - if (prev != 0) - { - SelectItem( prev ); - EnsureVisible( prev ); - } - else - { - prev = GetParent( m_current ); - if (prev) - { - EnsureVisible( prev ); - SelectItem( prev ); - } - } - } - break; + // up goes to the previous sibling or to the last of its children if + // it's expanded + case WXK_UP: + { + wxTreeItemId prev = GetPrevSibling( m_current ); + if (!prev) + { + prev = GetParent( m_current ); + if (prev) + { + long cockie = 0; + wxTreeItemId current = m_current; + if (current == GetFirstChild( prev, cockie )) + { + // otherwise we return to where we came from + SelectItem( prev ); + EnsureVisible( prev ); + break; + } + } + } + if (prev) + { + while ( IsExpanded(prev) && HasChildren(prev) ) + { + wxTreeItemId child = GetLastChild(prev); + if ( child ) + { + prev = child; + } + } + + SelectItem( prev ); + EnsureVisible( prev ); + } + } + break; - case WXK_RIGHT: - // this works the same as the down arrow except that we also expand the - // item if it wasn't expanded yet - Expand(m_current); - // fall through + // left arrow goes to the parent + case WXK_LEFT: + { + wxTreeItemId prev = GetParent( m_current ); + if (prev) + { + EnsureVisible( prev ); + SelectItem( prev ); + } + } + break; - case WXK_DOWN: - { - if (IsExpanded(m_current)) - { - long cookie = 0; - wxTreeItemId child = GetFirstChild( m_current, cookie ); - SelectItem( child ); - EnsureVisible( child ); - } - else - { - wxTreeItemId next = GetNextSibling( m_current ); - if (next == 0) - { - wxTreeItemId current = m_current; - while (current && !next) + case WXK_RIGHT: + // this works the same as the down arrow except that we also expand the + // item if it wasn't expanded yet + Expand(m_current); + // fall through + + case WXK_DOWN: { - current = GetParent( current ); - if (current) next = GetNextSibling( current ); + if (IsExpanded(m_current) && HasChildren(m_current)) + { + long cookie = 0; + wxTreeItemId child = GetFirstChild( m_current, cookie ); + SelectItem( child ); + EnsureVisible( child ); + } + else + { + wxTreeItemId next = GetNextSibling( m_current ); + if (next == 0) + { + wxTreeItemId current = m_current; + while (current && !next) + { + current = GetParent( current ); + if (current) next = GetNextSibling( current ); + } + } + if (next != 0) + { + SelectItem( next ); + EnsureVisible( next ); + } + } } - } - if (next != 0) - { - SelectItem( next ); - EnsureVisible( next ); - } - } - } - break; + break; - default: - event.Skip(); - } + // selects the last visible tree item + case WXK_END: + { + wxTreeItemId last = GetRootItem(); + + while ( last.IsOk() && IsExpanded(last) ) + { + wxTreeItemId lastChild = GetLastChild(last); + + // it may happen if the item was expanded but then all of + // its children have been deleted - so IsExpanded() returned + // TRUE, but GetLastChild() returned invalid item + if ( !lastChild ) + break; + + last = lastChild; + } + + if ( last.IsOk() ) + { + EnsureVisible( last ); + SelectItem( last ); + } + } + break; + + // selects the root item + case WXK_HOME: + { + wxTreeItemId prev = GetRootItem(); + if (prev) + { + EnsureVisible( prev ); + SelectItem( prev ); + } + } + break; + + default: + event.Skip(); + } } wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& WXUNUSED(flags)) { + wxClientDC dc(this); + PrepareDC(dc); + long x = dc.DeviceToLogicalX( (long)point.x ); + long y = dc.DeviceToLogicalY( (long)point.y ); + bool onButton = FALSE; - return m_anchor->HitTest( point, onButton ); + return m_anchor->HitTest( wxPoint(x, y), onButton ); } void wxTreeCtrl::OnMouse( wxMouseEvent &event ) @@ -1376,7 +1476,7 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event ) if ( !(event.LeftDown() || event.LeftDClick() || event.Dragging()) ) return; if ( !m_anchor ) return; - + wxClientDC dc(this); PrepareDC(dc); long x = dc.DeviceToLogicalX( (long)event.GetX() ); @@ -1384,7 +1484,7 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event ) bool onButton = FALSE; wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), onButton ); - + if (item == NULL) return; /* we hit the blank area */ if (event.Dragging()) @@ -1392,7 +1492,7 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event ) if (m_dragCount == 2) /* small drag latency (3?) */ { m_dragCount = 0; - + wxTreeEvent nevent(wxEVT_COMMAND_TREE_BEGIN_DRAG, GetId()); nevent.m_item = m_current; nevent.SetEventObject(this); @@ -1404,8 +1504,9 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event ) } return; } - - if (!IsSelected(item)) SelectItem(item); /* we dont support multiple selections, BTW */ + + if (!IsSelected(item)) + SelectItem(item); /* we dont support multiple selections, BTW */ if (event.LeftDClick()) { @@ -1427,7 +1528,8 @@ void wxTreeCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) ) /* after all changes have been done to the tree control, * we actually redraw the tree when everything is over */ - if (!m_dirty) return; + if (!m_dirty) + return; m_dirty = FALSE; @@ -1442,13 +1544,13 @@ void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, i { int horizX = level*m_indent; - item->SetX( horizX+33 ); - item->SetY( y-m_lineHeight/3-2 ); + item->SetX( horizX+m_indent+m_spacing ); + item->SetY( y-m_lineHeight/2 ); item->SetHeight( m_lineHeight ); if ( !item->IsExpanded() ) { - /* we dont need to calculate collapsed branches */ + // we dont need to calculate collapsed branches return; } @@ -1457,7 +1559,7 @@ void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, i for ( size_t n = 0; n < count; n++ ) { y += m_lineHeight; - CalculateLevel( children[n], dc, level+1, y ); /* recurse */ + CalculateLevel( children[n], dc, level+1, y ); // recurse } } @@ -1471,10 +1573,11 @@ void wxTreeCtrl::CalculatePositions() dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ) ); dc.SetPen( m_dottedPen ); - m_lineHeight = (int)(dc.GetCharHeight() + 4); + if(GetImageList() == NULL) + m_lineHeight = (int)(dc.GetCharHeight() + 4); int y = m_lineHeight / 2 + 2; - CalculateLevel( m_anchor, dc, 0, y ); /* start recursion */ + CalculateLevel( m_anchor, dc, 0, y ); // start recursion } void wxTreeCtrl::RefreshSubtree(wxGenericTreeItem *item) @@ -1507,7 +1610,7 @@ void wxTreeCtrl::RefreshLine( wxGenericTreeItem *item ) rect.y = dc.LogicalToDeviceY( item->GetY() - 2 ); rect.width = 1000; rect.height = dc.GetCharHeight() + 6; - + Refresh( TRUE, &rect ); }