X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f135ff73b4b0b7c76a1fa3396f768c44f8dc204f..b292e2f512fa9b25e2d2928604ab884b00e6c6bf:/src/generic/treectrl.cpp?ds=sidebyside diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp index 992939ca8a..04d3717ec3 100644 --- a/src/generic/treectrl.cpp +++ b/src/generic/treectrl.cpp @@ -27,6 +27,7 @@ #include "wx/intl.h" #include "wx/dynarray.h" #include "wx/dcclient.h" +#include "wx/imaglist.h" // ----------------------------------------------------------------------------- // array types @@ -50,7 +51,7 @@ public: int image, int selImage, wxTreeItemData *data ); - inline ~wxGenericTreeItem(); + ~wxGenericTreeItem(); // trivial accessors wxArrayTreeItems& GetChildren() { return m_children; } @@ -67,6 +68,8 @@ public: void SetHasPlus(bool has = TRUE) { m_hasPlus = has; } + void SetBold(bool bold) { m_isBold = bold; } + int GetX() const { return m_x; } int GetY() const { return m_y; } @@ -80,8 +83,8 @@ public: // operations void Reset(); - // get count of all children (and grand children and ...) of this item - size_t GetTotalNumberOfChildren() const; + // get count of all children (and grand children if 'recursively') + size_t GetChildrenCount(bool recursively = TRUE) const; void Insert(wxGenericTreeItem *child, size_t index) { m_children.Insert(child, index); } @@ -104,6 +107,7 @@ public: bool HasHilight() const { return m_hasHilight; } bool IsExpanded() const { return !m_isCollapsed; } bool HasPlus() const { return m_hasPlus || HasChildren(); } + bool IsBold() const { return m_isBold; } private: wxString m_text; @@ -112,12 +116,13 @@ private: m_selImage; wxTreeItemData *m_data; - - // @@ probably should use bitfields to save size - bool m_isCollapsed, - m_hasHilight, // same as focused - m_hasPlus; // used for item which doesn't have - // children but still has a [+] button + + // use bitfields to save size + int m_isCollapsed :1; + int m_hasHilight :1; // same as focused + int m_hasPlus :1; // used for item which doesn't have + // children but still has a [+] button + int m_isBold :1; // render the label in bold font int m_x, m_y; long m_height, m_width; @@ -135,10 +140,10 @@ private: // wxTreeEvent // ----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxCommandEvent) +IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent) wxTreeEvent::wxTreeEvent( wxEventType commandType, int id ) - : wxCommandEvent( commandType, id ) + : wxNotifyEvent( commandType, id ) { m_code = 0; m_itemOld = (wxGenericTreeItem *)NULL; @@ -165,6 +170,8 @@ wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent, m_isCollapsed = TRUE; m_hasHilight = FALSE; + m_hasPlus = FALSE; + m_isBold = FALSE; m_parent = parent; @@ -174,7 +181,7 @@ wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent, wxGenericTreeItem::~wxGenericTreeItem() { delete m_data; - + size_t count = m_children.Count(); for ( size_t n = 0; n < count; n++ ) delete m_children[n]; @@ -206,13 +213,16 @@ void wxGenericTreeItem::Reset() m_parent = (wxGenericTreeItem *)NULL; } -size_t wxGenericTreeItem::GetTotalNumberOfChildren() const +size_t wxGenericTreeItem::GetChildrenCount(bool recursively) const { size_t count = m_children.Count(); + if ( !recursively ) + return count; + size_t total = count; for ( size_t n = 0; n < count; n++ ) { - total += m_children[n]->GetTotalNumberOfChildren(); + total += m_children[n]->GetChildrenCount(); } return total; @@ -226,15 +236,17 @@ void wxGenericTreeItem::SetCross( int x, int y ) void wxGenericTreeItem::GetSize( int &x, int &y ) { - // FIXME what does this all mean?? - if ( y < m_y + 10 ) y = m_y +10; + if ( y < m_y ) y = m_y; int width = m_x + m_width; if (width > x) x = width; - size_t count = m_children.Count(); - for ( size_t n = 0; n < count; n++ ) + if (IsExpanded()) { - m_children[n]->GetSize( x, y ); + size_t count = m_children.Count(); + for ( size_t n = 0; n < count; n++ ) + { + m_children[n]->GetSize( x, y ); + } } } @@ -246,7 +258,7 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point, // FIXME why +5? if ((point.x > m_xCross-5) && (point.x < m_xCross+5) && (point.y > m_yCross-5) && (point.y < m_yCross+5) && - HasChildren()) + (IsExpanded() || HasPlus())) { onButton = TRUE; return this; @@ -287,6 +299,7 @@ BEGIN_EVENT_TABLE(wxTreeCtrl,wxScrolledWindow) EVT_CHAR (wxTreeCtrl::OnChar) EVT_SET_FOCUS (wxTreeCtrl::OnSetFocus) EVT_KILL_FOCUS (wxTreeCtrl::OnKillFocus) + EVT_IDLE (wxTreeCtrl::OnIdle) END_EVENT_TABLE() // ----------------------------------------------------------------------------- @@ -297,6 +310,7 @@ void wxTreeCtrl::Init() m_current = m_anchor = (wxGenericTreeItem *) NULL; m_hasFocus = FALSE; + m_dirty = FALSE; m_xScroll = 0; m_yScroll = 0; @@ -319,7 +333,7 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, { Init(); - wxScrolledWindow::Create( parent, id, pos, size, style, name ); + wxScrolledWindow::Create( parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name ); SetBackgroundColour( *wxWHITE ); m_dottedPen = wxPen( *wxBLACK, 0, 0 ); @@ -339,7 +353,7 @@ wxTreeCtrl::~wxTreeCtrl() size_t wxTreeCtrl::GetCount() const { - return m_anchor == NULL ? 0u : m_anchor->GetTotalNumberOfChildren(); + return m_anchor == NULL ? 0u : m_anchor->GetChildrenCount(); } void wxTreeCtrl::SetIndent(unsigned int indent) @@ -348,61 +362,99 @@ void wxTreeCtrl::SetIndent(unsigned int indent) Refresh(); } +size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively) +{ + wxCHECK_MSG( item.IsOk(), 0u, "invalid tree item" ); + + return item.m_pItem->GetChildrenCount(recursively); +} + // ----------------------------------------------------------------------------- // functions to work with tree items // ----------------------------------------------------------------------------- wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const { + wxCHECK_MSG( item.IsOk(), "", "invalid tree item" ); + return item.m_pItem->GetText(); } int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const { + wxCHECK_MSG( item.IsOk(), -1, "invalid tree item" ); + return item.m_pItem->GetImage(); } int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const { + wxCHECK_MSG( item.IsOk(), -1, "invalid tree item" ); + return item.m_pItem->GetSelectedImage(); } wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const { + wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" ); + return item.m_pItem->GetData(); } void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text) { + wxCHECK_RET( item.IsOk(), "invalid tree item" ); + wxClientDC dc(this); - return item.m_pItem->SetText(text, dc); + item.m_pItem->SetText(text, dc); } void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image) { - return item.m_pItem->SetImage(image); + wxCHECK_RET( item.IsOk(), "invalid tree item" ); + + item.m_pItem->SetImage(image); } void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image) { - return item.m_pItem->SetSelectedImage(image); + wxCHECK_RET( item.IsOk(), "invalid tree item" ); + + item.m_pItem->SetSelectedImage(image); } void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data) { - return item.m_pItem->SetData(data); + wxCHECK_RET( item.IsOk(), "invalid tree item" ); + + item.m_pItem->SetData(data); } void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has) { + wxCHECK_RET( item.IsOk(), "invalid tree item" ); + item.m_pItem->SetHasPlus(has); } +void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold) +{ + wxCHECK_RET( item.IsOk(), "invalid tree item" ); + + // avoid redrawing the tree if no real change + wxGenericTreeItem *pItem = item.m_pItem; + if ( pItem->IsBold() != bold ) + { + pItem->SetBold(bold); + RefreshLine(pItem); + } +} + // ----------------------------------------------------------------------------- // item status inquiries // ----------------------------------------------------------------------------- -bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const +bool wxTreeCtrl::IsVisible(const wxTreeItemId& WXUNUSED(item)) const { wxFAIL_MSG("not implemented"); @@ -411,19 +463,32 @@ bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const { + wxCHECK_MSG( item.IsOk(), FALSE, "invalid tree item" ); + return !item.m_pItem->GetChildren().IsEmpty(); } bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const { + wxCHECK_MSG( item.IsOk(), FALSE, "invalid tree item" ); + return item.m_pItem->IsExpanded(); } bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const { + wxCHECK_MSG( item.IsOk(), FALSE, "invalid tree item" ); + return item.m_pItem->HasHilight(); } +bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const +{ + wxCHECK_MSG( item.IsOk(), FALSE, "invalid tree item" ); + + return item.m_pItem->IsBold(); +} + // ----------------------------------------------------------------------------- // navigation // ----------------------------------------------------------------------------- @@ -447,7 +512,16 @@ wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) co { wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" ); - return item.m_pItem->GetChildren().Item(cookie++); + wxArrayTreeItems& children = item.m_pItem->GetChildren(); + if ( (size_t)cookie < children.Count() ) + { + return item.m_pItem->GetChildren().Item(cookie++); + } + else + { + // there are no more of them + return NULL; + } } wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const @@ -461,13 +535,13 @@ wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const // root item doesn't have any siblings return NULL; } - + wxArrayTreeItems& siblings = parent->GetChildren(); int index = siblings.Index(i); wxASSERT( index != NOT_FOUND ); // I'm not a child of my parent? size_t n = (size_t)(index + 1); - return n == siblings.Count() ? NULL : siblings[n]; + return n == siblings.Count() ? (wxGenericTreeItem*)NULL : siblings[n]; } wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const @@ -481,12 +555,12 @@ wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const // root item doesn't have any siblings return NULL; } - + wxArrayTreeItems& siblings = parent->GetChildren(); int index = siblings.Index(i); wxASSERT( index != NOT_FOUND ); // I'm not a child of my parent? - return index == 0 ? NULL : siblings[(size_t)(index - 1)]; + return index == 0 ? (wxGenericTreeItem*)NULL : siblings[(size_t)(index - 1)]; } wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const @@ -530,7 +604,7 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parentId, // should we give a warning here? return AddRoot(text, image, selImage, data); } - + wxClientDC dc(this); wxGenericTreeItem *item = new wxGenericTreeItem(parent, text, dc, @@ -544,32 +618,7 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parentId, parent->Insert( item, previous ); - CalculatePositions(); - - int cw, ch; - GetClientSize( &cw, &ch ); - - PrepareDC( dc ); - - wxRectangle rect; - rect.x = dc.LogicalToDeviceX( 0 ); - rect.y = 0; - rect.width = 10000; // @@@ not very elegant... - rect.height = ch; - - if ( previous != 0 ) - { - rect.y = dc.LogicalToDeviceY( parent->GetChildren().Item(previous)->GetY() ); - } - else // it's the 1st child - { - rect.y = dc.LogicalToDeviceY( parent->GetY() ); - } - - AdjustMyScrollbars(); - - if ( rect.height > 0 ) - Refresh( FALSE, &rect ); + m_dirty = TRUE; return item; } @@ -640,10 +689,16 @@ wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parentId, void wxTreeCtrl::Delete(const wxTreeItemId& itemId) { wxGenericTreeItem *item = itemId.m_pItem; + wxGenericTreeItem *parent = item->GetParent(); + + if ( parent ) + { + parent->GetChildren().Remove(item); + } delete item; - Refresh(); + m_dirty = TRUE; } void wxTreeCtrl::DeleteAllItems() @@ -653,7 +708,7 @@ void wxTreeCtrl::DeleteAllItems() delete m_anchor; m_anchor = NULL; - Refresh(); + m_dirty = TRUE; } } @@ -661,6 +716,9 @@ void wxTreeCtrl::Expand(const wxTreeItemId& itemId) { wxGenericTreeItem *item = itemId.m_pItem; + if ( !item->HasPlus() ) + return; + if ( item->IsExpanded() ) return; @@ -672,7 +730,7 @@ void wxTreeCtrl::Expand(const wxTreeItemId& itemId) // cancelled by program return; } - + item->Expand(); RefreshSubtree(item); @@ -696,7 +754,7 @@ void wxTreeCtrl::Collapse(const wxTreeItemId& itemId) // cancelled by program return; } - + item->Collapse(); wxArrayTreeItems& children = item->GetChildren(); @@ -749,7 +807,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId) event.m_item = item; event.m_itemOld = m_current; event.SetEventObject( this ); - if ( ProcessEvent( event ) && event.WasVetoed() ) + if ( GetEventHandler()->ProcessEvent( event ) && event.WasVetoed() ) return; if ( m_current ) @@ -763,22 +821,55 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId) RefreshLine( m_current ); event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED); - ProcessEvent( event ); + GetEventHandler()->ProcessEvent( event ); } } void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item) { - wxFAIL_MSG("not implemented"); + wxGenericTreeItem *gitem = item.m_pItem; + + int item_y = gitem->GetY(); + + int start_x = 0; + int start_y = 0; + ViewStart( &start_x, &start_y ); + start_y *= 10; + + if (item_y < start_y+3) + { + 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/10 ); + return; + } + + int w = 0; + int h = 0; + GetClientSize( &w, &h ); + + if (item_y > start_y+h-26) + { + 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; + } } -void wxTreeCtrl::ScrollTo(const wxTreeItemId& item) +void wxTreeCtrl::ScrollTo(const wxTreeItemId& WXUNUSED(item)) { wxFAIL_MSG("not implemented"); } -wxTextCtrl *wxTreeCtrl::EditLabel(const wxTreeItemId& item, - wxClassInfo* textCtrlClass) +wxTextCtrl *wxTreeCtrl::EditLabel( const wxTreeItemId& WXUNUSED(item), + wxClassInfo* WXUNUSED(textCtrlClass) ) { wxFAIL_MSG("not implemented"); @@ -792,21 +883,17 @@ wxTextCtrl *wxTreeCtrl::GetEditControl() const return NULL; } -void wxTreeCtrl::EndEditLabel(const wxTreeItemId& item, bool discardChanges) +void wxTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), bool WXUNUSED(discardChanges)) { wxFAIL_MSG("not implemented"); } -void wxTreeCtrl::SortChildren(const wxTreeItemId& item, - wxTreeItemCmpFunc *cmpFunction) +void wxTreeCtrl::SortChildren( const wxTreeItemId& WXUNUSED(item), + wxTreeItemCmpFunc *WXUNUSED(cmpFunction)) { wxFAIL_MSG("not implemented"); } -// ----------------------------------------------------------------------------- -// images are not currently supported, but we still provide stubs for these -// functions -// ----------------------------------------------------------------------------- wxImageList *wxTreeCtrl::GetImageList() const { return m_imageListNormal; @@ -848,6 +935,63 @@ 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!"); + } + } + + long text_w = 0; + long text_h = 0; + dc.GetTextExtent( item->GetText(), &text_w, &text_h ); + + int image_h = 0; + int image_w = 0; + 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 ); + + 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(); + } + + dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY() ); + + // 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; @@ -862,20 +1006,21 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & int exposed_x = dc.LogicalToDeviceX( 0 ); int exposed_y = dc.LogicalToDeviceY( item->GetY()-2 ); - - if (IsExposed( exposed_x, exposed_y, 1000, m_lineHeight+4 )) + + 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; - + 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 ); @@ -887,20 +1032,15 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & if (item->HasHilight()) { dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); + dc.SetBrush( *m_hilightBrush ); - long tw, th; - dc.GetTextExtent( item->GetText(), &tw, &th ); + if (m_hasFocus) - { dc.SetPen( *wxBLACK_PEN ); - dc.DrawRectangle( item->GetX()-2, item->GetY()-2, tw+4, th+4 ); - } else - { dc.SetPen( *wxTRANSPARENT_PEN ); - dc.DrawRectangle( item->GetX()-2, item->GetY()-2, tw+4, th+4 ); - } - dc.DrawText( item->GetText(), item->GetX(), item->GetY() ); + + PaintItem(item, dc); dc.SetPen( *wxBLACK_PEN ); dc.SetTextForeground( *wxBLACK ); @@ -910,10 +1050,9 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & { dc.SetBrush( *wxWHITE_BRUSH ); dc.SetPen( *wxTRANSPARENT_PEN ); - long tw, th; - dc.GetTextExtent( item->GetText(), &tw, &th ); - dc.DrawRectangle( item->GetX()-2, item->GetY()-2, tw+4, th+4 ); - dc.DrawText( item->GetText(), item->GetX(), item->GetY() ); + + PaintItem(item, dc); + dc.SetPen( *wxBLACK_PEN ); } } @@ -940,7 +1079,7 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & // wxWindows callbacks // ----------------------------------------------------------------------------- -void wxTreeCtrl::OnPaint( const wxPaintEvent &WXUNUSED(event) ) +void wxTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) ) { if ( !m_anchor ) return; @@ -957,14 +1096,14 @@ void wxTreeCtrl::OnPaint( const wxPaintEvent &WXUNUSED(event) ) PaintLevel( m_anchor, dc, 0, y ); } -void wxTreeCtrl::OnSetFocus( const wxFocusEvent &WXUNUSED(event) ) +void wxTreeCtrl::OnSetFocus( wxFocusEvent &WXUNUSED(event) ) { m_hasFocus = TRUE; if ( m_current ) RefreshLine( m_current ); } -void wxTreeCtrl::OnKillFocus( const wxFocusEvent &WXUNUSED(event) ) +void wxTreeCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) ) { m_hasFocus = FALSE; if ( m_current ) @@ -973,11 +1112,114 @@ void wxTreeCtrl::OnKillFocus( const wxFocusEvent &WXUNUSED(event) ) void wxTreeCtrl::OnChar( wxKeyEvent &event ) { - // TODO process '+', '-' (expand/collapse branch) and cursor keys - event.Skip(); + 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; + } + + 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_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 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; + + 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: + { + 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) + { + current = GetParent( current ); + if (current) next = GetNextSibling( current ); + } + } + if (next != 0) + { + SelectItem( next ); + EnsureVisible( next ); + } + } + } + break; + + default: + event.Skip(); + } } -void wxTreeCtrl::OnMouse( const wxMouseEvent &event ) +void wxTreeCtrl::OnMouse( wxMouseEvent &event ) { if ( !(event.LeftDown() || event.LeftDClick()) ) return; @@ -995,15 +1237,15 @@ void wxTreeCtrl::OnMouse( const wxMouseEvent &event ) if ( item == NULL ) return; - SelectItem(item); + if (!IsSelected(item)) SelectItem(item); if ( event.LeftDClick() ) { - wxTreeEvent event( wxEVT_COMMAND_TREE_KEY_DOWN, GetId() ); + wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() ); event.m_item = item; event.m_code = 0; event.SetEventObject( this ); - ProcessEvent( event ); + GetEventHandler()->ProcessEvent( event ); } if ( onButton ) @@ -1012,6 +1254,17 @@ void wxTreeCtrl::OnMouse( const wxMouseEvent &event ) } } +void wxTreeCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) ) +{ + if (!m_dirty) return; + + m_dirty = FALSE; + + CalculatePositions(); + + AdjustMyScrollbars(); +} + // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, @@ -1058,11 +1311,11 @@ void wxTreeCtrl::RefreshSubtree(wxGenericTreeItem *item) { wxClientDC dc(this); PrepareDC(dc); - + int cw = 0; int ch = 0; GetClientSize( &cw, &ch ); - + wxRect rect; rect.x = dc.LogicalToDeviceX( 0 ); rect.width = cw; @@ -1084,7 +1337,6 @@ void wxTreeCtrl::RefreshLine( wxGenericTreeItem *item ) rect.y = dc.LogicalToDeviceY( item->GetY() - 2 ); rect.width = 1000; rect.height = dc.GetCharHeight() + 6; - Refresh( TRUE, &rect ); }