X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0659e7ee61824b55b986995edabf55f0111376ae..6b769f3d1f81ffebba557208083a1fc161dfbe23:/src/generic/treectrl.cpp diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp index 7d29b52f64..4602d32e83 100644 --- a/src/generic/treectrl.cpp +++ b/src/generic/treectrl.cpp @@ -21,19 +21,28 @@ #pragma implementation "treectrl.h" #endif -#include "wx/treectrl.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + +#include "wx/generic/treectrl.h" +#include "wx/generic/imaglist.h" #include "wx/settings.h" #include "wx/log.h" #include "wx/intl.h" #include "wx/dynarray.h" #include "wx/dcclient.h" -#include "wx/imaglist.h" #include "wx/msgdlg.h" // ----------------------------------------------------------------------------- // array types // ----------------------------------------------------------------------------- +class WXDLLEXPORT wxGenericTreeItem; + WX_DEFINE_ARRAY(wxGenericTreeItem *, wxArrayTreeItems); // ----------------------------------------------------------------------------- @@ -286,7 +295,10 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point, return this; } - if ((point.x > m_x) && (point.x < m_x+m_width)) + int w = m_width; + if (m_image != -1) w += 20; + + if ((point.x > m_x) && (point.x < m_x+w)) { onButton = FALSE; return this; @@ -347,18 +359,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 ); @@ -433,21 +447,27 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text) wxCHECK_RET( item.IsOk(), "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" ); - 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" ); - item.m_pItem->SetSelectedImage(image); + wxGenericTreeItem *pItem = item.m_pItem; + pItem->SetSelectedImage(image); + RefreshLine(pItem); } void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data) @@ -461,7 +481,9 @@ void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has) { wxCHECK_RET( item.IsOk(), "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) @@ -522,14 +544,14 @@ bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" ); return item.m_pItem->GetParent(); } wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) const { - wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" ); cookie = 0; return GetNextChild(item, cookie); @@ -537,82 +559,91 @@ wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) c wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) const { - wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "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 { // there are no more of them - return NULL; + return wxTreeItemId(); } } +wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const +{ + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "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(), NULL, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" ); wxGenericTreeItem *i = item.m_pItem; wxGenericTreeItem *parent = i->GetParent(); if ( parent == NULL ) { // root item doesn't have any siblings - return NULL; + return wxTreeItemId(); } wxArrayTreeItems& siblings = parent->GetChildren(); int index = siblings.Index(i); - wxASSERT( index != NOT_FOUND ); // I'm not a child of my parent? + wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent? size_t n = (size_t)(index + 1); - return n == siblings.Count() ? (wxGenericTreeItem*)NULL : siblings[n]; + return n == siblings.Count() ? wxTreeItemId() : wxTreeItemId(siblings[n]); } wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" ); wxGenericTreeItem *i = item.m_pItem; wxGenericTreeItem *parent = i->GetParent(); if ( parent == NULL ) { // root item doesn't have any siblings - return NULL; + return wxTreeItemId(); } wxArrayTreeItems& siblings = parent->GetChildren(); int index = siblings.Index(i); - wxASSERT( index != NOT_FOUND ); // I'm not a child of my parent? + wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent? - return index == 0 ? (wxGenericTreeItem*)NULL : siblings[(size_t)(index - 1)]; + return index == 0 ? wxTreeItemId() + : wxTreeItemId(siblings[(size_t)(index - 1)]); } wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const { wxFAIL_MSG("not implemented"); - return NULL; + return wxTreeItemId(); } wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" ); wxFAIL_MSG("not implemented"); - return NULL; + return wxTreeItemId(); } wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" ); wxFAIL_MSG("not implemented"); - return NULL; + return wxTreeItemId(); } // ----------------------------------------------------------------------------- @@ -654,7 +685,7 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text, int image, int selImage, wxTreeItemData *data) { - wxCHECK_MSG( !m_anchor, NULL, "tree can have only one root" ); + wxCHECK_MSG( !m_anchor, wxTreeItemId(), "tree can have only one root" ); wxClientDC dc(this); m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text, dc, @@ -692,7 +723,7 @@ wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parentId, } int index = parent->GetChildren().Index(idPrevious.m_pItem); - wxASSERT_MSG( index != NOT_FOUND, + wxASSERT_MSG( index != wxNOT_FOUND, "previous item in wxTreeCtrl::InsertItem() is not a sibling" ); return DoInsertItem(parentId, (size_t)index, text, image, selImage, data); } @@ -763,9 +794,9 @@ void wxTreeCtrl::Expand(const wxTreeItemId& itemId) { wxGenericTreeItem *item = itemId.m_pItem; - if ( !item->HasPlus() ) + if ( !item->HasPlus() ) return; - + if ( item->IsExpanded() ) return; @@ -779,6 +810,7 @@ void wxTreeCtrl::Expand(const wxTreeItemId& itemId) } item->Expand(); + CalculatePositions(); RefreshSubtree(item); @@ -876,6 +908,16 @@ 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; @@ -883,6 +925,10 @@ void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item) ViewStart( &start_x, &start_y ); start_y *= 10; + int client_h = 0; + int client_w = 0; + GetClientSize( &client_w, &client_h ); + if (item_y < start_y+3) { int x = 0; @@ -890,37 +936,30 @@ 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/10 ); - return; + SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-client_h/2)/10 ); } - - int w = 0; - int h = 0; - GetClientSize( &w, &h ); - - if (item_y > start_y+h-26) + else if (item_y > start_y+client_h-16) { int x = 0; int y = 0; 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-h+30)/10 ); - return; + SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-client_h/2)/10 ); } } void wxTreeCtrl::ScrollTo(const wxTreeItemId& WXUNUSED(item)) { - wxFAIL_MSG("not implemented"); + wxFAIL_MSG("not implemented"); } wxTextCtrl *wxTreeCtrl::EditLabel( const wxTreeItemId& WXUNUSED(item), wxClassInfo* WXUNUSED(textCtrlClass) ) { - wxFAIL_MSG("not implemented"); + wxFAIL_MSG("not implemented"); - return (wxTextCtrl*)NULL; + return (wxTextCtrl*)NULL; } wxTextCtrl *wxTreeCtrl::GetEditControl() const @@ -935,37 +974,42 @@ void wxTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), bool WXUNUSED( wxFAIL_MSG("not implemented"); } -wxTreeItemCmpFunc tree_ctrl_compare_func_2; +// FIXME: tree sorting functions are not reentrant and not MT-safe! +static wxTreeCtrl *s_treeBeingSorted = NULL; -int tree_ctrl_compare_func_1( wxGenericTreeItem **line1, wxGenericTreeItem **line2 ) +static int tree_ctrl_compare_func(wxGenericTreeItem **item1, + wxGenericTreeItem **item2) { - if (tree_ctrl_compare_func_2 == NULL) - { - return strcmp( (*line1)->GetText(), (*line2)->GetText() ); - } - else - { - wxTreeItemData *data1 = (*line1)->GetData(); - wxTreeItemData *data2 = (*line2)->GetData(); - return tree_ctrl_compare_func_2( data1, data2 ); - } + wxCHECK_MSG( s_treeBeingSorted, 0, "bug in wxTreeCtrl::SortChildren()" ); + + return s_treeBeingSorted->OnCompareItems(*item1, *item2); } -void wxTreeCtrl::SortChildren( const wxTreeItemId& item, - wxTreeItemCmpFunc *cmpFunction) +int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1, + const wxTreeItemId& item2) { - wxGenericTreeItem *gitem = item.m_pItem; - - if (!gitem) return; - - if (cmpFunction == NULL) - tree_ctrl_compare_func_2 = NULL; - else - tree_ctrl_compare_func_2 = *cmpFunction; - - gitem->GetChildren().Sort( *tree_ctrl_compare_func_1 ); - - m_dirty = TRUE; + return strcmp(GetItemText(item1), GetItemText(item2)); +} + +void wxTreeCtrl::SortChildren(const wxTreeItemId& itemId) +{ + wxCHECK_RET( itemId.IsOk(), "invalid tree item" ); + + wxGenericTreeItem *item = itemId.m_pItem; + + wxCHECK_RET( !s_treeBeingSorted, + "wxTreeCtrl::SortChildren is not reentrant" ); + + wxArrayTreeItems& children = item->GetChildren(); + if ( children.Count() > 1 ) + { + 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 } wxImageList *wxTreeCtrl::GetImageList() const @@ -980,7 +1024,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) @@ -1012,159 +1070,167 @@ void wxTreeCtrl::AdjustMyScrollbars() 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()) - { - // @@ 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("wxDC::GetFont() failed!"); - } - } + // render bold items in bold + wxFont fontOld; + wxFont fontNew; - long text_w = 0; - long text_h = 0; - dc.GetTextExtent( item->GetText(), &text_w, &text_h ); + 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("wxDC::GetFont() failed!"); + } + } - 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) - { - m_imageListNormal->GetSize( item->GetImage(), image_w, image_h ); - image_w += 4; - } + long text_w = 0; + long text_h = 0; + dc.GetTextExtent( item->GetText(), &text_w, &text_h ); - dc.DrawRectangle( item->GetX()-2, item->GetY()-2, image_w+text_w+4, text_h+4 ); + 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) + { + m_imageListNormal->GetSize( item->GetImage(), image_w, image_h ); + image_w += 4; + } - if ((item->IsExpanded()) && (item->GetSelectedImage() != -1)) - { - dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, text_h ); - m_imageListNormal->Draw( item->GetSelectedImage(), dc, - item->GetX(), item->GetY()-1, - wxIMAGELIST_DRAW_TRANSPARENT ); - dc.DestroyClippingRegion(); - } - else if (item->GetImage() != -1) - { - dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, text_h ); - m_imageListNormal->Draw( item->GetImage(), dc, - item->GetX(), item->GetY()-1, - wxIMAGELIST_DRAW_TRANSPARENT ); - dc.DestroyClippingRegion(); - } + 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+2, total_h ); - dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY() ); + if ((item->IsExpanded()) && (item->GetSelectedImage() != -1)) + { + 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, + item->GetX(), + item->GetY() +((total_h > image_h)?((total_h-image_h)/2):0), + wxIMAGELIST_DRAW_TRANSPARENT ); + dc.DestroyClippingRegion(); + } - // restore normal font for bold items - if (fontOld.Ok()) - { - dc.SetFont( fontOld); - } + dc.SetBackgroundMode(wxTRANSPARENT); + 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); + } } void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y ) { - int horizX = level*m_indent; + int horizX = level*m_indent; - item->SetX( horizX+33 ); - item->SetY( y-m_lineHeight/3 ); - item->SetHeight( m_lineHeight ); + item->SetX( horizX+33 ); + item->SetY( y-m_lineHeight/2 ); + item->SetHeight( m_lineHeight ); - item->SetCross( horizX+15, y ); + item->SetCross( horizX+15, y ); - int oldY = y; + int oldY = y; - int exposed_x = dc.LogicalToDeviceX( 0 ); - int exposed_y = dc.LogicalToDeviceY( item->GetY()-2 ); + int exposed_x = dc.LogicalToDeviceX( 0 ); + int exposed_y = dc.LogicalToDeviceY( item->GetY()-2 ); - if (IsExposed( exposed_x, exposed_y, 10000, m_lineHeight+4 )) // 10000 = very much - { - int startX = horizX; - int endX = horizX + 10; + if (IsExposed( exposed_x, exposed_y, 10000, m_lineHeight+4 )) // 10000 = very much + { + int startX = horizX; + int endX = horizX + 10; - if (!item->HasChildren()) endX += 20; + if (!item->HasChildren()) endX += 20; - dc.DrawLine( startX, y, endX, y ); + dc.DrawLine( startX, y, endX, y ); - if (item->HasPlus()) - { - dc.DrawLine( horizX+20, y, horizX+30, y ); - dc.SetPen( *wxGREY_PEN ); - dc.SetBrush( *wxWHITE_BRUSH ); - dc.DrawRectangle( horizX+10, y-4, 11, 9 ); - dc.SetPen( *wxBLACK_PEN ); - dc.DrawLine( horizX+13, y, horizX+18, y ); - - if (!item->IsExpanded()) - dc.DrawLine( horizX+15, y-2, horizX+15, y+3 ); - } + if (item->HasPlus()) + { + dc.DrawLine( horizX+20, y, horizX+30, y ); + dc.SetPen( *wxGREY_PEN ); + dc.SetBrush( *wxWHITE_BRUSH ); + dc.DrawRectangle( horizX+10, y-4, 11, 9 ); + dc.SetPen( *wxBLACK_PEN ); + dc.DrawLine( horizX+13, y, horizX+18, y ); + + if (!item->IsExpanded()) + { + dc.DrawLine( horizX+15, y-2, horizX+15, y+3 ); + } + } - if (item->HasHilight()) - { - dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); + if (item->HasHilight()) + { + dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); - dc.SetBrush( *m_hilightBrush ); + dc.SetBrush( *m_hilightBrush ); - if (m_hasFocus) - dc.SetPen( *wxBLACK_PEN ); - else - dc.SetPen( *wxTRANSPARENT_PEN ); + if (m_hasFocus) + dc.SetPen( *wxBLACK_PEN ); + else + dc.SetPen( *wxTRANSPARENT_PEN ); - PaintItem(item, dc); + PaintItem(item, dc); - dc.SetPen( *wxBLACK_PEN ); - dc.SetTextForeground( *wxBLACK ); - dc.SetBrush( *wxWHITE_BRUSH ); - } - else - { - dc.SetBrush( *wxWHITE_BRUSH ); - dc.SetPen( *wxTRANSPARENT_PEN ); + dc.SetPen( *wxBLACK_PEN ); + dc.SetTextForeground( *wxBLACK ); + dc.SetBrush( *wxWHITE_BRUSH ); + } + else + { + dc.SetBrush( *wxWHITE_BRUSH ); + dc.SetPen( *wxTRANSPARENT_PEN ); - PaintItem(item, dc); + PaintItem(item, dc); - dc.SetPen( *wxBLACK_PEN ); + dc.SetPen( *wxBLACK_PEN ); + } } - } - if ( item->IsExpanded() ) - { - int semiOldY = y; - - wxArrayTreeItems& children = item->GetChildren(); - size_t count = children.Count(); - for ( size_t n = 0; n < count; n++ ) - { - y += m_lineHeight; - semiOldY = y; + if (item->IsExpanded()) + { + int semiOldY = y; - PaintLevel( children[n], dc, level+1, y ); - } + wxArrayTreeItems& children = item->GetChildren(); + size_t count = children.Count(); + for ( size_t n = 0; n < count; n++ ) + { + y += m_lineHeight; + semiOldY = y; + 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+15, oldY+5, horizX+15, semiOldY ); + } } // ----------------------------------------------------------------------------- @@ -1179,10 +1245,11 @@ void wxTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxPaintDC dc(this); PrepareDC( dc ); - dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_SYSTEM_FONT ) ); + 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 ); @@ -1191,250 +1258,338 @@ void wxTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) ) void wxTreeCtrl::OnSetFocus( wxFocusEvent &WXUNUSED(event) ) { m_hasFocus = TRUE; - if ( m_current ) - RefreshLine( m_current ); + + if (m_current) RefreshLine( m_current ); } void wxTreeCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) ) { m_hasFocus = FALSE; - if ( m_current ) - RefreshLine( m_current ); + + 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_LEFT: - case WXK_UP: - { - 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 ); + 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)) { - bool onButton = FALSE; - return m_anchor->HitTest( point, onButton ); + bool onButton = FALSE; + return m_anchor->HitTest( point, onButton ); } void wxTreeCtrl::OnMouse( wxMouseEvent &event ) { - if ( !(event.LeftDown() || event.LeftDClick()) ) - return; + if (!event.LeftIsDown()) m_dragCount = 0; - if ( !m_anchor ) - return; + if ( !(event.LeftDown() || event.LeftDClick() || event.Dragging()) ) return; - wxClientDC dc(this); - PrepareDC(dc); - long x = dc.DeviceToLogicalX( (long)event.GetX() ); - long y = dc.DeviceToLogicalY( (long)event.GetY() ); + if ( !m_anchor ) return; - bool onButton = FALSE; - wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), onButton ); - if ( item == NULL ) - return; + wxClientDC dc(this); + PrepareDC(dc); + long x = dc.DeviceToLogicalX( (long)event.GetX() ); + long y = dc.DeviceToLogicalY( (long)event.GetY() ); - if (!IsSelected(item)) SelectItem(item); + bool onButton = FALSE; + wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), onButton ); - if ( event.LeftDClick() ) - { - wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() ); - event.m_item = item; - event.m_code = 0; - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); - } + if (item == NULL) return; /* we hit the blank area */ - if ( onButton ) - { - Toggle( item ); - } + if (event.Dragging()) + { + 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); + GetEventHandler()->ProcessEvent(nevent); + } + else + { + m_dragCount++; + } + return; + } + + if (!IsSelected(item)) + SelectItem(item); /* we dont support multiple selections, BTW */ + + if (event.LeftDClick()) + { + wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() ); + event.m_item = item; + event.m_code = 0; + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent( event ); + } + + if (onButton) + { + Toggle( item ); + } } void wxTreeCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) ) { - if (!m_dirty) return; + /* after all changes have been done to the tree control, + * we actually redraw the tree when everything is over */ - m_dirty = FALSE; + if (!m_dirty) + return; - CalculatePositions(); + m_dirty = FALSE; - AdjustMyScrollbars(); + CalculatePositions(); + + AdjustMyScrollbars(); } // ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- -void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, - wxDC &dc, - int level, - int &y ) + +void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y ) { - int horizX = level*m_indent; + int horizX = level*m_indent; - item->SetX( horizX+33 ); - item->SetY( y-m_lineHeight/3-2 ); - item->SetHeight( m_lineHeight ); + item->SetX( horizX+33 ); + item->SetY( y-m_lineHeight/2 ); + item->SetHeight( m_lineHeight ); - if ( item->IsExpanded() ) - return; + if ( !item->IsExpanded() ) + { + // we dont need to calculate collapsed branches + return; + } - wxArrayTreeItems& children = item->GetChildren(); - size_t count = children.Count(); - for ( size_t n = 0; n < count; n++ ) - { - y += m_lineHeight; - CalculateLevel( children[n], dc, level+1, y ); - } + wxArrayTreeItems& children = item->GetChildren(); + size_t count = children.Count(); + for ( size_t n = 0; n < count; n++ ) + { + y += m_lineHeight; + CalculateLevel( children[n], dc, level+1, y ); // recurse + } } void wxTreeCtrl::CalculatePositions() { - if ( !m_anchor ) - return; + if ( !m_anchor ) return; - wxClientDC dc(this); - PrepareDC( dc ); + wxClientDC dc(this); + PrepareDC( dc ); - dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_SYSTEM_FONT ) ); + dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ) ); - dc.SetPen( m_dottedPen ); - m_lineHeight = (int)(dc.GetCharHeight() + 4); + dc.SetPen( m_dottedPen ); + if(GetImageList() == NULL) + m_lineHeight = (int)(dc.GetCharHeight() + 4); - int y = m_lineHeight / 2 + 2; - CalculateLevel( m_anchor, dc, 0, y ); + int y = m_lineHeight / 2 + 2; + CalculateLevel( m_anchor, dc, 0, y ); // start recursion } void wxTreeCtrl::RefreshSubtree(wxGenericTreeItem *item) { - wxClientDC dc(this); - PrepareDC(dc); + wxClientDC dc(this); + PrepareDC(dc); - int cw = 0; - int ch = 0; - GetClientSize( &cw, &ch ); + int cw = 0; + int ch = 0; + GetClientSize( &cw, &ch ); - wxRect rect; - rect.x = dc.LogicalToDeviceX( 0 ); - rect.width = cw; - rect.y = dc.LogicalToDeviceY( item->GetY() ); - rect.height = ch; + wxRect rect; + rect.x = dc.LogicalToDeviceX( 0 ); + rect.width = cw; + rect.y = dc.LogicalToDeviceY( item->GetY() ); + rect.height = ch; - Refresh( TRUE, &rect ); + Refresh( TRUE, &rect ); - AdjustMyScrollbars(); + AdjustMyScrollbars(); } void wxTreeCtrl::RefreshLine( wxGenericTreeItem *item ) { - wxClientDC dc(this); - PrepareDC( dc ); - - wxRect rect; - rect.x = dc.LogicalToDeviceX( item->GetX() - 2 ); - rect.y = dc.LogicalToDeviceY( item->GetY() - 2 ); - rect.width = 1000; - rect.height = dc.GetCharHeight() + 6; - Refresh( TRUE, &rect ); + wxClientDC dc(this); + PrepareDC( dc ); + + wxRect rect; + rect.x = dc.LogicalToDeviceX( item->GetX() - 2 ); + rect.y = dc.LogicalToDeviceY( item->GetY() - 2 ); + rect.width = 1000; + rect.height = dc.GetCharHeight() + 6; + + Refresh( TRUE, &rect ); }