X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9dfbf520eb3f8ed03416c72222bb4ee74b8fcb0e..0616b8382daeca5373484e5a22ec1f322c025c95:/src/generic/treectrl.cpp diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp index 1e6e008231..21f0441055 100644 --- a/src/generic/treectrl.cpp +++ b/src/generic/treectrl.cpp @@ -950,7 +950,7 @@ void wxTreeCtrl::Collapse(const wxTreeItemId& itemId) wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId() ); event.m_item = item; event.SetEventObject( this ); - if ( ProcessEvent( event ) && event.m_code ) + if ( ProcessEvent( event ) && !event.IsAllowed() ) { // cancelled by program return; @@ -1090,18 +1090,25 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId, wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") ); bool is_single=!(GetWindowStyleFlag() & wxTR_MULTIPLE); + wxGenericTreeItem *item = itemId.m_pItem; //wxCHECK_RET( ( (!unselect_others) && is_single), // _T("this is a single selection tree") ); // to keep going anyhow !!! if (is_single) - { + { + if (item->HasHilight()) return; // nothing to do unselect_others=TRUE; extended_select=FALSE; - } - - wxGenericTreeItem *item = itemId.m_pItem; + } + else // check if selection will really change + if (unselect_others && item->HasHilight()) + { + // selection change if there is more than one item currently selected + wxArrayTreeItemIds selected_items; + if (GetSelections(selected_items)==1) return; + } wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGING, GetId() ); event.m_item = item; @@ -1174,14 +1181,13 @@ void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item) // first expand all parent branches wxGenericTreeItem *parent = gitem->GetParent(); - while ( parent && !parent->IsExpanded() ) + while ( parent ) { - Expand(parent); - + Expand(parent); parent = parent->GetParent(); } - if (parent) CalculatePositions(); + //if (parent) CalculatePositions(); ScrollTo(item); } @@ -1190,11 +1196,16 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId &item) { if (!item.IsOk()) return; + // We have to call this here because the label in + // question might just have been added and no screen + // update taken place. + if (m_dirty) wxYield(); + wxGenericTreeItem *gitem = item.m_pItem; // now scroll to the item int item_y = gitem->GetY(); - + int start_x = 0; int start_y = 0; ViewStart( &start_x, &start_y ); @@ -1285,7 +1296,7 @@ void wxTreeCtrl::SetImageList(wxImageList *imageList) // May be toggle off. Then wxTreeCtrl will spread when // necessary (which might look ugly). #if 1 - wxPaintDC dc(this); + wxClientDC dc(this); m_lineHeight = (int)(dc.GetCharHeight() + 4); int width = 0, @@ -1333,10 +1344,10 @@ void wxTreeCtrl::AdjustMyScrollbars() int wxTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const { - if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HEIGHT) - return item->GetHeight(); - else - return m_lineHeight; + if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HEIGHT) + return item->GetHeight(); + else + return m_lineHeight; } void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) @@ -1429,9 +1440,9 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int & item->SetCross( horizX+m_indent, y ); int exposed_x = dc.LogicalToDeviceX( 0 ); - int exposed_y = dc.LogicalToDeviceY( item->GetY()-2 ); + int exposed_y = dc.LogicalToDeviceY( item->GetY() ); - if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item)+4 )) // 10000 = very much + if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item) )) // 10000 = very much { int startX = horizX; int endX = horizX + (m_indent-5); @@ -1516,7 +1527,7 @@ void wxTreeCtrl::DrawBorder(wxTreeItemId &item) wxGenericTreeItem *i=item.m_pItem; - wxPaintDC dc(this); + wxClientDC dc(this); PrepareDC( dc ); dc.SetLogicalFunction(wxINVERT); @@ -1535,7 +1546,7 @@ void wxTreeCtrl::DrawLine(wxTreeItemId &item, bool below) wxGenericTreeItem *i=item.m_pItem; - wxPaintDC dc(this); + wxClientDC dc(this); PrepareDC( dc ); dc.SetLogicalFunction(wxINVERT); @@ -1772,6 +1783,11 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event ) wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags) { + // We have to call this here because the label in + // question might just have been added and no screen + // update taken place. + if (m_dirty) wxYield(); + wxClientDC dc(this); PrepareDC(dc); long x = dc.DeviceToLogicalX( (long)point.x ); @@ -1802,6 +1818,11 @@ void wxTreeCtrl::Edit( const wxTreeItemId& item ) GetEventHandler()->ProcessEvent( te ); if (!te.IsAllowed()) return; + + // We have to call this here because the label in + // question might just have been added and no screen + // update taken place. + if (m_dirty) wxYield(); wxString s = m_currentEdit->GetText(); int x = m_currentEdit->GetX(); @@ -1854,8 +1875,6 @@ void wxTreeCtrl::OnRenameAccept() void wxTreeCtrl::OnMouse( wxMouseEvent &event ) { - if (!event.LeftIsDown()) m_dragCount = 0; - if ( !(event.LeftUp() || event.LeftDClick() || event.Dragging()) ) return; if ( !m_anchor ) return; @@ -1869,26 +1888,31 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event ) wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), this, flags); bool onButton = flags & wxTREE_HITTEST_ONITEMBUTTON; - 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 (m_dragCount == 0) + m_dragStart = wxPoint(x,y); + + m_dragCount++; + + if (m_dragCount != 3) return; + + int command = wxEVT_COMMAND_TREE_BEGIN_DRAG; + if (event.RightIsDown()) command = wxEVT_COMMAND_TREE_BEGIN_RDRAG; + + wxTreeEvent nevent( command, GetId() ); + nevent.m_item = m_current; + nevent.SetEventObject(this); + GetEventHandler()->ProcessEvent(nevent); + return; + } + else + { + m_dragCount = 0; } + if (item == NULL) return; /* we hit the blank area */ + if (event.LeftUp() && (item == m_current) && (flags & wxTREE_HITTEST_ONITEMLABEL) && HasFlag(wxTR_EDIT_LABELS) ) @@ -2031,7 +2055,7 @@ void wxTreeCtrl::CalculatePositions() //if(GetImageList() == NULL) // m_lineHeight = (int)(dc.GetCharHeight() + 4); - int y = 2; //GetLineHeight(m_anchor) / 2 + 2; + int y = 2; CalculateLevel( m_anchor, dc, 0, y ); // start recursion } @@ -2060,10 +2084,14 @@ void wxTreeCtrl::RefreshLine( wxGenericTreeItem *item ) wxClientDC dc(this); PrepareDC( dc ); + int cw = 0; + int ch = 0; + GetClientSize( &cw, &ch ); + wxRect rect; - rect.x = dc.LogicalToDeviceX( item->GetX() - 2 ); - rect.y = dc.LogicalToDeviceY( item->GetY()); - rect.width = 1000; + rect.x = dc.LogicalToDeviceX( 0 ); + rect.y = dc.LogicalToDeviceY( item->GetY() ); + rect.width = cw; rect.height = GetLineHeight(item); //dc.GetCharHeight() + 6; Refresh( TRUE, &rect );