X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/112c5086e85454b320cdb45f2e16dc5f34e8b9d8..d9d61c23a836b4e4f76d117d18d6b9848b915c39:/src/generic/treectrl.cpp diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp index d8ee1f1641..bb316835d7 100644 --- a/src/generic/treectrl.cpp +++ b/src/generic/treectrl.cpp @@ -28,7 +28,7 @@ #pragma hdrstop #endif -#include "wx/generic/treectrl.h" +#include "wx/treectrl.h" #include "wx/generic/imaglist.h" #include "wx/settings.h" #include "wx/log.h" @@ -157,13 +157,77 @@ private: // implementation // ============================================================================= + +// ----------------------------------------------------------------------------- +// wxTreeRenameTimer (internal) +// ----------------------------------------------------------------------------- + +wxTreeRenameTimer::wxTreeRenameTimer( wxTreeCtrl *owner ) +{ + m_owner = owner; +} + +void wxTreeRenameTimer::Notify() +{ + m_owner->OnRenameTimer(); +} + +//----------------------------------------------------------------------------- +// wxTreeTextCtrl (internal) +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxTreeTextCtrl,wxTextCtrl); + +BEGIN_EVENT_TABLE(wxTreeTextCtrl,wxTextCtrl) + EVT_CHAR (wxTreeTextCtrl::OnChar) + EVT_KILL_FOCUS (wxTreeTextCtrl::OnKillFocus) +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, + int style, const wxValidator& validator, const wxString &name ) : + wxTextCtrl( parent, id, value, pos, size, style, validator, name ) +{ + m_res = res; + m_accept = accept; + m_owner = owner; +} + +void wxTreeTextCtrl::OnChar( wxKeyEvent &event ) +{ + if (event.m_keyCode == WXK_RETURN) + { + (*m_accept) = TRUE; + (*m_res) = GetValue(); + m_owner->OnRenameAccept(); + if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); + return; + } + if (event.m_keyCode == WXK_ESCAPE) + { + (*m_accept) = FALSE; + (*m_res) = ""; + if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); + return; + } + event.Skip(); +} + +void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) ) +{ + (*m_accept) = FALSE; + (*m_res) = ""; + if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); +} + #define PIXELS_PER_UNIT 10 // ----------------------------------------------------------------------------- // wxTreeEvent // ----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent) - + wxTreeEvent::wxTreeEvent( wxEventType commandType, int id ) : wxNotifyEvent( commandType, id ) { @@ -293,8 +357,8 @@ void wxGenericTreeItem::GetSize( int &x, int &y, const wxTreeCtrl *theTree ) } wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point, - const wxTreeCtrl *theTree, - int &flags) + const wxTreeCtrl *theTree, + int &flags) { if ((point.y > m_y) && (point.y < m_y + theTree->GetLineHeight(this))) { @@ -317,12 +381,13 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point, int image_h; // assuming every image (normal and selected ) has the same size ! - if (theTree->m_imageListNormal) + if ((m_image!=-1) && theTree->m_imageListNormal) theTree->m_imageListNormal->GetSize(m_image, 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; } @@ -393,6 +458,8 @@ void wxTreeCtrl::Init() m_imageListState = (wxImageList *) NULL; m_dragCount = 0; + + m_renameTimer = new wxTreeRenameTimer( this ); } bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, @@ -410,7 +477,8 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, #endif SetBackgroundColour( *wxWHITE ); - m_dottedPen = wxPen( "GREY", 0, wxDOT ); +// m_dottedPen = wxPen( "grey", 0, wxDOT ); + m_dottedPen = wxPen( "grey", 0, 0 ); return TRUE; } @@ -420,6 +488,8 @@ wxTreeCtrl::~wxTreeCtrl() wxDELETE( m_hilightBrush ); DeleteAllItems(); + + delete m_renameTimer; } // ----------------------------------------------------------------------------- @@ -933,7 +1003,7 @@ void wxTreeCtrl::UnselectAllChildren(wxGenericTreeItem *item) wxArrayGenericTreeItems& children = item->GetChildren(); size_t count = children.Count(); for ( size_t n = 0; n < count; ++n ) - UnselectAllChildren(children[n]); + UnselectAllChildren(children[n]); } } @@ -978,7 +1048,7 @@ bool wxTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, wxGenericT wxArrayGenericTreeItems& children = crt_item->GetChildren(); size_t count = children.Count(); for ( size_t n = 0; n < count; ++n ) - if (TagAllChildrenUntilLast(children[n], last_item, select)) return TRUE; + if (TagAllChildrenUntilLast(children[n], last_item, select)) return TRUE; } return FALSE; @@ -1009,8 +1079,8 @@ void wxTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *it } void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId, - bool unselect_others, - bool extended_select) + bool unselect_others, + bool extended_select) { wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") ); @@ -1034,14 +1104,14 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId, event.SetEventObject( this ); // TODO : Here we don't send any selection mode yet ! - if ( GetEventHandler()->ProcessEvent( event ) && event.WasVetoed() ) + if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() ) return; // ctrl press if (unselect_others) { if (is_single) Unselect(); // to speed up thing - else UnselectAll(); + else UnselectAll(); } // shift press @@ -1055,13 +1125,13 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId, { bool select=TRUE; // the default - // Check if we need to toggle hilight (ctrl mode) - if (!unselect_others) - select=!item->HasHilight(); + // Check if we need to toggle hilight (ctrl mode) + if (!unselect_others) + select=!item->HasHilight(); m_current = m_key_current = item; - m_current->SetHilight(select); - RefreshLine( m_current ); + m_current->SetHilight(select); + RefreshLine( m_current ); } event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED); @@ -1077,7 +1147,7 @@ void wxTreeCtrl::FillArray(wxGenericTreeItem *item, wxArrayTreeItemIds &array) c wxArrayGenericTreeItems& children = item->GetChildren(); size_t count = children.Count(); for ( size_t n = 0; n < count; ++n ) - FillArray(children[n],array); + FillArray(children[n],array); } } @@ -1135,7 +1205,7 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId &item) m_anchor->GetSize( x, y, this ); y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels int x_pos = GetScrollPos( wxHORIZONTAL ); - // Item should appear at top + // Item should appear at top SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, item_y/PIXELS_PER_UNIT ); } else if (item_y+GetLineHeight(gitem) > start_y+client_h) @@ -1147,31 +1217,11 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId &item) y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels item_y += PIXELS_PER_UNIT+2; int x_pos = GetScrollPos( wxHORIZONTAL ); - // Item should appear at bottom + // Item should appear at bottom SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, (item_y+GetLineHeight(gitem)-client_h)/PIXELS_PER_UNIT ); } } -wxTextCtrl *wxTreeCtrl::EditLabel( const wxTreeItemId& WXUNUSED(item), - wxClassInfo* WXUNUSED(textCtrlClass) ) -{ - wxFAIL_MSG(_T("not implemented")); - - return (wxTextCtrl*)NULL; -} - -wxTextCtrl *wxTreeCtrl::GetEditControl() const -{ - wxFAIL_MSG(_T("not implemented")); - - return (wxTextCtrl*)NULL; -} - -void wxTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), bool WXUNUSED(discardChanges)) -{ - wxFAIL_MSG(_T("not implemented")); -} - // FIXME: tree sorting functions are not reentrant and not MT-safe! static wxTreeCtrl *s_treeBeingSorted = NULL; @@ -1263,7 +1313,7 @@ void wxTreeCtrl::AdjustMyScrollbars() int y = 0; m_anchor->GetSize( x, y, this ); //y += GetLineHeight(m_anchor); - y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels + y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels int x_pos = GetScrollPos( wxHORIZONTAL ); int y_pos = GetScrollPos( wxVERTICAL ); SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, y_pos ); @@ -1276,7 +1326,7 @@ void wxTreeCtrl::AdjustMyScrollbars() int wxTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const { - if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HIGHT) + if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HEIGHT) return item->GetHeight(); else return m_lineHeight; @@ -1390,12 +1440,12 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & dc.SetPen( *wxGREY_PEN ); dc.SetBrush( *wxWHITE_BRUSH ); dc.DrawRectangle( horizX+(m_indent-5), y-4, 11, 9 ); - + dc.SetPen( *wxBLACK_PEN ); dc.DrawLine( horizX+(m_indent-2), y, horizX+(m_indent+3), y ); if (!item->IsExpanded()) dc.DrawLine( horizX+m_indent, y-2, horizX+m_indent, y+3 ); - + dc.SetPen( m_dottedPen ); } @@ -1437,19 +1487,19 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & wxArrayGenericTreeItems& children = item->GetChildren(); size_t n, count = children.Count(); for ( n = 0; n < count; ++n ) - { - semiOldY=y; - PaintLevel( children[n], dc, level+1, y ); - } + { + 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) - { - semiOldY+=GetLineHeight(children[--n])/2; + { + semiOldY+=GetLineHeight(children[--n])/2; dc.DrawLine( horizX+m_indent, oldY+5, horizX+m_indent, semiOldY ); - } + } } } @@ -1586,18 +1636,18 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event ) if (!prev) { prev = GetParent( m_key_current ); - if (prev) - { + if (prev) + { long cockie = 0; wxTreeItemId current = m_key_current; if (current == GetFirstChild( prev, cockie )) { // otherwise we return to where we came from SelectItem( prev, unselect_others, extended_select ); - m_key_current=prev.m_pItem; - EnsureVisible( prev ); + m_key_current=prev.m_pItem; + EnsureVisible( prev ); break; - } + } } } if (prev) @@ -1612,7 +1662,7 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event ) } SelectItem( prev, unselect_others, extended_select ); - m_key_current=prev.m_pItem; + m_key_current=prev.m_pItem; EnsureVisible( prev ); } } @@ -1643,13 +1693,14 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event ) long cookie = 0; wxTreeItemId child = GetFirstChild( m_key_current, cookie ); SelectItem( child, unselect_others, extended_select ); - m_key_current=child.m_pItem; + m_key_current=child.m_pItem; EnsureVisible( child ); } else { wxTreeItemId next = GetNextSibling( m_key_current ); - if (next == 0) +// if (next == 0) + if (!next) { wxTreeItemId current = m_key_current; while (current && !next) @@ -1658,10 +1709,11 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event ) if (current) next = GetNextSibling( current ); } } - if (next != 0) +// if (next != 0) + if (next) { SelectItem( next, unselect_others, extended_select ); - m_key_current=next.m_pItem; + m_key_current=next.m_pItem; EnsureVisible( next ); } } @@ -1729,6 +1781,55 @@ wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags) return m_anchor->HitTest( wxPoint(x, y), this, flags); } +/* **** */ + +void wxTreeCtrl::Edit( const wxTreeItemId& item ) +{ + if (!item.IsOk()) return; + + m_currentEdit = item.m_pItem; + + wxTreeEvent te( wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, GetId() ); + te.m_item = m_currentEdit; + te.SetEventObject( this ); + GetEventHandler()->ProcessEvent( te ); + + if (!te.IsAllowed()) return; + + wxString s = m_currentEdit->GetText(); + int x = m_currentEdit->GetX(); + int y = m_currentEdit->GetY(); + int w = m_currentEdit->GetWidth(); + int h = m_currentEdit->GetHeight(); + + wxClientDC dc(this); + PrepareDC( dc ); + x = dc.LogicalToDeviceX( x ); + y = dc.LogicalToDeviceY( y ); + + wxTreeTextCtrl *text = new wxTreeTextCtrl( + this, -1, &m_renameAccept, &m_renameRes, this, s, wxPoint(x-4,y-4), wxSize(w+11,h+8) ); + text->SetFocus(); +} + +void wxTreeCtrl::OnRenameTimer() +{ + Edit( m_current ); +} + +void wxTreeCtrl::OnRenameAccept() +{ + wxTreeEvent le( wxEVT_COMMAND_TREE_END_LABEL_EDIT, GetId() ); + le.m_item = m_currentEdit; + le.SetEventObject( this ); + le.m_label = m_renameRes; + GetEventHandler()->ProcessEvent( le ); + + if (!le.IsAllowed()) return; + + /* DO CHANGE LABEL */ +} + void wxTreeCtrl::OnMouse( wxMouseEvent &event ) { if (!event.LeftIsDown()) m_dragCount = 0; @@ -1766,6 +1867,14 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event ) return; } + if (event.LeftUp() && (item == m_current) && + (flags & wxTREE_HITTEST_ONITEMLABEL) && + HasFlag(wxTR_EDIT_LABELS) ) + { + m_renameTimer->Start( 100, TRUE ); + return; + } + bool is_multiple=(GetWindowStyleFlag() & wxTR_MULTIPLE); bool extended_select=(event.ShiftDown() && is_multiple); bool unselect_others=!(extended_select || (event.ControlDown() && is_multiple)); @@ -1773,7 +1882,8 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event ) if (onButton) { Toggle( item ); - if (is_multiple) return; + if (is_multiple) + return; } SelectItem(item, unselect_others, extended_select);