X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff5bf2590f02b5585c358b65eeeb6463e100a004..e459f82d0110709444984bf739314f4a84de48d3:/src/generic/treectrl.cpp diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp index e6f33a0259..e81bbabc66 100644 --- a/src/generic/treectrl.cpp +++ b/src/generic/treectrl.cpp @@ -21,18 +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); // ----------------------------------------------------------------------------- @@ -68,6 +78,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; } @@ -79,6 +91,10 @@ public: wxGenericTreeItem *GetParent() const { return m_parent; } // operations + // deletes all children notifying the treectrl about it if !NULL pointer + // given + void DeleteChildren(wxTreeCtrl *tree = NULL); + // FIXME don't know what is it for void Reset(); // get count of all children (and grand children if 'recursively') @@ -105,6 +121,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; @@ -114,11 +131,12 @@ private: 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; @@ -136,10 +154,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; @@ -167,6 +185,7 @@ wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent, m_isCollapsed = TRUE; m_hasHilight = FALSE; m_hasPlus = FALSE; + m_isBold = FALSE; m_parent = parent; @@ -177,9 +196,26 @@ wxGenericTreeItem::~wxGenericTreeItem() { delete m_data; + wxASSERT_MSG( m_children.IsEmpty(), + _T("please call DeleteChildren() before deleting the item") ); +} + +void wxGenericTreeItem::DeleteChildren(wxTreeCtrl *tree) +{ size_t count = m_children.Count(); for ( size_t n = 0; n < count; n++ ) - delete m_children[n]; + { + wxGenericTreeItem *child = m_children[n]; + if ( tree ) + { + tree->SendDeleteEvent(child); + } + + child->DeleteChildren(tree); + delete child; + } + + m_children.Empty(); } void wxGenericTreeItem::SetText( const wxString &text, wxDC& dc ) @@ -202,7 +238,7 @@ void wxGenericTreeItem::Reset() m_level = 0; - m_children.Empty(); + DeleteChildren(); m_isCollapsed = TRUE; m_parent = (wxGenericTreeItem *)NULL; @@ -231,7 +267,6 @@ void wxGenericTreeItem::SetCross( int x, int y ) void wxGenericTreeItem::GetSize( int &x, int &y ) { - // FIXME what does this all mean?? if ( y < m_y ) y = m_y; int width = m_x + m_width; if (width > x) x = width; @@ -252,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())) @@ -260,7 +296,12 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point, return this; } - if ((point.x > m_x) && (point.x < m_x+m_width)) + /* 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 += 24; + + if ((point.x > m_x) && (point.x < m_x+w)) { onButton = FALSE; return this; @@ -295,6 +336,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() // ----------------------------------------------------------------------------- @@ -305,11 +347,13 @@ void wxTreeCtrl::Init() m_current = m_anchor = (wxGenericTreeItem *) NULL; m_hasFocus = FALSE; + m_dirty = FALSE; m_xScroll = 0; m_yScroll = 0; m_lineHeight = 10; m_indent = 15; + m_spacing = 18; m_hilightBrush = new wxBrush ( @@ -319,15 +363,21 @@ 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 wxString& name ) + long style, + const wxValidator &validator, + const wxString& name ) { Init(); - wxScrolledWindow::Create( parent, id, pos, size, style, name ); + wxScrolledWindow::Create( parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name ); + + SetValidator( validator ); SetBackgroundColour( *wxWHITE ); m_dottedPen = wxPen( *wxBLACK, 0, 0 ); @@ -338,7 +388,8 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, wxTreeCtrl::~wxTreeCtrl() { wxDELETE( m_hilightBrush ); - wxDELETE( m_anchor ); + + DeleteAllItems(); } // ----------------------------------------------------------------------------- @@ -353,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); } @@ -369,66 +428,87 @@ 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") ); + + wxGenericTreeItem *pItem = item.m_pItem; + pItem->SetHasPlus(has); + RefreshLine(pItem); +} + +void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold) +{ + wxCHECK_RET( item.IsOk(), _T("invalid tree item") ); - item.m_pItem->SetHasPlus(has); + // avoid redrawing the tree if no real change + wxGenericTreeItem *pItem = item.m_pItem; + if ( pItem->IsBold() != bold ) + { + pItem->SetBold(bold); + RefreshLine(pItem); + } } // ----------------------------------------------------------------------------- @@ -437,46 +517,53 @@ void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has) 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, _T("invalid tree item") ); + + return item.m_pItem->IsBold(); +} + // ----------------------------------------------------------------------------- // navigation // ----------------------------------------------------------------------------- wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const { - wxCHECK_MSG( item.IsOk(), NULL, "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(), NULL, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") ); cookie = 0; return GetNextChild(item, cookie); @@ -484,82 +571,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(), _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 { // there are no more of them - return NULL; + return wxTreeItemId(); } } +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(), NULL, "invalid tree item" ); + wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("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(), _T("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"); + wxFAIL_MSG(_T("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(), _T("invalid tree item") ); - wxFAIL_MSG("not implemented"); + wxFAIL_MSG(_T("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(), _T("invalid tree item") ); - wxFAIL_MSG("not implemented"); + wxFAIL_MSG(_T("not implemented")); - return NULL; + return wxTreeItemId(); } // ----------------------------------------------------------------------------- @@ -592,32 +688,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; } @@ -626,7 +697,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(), _T("tree can have only one root") ); wxClientDC dc(this); m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text, dc, @@ -664,8 +735,8 @@ wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parentId, } int index = parent->GetChildren().Index(idPrevious.m_pItem); - wxASSERT_MSG( index != NOT_FOUND, - "previous item in wxTreeCtrl::InsertItem() is not a sibling" ); + wxASSERT_MSG( index != wxNOT_FOUND, + _T("previous item in wxTreeCtrl::InsertItem() is not a sibling") ); return DoInsertItem(parentId, (size_t)index, text, image, selImage, data); } @@ -685,6 +756,22 @@ wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parentId, image, selImage, data); } +void wxTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item) +{ + wxTreeEvent event( wxEVT_COMMAND_TREE_DELETE_ITEM, GetId() ); + event.m_item = item; + event.SetEventObject( this ); + ProcessEvent( event ); +} + +void wxTreeCtrl::DeleteChildren(const wxTreeItemId& itemId) +{ + wxGenericTreeItem *item = itemId.m_pItem; + item->DeleteChildren(this); + + m_dirty = TRUE; +} + void wxTreeCtrl::Delete(const wxTreeItemId& itemId) { wxGenericTreeItem *item = itemId.m_pItem; @@ -695,19 +782,23 @@ void wxTreeCtrl::Delete(const wxTreeItemId& itemId) parent->GetChildren().Remove(item); } + item->DeleteChildren(this); + SendDeleteEvent(item); delete item; - Refresh(); + m_dirty = TRUE; } void wxTreeCtrl::DeleteAllItems() { if ( m_anchor ) { + m_anchor->DeleteChildren(this); delete m_anchor; + m_anchor = NULL; - Refresh(); + m_dirty = TRUE; } } @@ -715,6 +806,9 @@ void wxTreeCtrl::Expand(const wxTreeItemId& itemId) { wxGenericTreeItem *item = itemId.m_pItem; + if ( !item->HasPlus() ) + return; + if ( item->IsExpanded() ) return; @@ -728,6 +822,7 @@ void wxTreeCtrl::Expand(const wxTreeItemId& itemId) } item->Expand(); + CalculatePositions(); RefreshSubtree(item); @@ -771,7 +866,7 @@ void wxTreeCtrl::Collapse(const wxTreeItemId& itemId) void wxTreeCtrl::CollapseAndReset(const wxTreeItemId& item) { Collapse(item); - Delete(item); + DeleteChildren(item); } void wxTreeCtrl::Toggle(const wxTreeItemId& itemId) @@ -803,7 +898,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 ) @@ -817,50 +912,118 @@ 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& WXUNUSED(item)) +void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item) { - wxFAIL_MSG("not implemented"); + 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 ); + + 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-client_h/2)/10 ); + } + else if (item_y > start_y+client_h-20) + { + 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-client_h/2)/10 ); + } } 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 NULL; + return (wxTextCtrl*)NULL; } wxTextCtrl *wxTreeCtrl::GetEditControl() const { - wxFAIL_MSG("not implemented"); + wxFAIL_MSG(_T("not implemented")); - return NULL; + 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! +static wxTreeCtrl *s_treeBeingSorted = NULL; + +static int tree_ctrl_compare_func(wxGenericTreeItem **item1, + wxGenericTreeItem **item2) +{ + wxCHECK_MSG( s_treeBeingSorted, 0, _T("bug in wxTreeCtrl::SortChildren()") ); + + return s_treeBeingSorted->OnCompareItems(*item1, *item2); } -void wxTreeCtrl::SortChildren( const wxTreeItemId& WXUNUSED(item), - wxTreeItemCmpFunc *WXUNUSED(cmpFunction)) +int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1, + const wxTreeItemId& item2) { - wxFAIL_MSG("not implemented"); + return wxStrcmp(GetItemText(item1), GetItemText(item2)); +} + +void wxTreeCtrl::SortChildren(const wxTreeItemId& itemId) +{ + wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") ); + + wxGenericTreeItem *item = itemId.m_pItem; + + wxCHECK_RET( !s_treeBeingSorted, + _T("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 } -// ----------------------------------------------------------------------------- -// images are not currently supported, but we still provide stubs for these -// functions -// ----------------------------------------------------------------------------- wxImageList *wxTreeCtrl::GetImageList() const { return m_imageListNormal; @@ -873,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) @@ -884,294 +1061,556 @@ void wxTreeCtrl::SetStateImageList(wxImageList *imageList) // ----------------------------------------------------------------------------- // helpers // ----------------------------------------------------------------------------- + void wxTreeCtrl::AdjustMyScrollbars() { - if (m_anchor) - { - int x = 0; - int y = 0; - m_anchor->GetSize( x, y ); - y += 2*m_lineHeight; - int x_pos = GetScrollPos( wxHORIZONTAL ); - int y_pos = GetScrollPos( wxVERTICAL ); - SetScrollbars( 10, 10, x/10, y/10, x_pos, y_pos ); - } - else - { - SetScrollbars( 0, 0, 0, 0 ); - } + if (m_anchor) + { + int x = 0; + int y = 0; + m_anchor->GetSize( x, y ); + y += 2*m_lineHeight; + int x_pos = GetScrollPos( wxHORIZONTAL ); + int y_pos = GetScrollPos( wxVERTICAL ); + SetScrollbars( 10, 10, x/10, y/10, x_pos, y_pos ); + } + else + { + SetScrollbars( 0, 0, 0, 0 ); + } } -void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y ) +void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) { - int horizX = level*m_indent; - - item->SetX( horizX+33 ); - item->SetY( y-m_lineHeight/3 ); - item->SetHeight( m_lineHeight ); + // render bold items in bold + wxFont fontOld; + wxFont fontNew; - item->SetCross( horizX+15, y ); - - int oldY = y; - - 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 (!item->HasChildren()) endX += 20; + if (item->IsBold()) + { + fontOld = dc.GetFont(); + if (fontOld.Ok()) + { + // VZ: is there any better way to make a bold variant of old font? + fontNew = wxFont( fontOld.GetPointSize(), + fontOld.GetFamily(), + fontOld.GetStyle(), + wxBOLD, + fontOld.GetUnderlined()); + dc.SetFont(fontNew); + } + else + { + wxFAIL_MSG(_T("wxDC::GetFont() failed!")); + } + } - dc.DrawLine( startX, y, endX, y ); + long text_w = 0; + long text_h = 0; + dc.GetTextExtent( item->GetText(), &text_w, &text_h ); - if (item->HasPlus()) + int image_h = 0; + int image_w = 0; + if ((item->IsExpanded()) && (item->GetSelectedImage() != -1)) { - dc.DrawLine( horizX+20, y, horizX+30, y ); - dc.SetPen( *wxGREY_PEN ); - 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 ); + m_imageListNormal->GetSize( item->GetSelectedImage(), image_w, image_h ); + image_w += 4; } - - if (item->HasHilight()) + else if (item->GetImage() != -1) { - dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); - dc.SetBrush( *m_hilightBrush ); - - 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; - } - - if (m_hasFocus) - dc.SetPen( *wxBLACK_PEN ); - else - dc.SetPen( *wxTRANSPARENT_PEN ); + } - 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->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 ); + 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(); - } - dc.DrawText( item->GetText(), image_w+item->GetX(), item->GetY() ); - - dc.SetPen( *wxBLACK_PEN ); - dc.SetTextForeground( *wxBLACK ); - dc.SetBrush( *wxWHITE_BRUSH ); } - else + else if (item->GetImage() != -1) { - dc.SetBrush( *wxWHITE_BRUSH ); - dc.SetPen( *wxTRANSPARENT_PEN ); - - long text_w = 0; - long text_h = 0; - dc.GetTextExtent( item->GetText(), &text_w, &text_h ); + 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(); + } - 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.SetBackgroundMode(wxTRANSPARENT); + dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY() + + ((total_h > text_h) ? (total_h - text_h)/2 : 0)); - dc.DrawRectangle( item->GetX()-2, item->GetY()-2, image_w+text_w+4, text_h+4 ); + // restore normal font for bold items + if (fontOld.Ok()) + { + dc.SetFont( fontOld); + } +} - 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(); - } +void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y ) +{ + int horizX = level*m_indent; - dc.DrawText( item->GetText(), image_w+item->GetX(), item->GetY() ); - dc.SetPen( *wxBLACK_PEN ); - } - } + item->SetX( horizX+m_indent+m_spacing ); + item->SetY( y-m_lineHeight/2 ); + item->SetHeight( m_lineHeight ); - if ( !item->IsExpanded() ) - return; + item->SetCross( horizX+m_indent, y ); - int semiOldY = y; + int oldY = y; - wxArrayTreeItems& children = item->GetChildren(); - size_t count = children.Count(); - for ( size_t n = 0; n < count; n++ ) - { - y += m_lineHeight; - semiOldY = y; + int exposed_x = dc.LogicalToDeviceX( 0 ); + int exposed_y = dc.LogicalToDeviceY( item->GetY()-2 ); - PaintLevel( children[n], dc, level+1, y ); - } + if (IsExposed( exposed_x, exposed_y, 10000, m_lineHeight+4 )) // 10000 = very much + { + int startX = horizX; + 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+(m_indent+5), y, horizX+(m_indent+15), y ); + 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 ); + } + } + + if (item->HasHilight()) + { + dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); + + dc.SetBrush( *m_hilightBrush ); + + if (m_hasFocus) + dc.SetPen( *wxBLACK_PEN ); + else + dc.SetPen( *wxTRANSPARENT_PEN ); + + PaintItem(item, dc); + + dc.SetPen( *wxBLACK_PEN ); + dc.SetTextForeground( *wxBLACK ); + dc.SetBrush( *wxWHITE_BRUSH ); + } + else + { + dc.SetBrush( *wxWHITE_BRUSH ); + dc.SetPen( *wxTRANSPARENT_PEN ); + + PaintItem(item, dc); + + dc.SetPen( *wxBLACK_PEN ); + } + } - dc.DrawLine( horizX+15, oldY+5, horizX+15, semiOldY ); + 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; + 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+m_indent, oldY+5, horizX+m_indent, semiOldY ); + } } // ----------------------------------------------------------------------------- // wxWindows callbacks // ----------------------------------------------------------------------------- -void wxTreeCtrl::OnPaint( const wxPaintEvent &WXUNUSED(event) ) +void wxTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) ) { - if ( !m_anchor ) - return; + if ( !m_anchor ) + return; - wxPaintDC dc(this); - PrepareDC( dc ); + 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); + dc.SetPen( m_dottedPen ); + if(GetImageList() == NULL) + m_lineHeight = (int)(dc.GetCharHeight() + 4); - int y = m_lineHeight / 2 + 2; - PaintLevel( m_anchor, dc, 0, y ); + int y = m_lineHeight / 2 + 2; + 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 ); + 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 ) - RefreshLine( m_current ); + m_hasFocus = FALSE; + + if (m_current) RefreshLine( m_current ); } 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; + + // 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; + + // left arrow goes to the parent + case WXK_LEFT: + { + wxTreeItemId 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) && 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 ); + } + } + } + break; + + // 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(); + } } -void wxTreeCtrl::OnMouse( const wxMouseEvent &event ) +wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& WXUNUSED(flags)) { - if ( !(event.LeftDown() || event.LeftDClick()) ) - return; + wxClientDC dc(this); + PrepareDC(dc); + long x = dc.DeviceToLogicalX( (long)point.x ); + long y = dc.DeviceToLogicalY( (long)point.y ); - if ( !m_anchor ) - return; + bool onButton = FALSE; + return m_anchor->HitTest( wxPoint(x, y), onButton ); +} - wxClientDC dc(this); - PrepareDC(dc); - long x = dc.DeviceToLogicalX( (long)event.GetX() ); - long y = dc.DeviceToLogicalY( (long)event.GetY() ); +void wxTreeCtrl::OnMouse( wxMouseEvent &event ) +{ + if (!event.LeftIsDown()) m_dragCount = 0; - bool onButton = FALSE; - wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), onButton ); - if ( item == NULL ) - return; + if ( !(event.LeftDown() || event.LeftDClick() || event.Dragging()) ) return; - SelectItem(item); + if ( !m_anchor ) return; - if ( event.LeftDClick() ) - { - wxTreeEvent event( wxEVT_COMMAND_TREE_KEY_DOWN, GetId() ); - event.m_item = item; - event.m_code = 0; - event.SetEventObject( this ); - ProcessEvent( event ); - } + wxClientDC dc(this); + PrepareDC(dc); + long x = dc.DeviceToLogicalX( (long)event.GetX() ); + long y = dc.DeviceToLogicalY( (long)event.GetY() ); - if ( onButton ) - { - Toggle( item ); - } + bool onButton = FALSE; + wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), onButton ); + + if (item == NULL) return; /* we hit the blank area */ + + 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) ) +{ + /* after all changes have been done to the tree control, + * we actually redraw the tree when everything is over */ + + if (!m_dirty) + return; + + m_dirty = FALSE; + + 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+m_indent+m_spacing ); + 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 ); + 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; + 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 ); + Refresh( TRUE, &rect ); }