X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0326c494a9b12442a12a4c004dbf44fbda5387bf..53997bc265b691aaf12fafd259a5a2d2a27b0565:/src/generic/treectlg.cpp diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index 0984a23ed2..2650eac81d 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -25,9 +25,11 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_TREECTRL + #include "wx/generic/treectlg.h" #include "wx/imaglist.h" #include "wx/settings.h" @@ -298,23 +300,23 @@ void wxTreeTextCtrl::OnChar( wxKeyEvent &event ) { (*m_accept) = TRUE; (*m_res) = GetValue(); - + if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); if ((*m_accept) && ((*m_res) != m_startValue)) m_owner->OnRenameAccept(); - + return; } if (event.m_keyCode == WXK_ESCAPE) { (*m_accept) = FALSE; (*m_res) = ""; - + if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this); - + return; } event.Skip(); @@ -331,7 +333,7 @@ void wxTreeTextCtrl::OnKeyUp( wxKeyEvent &event ) if (myPos.x + sx > parentSize.x) sx = parentSize.x - myPos.x; if (mySize.x > sx) sx = mySize.x; SetSize(sx, -1); - + event.Skip(); } @@ -632,7 +634,7 @@ void wxGenericTreeCtrl::Init() m_imageListNormal = m_imageListState = (wxImageList *) NULL; - m_ownsImageListNormal = + m_ownsImageListNormal = m_ownsImageListState = FALSE; m_dragCount = 0; @@ -664,6 +666,7 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent, wxWindowID id, #endif SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) ); + // m_dottedPen = wxPen( "grey", 0, wxDOT ); too slow under XFree86 m_dottedPen = wxPen( "grey", 0, 0 ); @@ -818,6 +821,21 @@ void wxGenericTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font RefreshLine(pItem); } +bool wxGenericTreeCtrl::SetFont( const wxFont &font ) +{ + wxScrolledWindow::SetFont(font); + + m_normalFont = font ; + m_boldFont = wxFont( m_normalFont.GetPointSize(), + m_normalFont.GetFamily(), + m_normalFont.GetStyle(), + wxBOLD, + m_normalFont.GetUnderlined()); + + return TRUE; +} + + // ----------------------------------------------------------------------------- // item status inquiries // ----------------------------------------------------------------------------- @@ -826,15 +844,15 @@ bool wxGenericTreeCtrl::IsVisible(const wxTreeItemId& item) const { wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") ); - // An item is only visible if it's not a descendant of a collapsed item + // An item is only visible if it's not a descendant of a collapsed item wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem; - wxGenericTreeItem* parent = pItem->GetParent(); - while (parent) - { - if (!parent->IsExpanded()) - return FALSE; - parent = parent->GetParent(); - } + wxGenericTreeItem* parent = pItem->GetParent(); + while (parent) + { + if (!parent->IsExpanded()) + return FALSE; + parent = parent->GetParent(); + } int startX, startY; GetViewStart(& startX, & startY); @@ -844,8 +862,8 @@ bool wxGenericTreeCtrl::IsVisible(const wxTreeItemId& item) const wxRect rect; if (!GetBoundingRect(item, rect)) return FALSE; - if (rect.GetWidth() == 0 || rect.GetHeight() == 0) - return FALSE; + if (rect.GetWidth() == 0 || rect.GetHeight() == 0) + return FALSE; if (rect.GetBottom() < 0 || rect.GetTop() > clientSize.y) return FALSE; if (rect.GetRight() < 0 || rect.GetLeft() > clientSize.x) @@ -1024,10 +1042,10 @@ wxTreeItemId wxGenericTreeCtrl::GetNextVisible(const wxTreeItemId& item) const wxTreeItemId id = item; while (id.IsOk()) { - id = GetNext(id); + id = GetNext(id); - if (id.IsOk() && IsVisible(id)) - return id; + if (id.IsOk() && IsVisible(id)) + return id; } return wxTreeItemId(); } @@ -1467,6 +1485,17 @@ void wxGenericTreeCtrl::SelectItem(const wxTreeItemId& itemId, if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() ) return; + wxTreeItemId parent = GetParent( itemId ); + while (parent.IsOk()) + { + if (!IsExpanded(parent)) + Expand( parent ); + + parent = GetParent( parent ); + } + + EnsureVisible( itemId ); + // ctrl press if (unselect_others) { @@ -1566,7 +1595,7 @@ void wxGenericTreeCtrl::ScrollTo(const wxTreeItemId &item) int start_x = 0; int start_y = 0; - ViewStart( &start_x, &start_y ); + GetViewStart( &start_x, &start_y ); start_y *= PIXELS_PER_UNIT; int client_h = 0; @@ -1770,7 +1799,22 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) dc.SetBrush(wxBrush(colBg, wxSOLID)); } - dc.DrawRectangle( item->GetX()-2, item->GetY(), item->GetWidth()+2, total_h ); + int offset = 0; + if (HasFlag(wxTR_ROW_LINES)) offset = 1; + + if (item->IsSelected() && image != NO_IMAGE) + { + // If it's selected, and there's an image, then we should + // take care to leave the area under the image painted in the + // background colour. + dc.DrawRectangle( item->GetX() + image_w - 2, item->GetY()+offset, + item->GetWidth() - image_w + 2, total_h-offset ); + } + else + { + dc.DrawRectangle( item->GetX()-2, item->GetY()+offset, + item->GetWidth()+2, total_h-offset ); + } if ( image != NO_IMAGE ) { @@ -1795,46 +1839,79 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc) // Now y stands for the top of the item, whereas it used to stand for middle ! void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y ) { - int horizX = level*m_indent; + int x = (level+1)*m_indent; - item->SetX( horizX+m_indent+m_spacing ); + item->SetX( x+m_spacing ); item->SetY( y ); int oldY = y; y+=GetLineHeight(item)/2; - item->SetCross( horizX+m_indent, y ); + item->SetCross( x, y ); int exposed_x = dc.LogicalToDeviceX( 0 ); int exposed_y = dc.LogicalToDeviceY( item->GetY() ); - bool drawLines = ((GetWindowStyle() & wxTR_NO_LINES) == 0); + bool drawLines = (!HasFlag(wxTR_NO_LINES) && !HasFlag(wxTR_MAC_BUTTONS)); if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item) )) // 10000 = very much { - int startX = horizX; - int endX = horizX + (m_indent-5); + int startX = x - m_indent; + int endX = x-5; -// if (!item->HasChildren()) endX += (m_indent+5); if (!item->HasChildren()) endX += 20; - - if (drawLines) - dc.DrawLine( startX, y, endX, y ); - - if (item->HasPlus()) + + if (HasFlag( wxTR_MAC_BUTTONS )) + { + if (item->HasPlus()) + { + dc.SetPen( *wxBLACK_PEN ); + dc.SetBrush( *m_hilightBrush ); + + wxPoint button[3]; + + if (item->IsExpanded()) + { + button[0].x = x-5; + button[0].y = y-2; + button[1].x = x+5; + button[1].y = y-2; + button[2].x = x; + button[2].y = y+3; + } + else + { + button[0].y = y-5; + button[0].x = x-2; + button[1].y = y+5; + button[1].x = x-2; + button[2].y = y; + button[2].x = x+3; + } + dc.DrawPolygon( 3, button ); + + dc.SetPen( m_dottedPen ); + } + } + else { if (drawLines) - 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.DrawLine( startX, y, endX, y ); - 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 ); + if (item->HasPlus()) + { + if (drawLines) + dc.DrawLine( x+5, y, x+15, y ); + dc.SetPen( *wxGREY_PEN ); + dc.SetBrush( *wxWHITE_BRUSH ); + dc.DrawRectangle( x-5, y-4, 11, 9 ); + + dc.SetPen( *wxBLACK_PEN ); + dc.DrawLine( x-2, y, x+3, y ); + if (!item->IsExpanded()) + dc.DrawLine( x, y-2, x, y+3 ); + dc.SetPen( m_dottedPen ); + } } wxPen *pen = wxTRANSPARENT_PEN; @@ -1844,8 +1921,13 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level { colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ); +#ifdef __WXMAC__ + // no rect outline, we already have the background color + pen = wxTRANSPARENT_PEN; +#else if ( m_hasFocus ) pen = wxBLACK_PEN; +#endif } else @@ -1864,6 +1946,13 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level // draw PaintItem(item, dc); + if (HasFlag( wxTR_ROW_LINES )) + { + dc.SetPen( *wxWHITE_PEN ); + dc.DrawLine( 0, oldY, 10000, oldY ); + dc.DrawLine( 0, oldY + GetLineHeight(item), 10000, oldY + GetLineHeight(item) ); + } + // restore DC objects dc.SetBrush( *wxWHITE_BRUSH ); dc.SetPen( m_dottedPen ); @@ -1892,7 +1981,7 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level { semiOldY+=GetLineHeight(children[--n])/2; if (drawLines) - dc.DrawLine( horizX+m_indent, oldY+5, horizX+m_indent, semiOldY ); + dc.DrawLine( x, oldY+5, x, semiOldY ); } } } @@ -2203,7 +2292,9 @@ wxTreeItemId wxGenericTreeCtrl::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) wxYieldIfNeeded(); + // JACS: removed this because the yield can cause the window to be + // deleted from under us if a close window event is pending + // if (m_dirty) wxYieldIfNeeded(); wxClientDC dc(this); PrepareDC(dc); @@ -2227,7 +2318,7 @@ wxTreeItemId wxGenericTreeCtrl::HitTest(const wxPoint& point, int& flags) // get the bounding rectangle of the item (or of its label only) bool wxGenericTreeCtrl::GetBoundingRect(const wxTreeItemId& item, wxRect& rect, - bool textOnly) const + bool WXUNUSED(textOnly)) const { wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid item in wxGenericTreeCtrl::GetBoundingRect") ); @@ -2237,10 +2328,10 @@ bool wxGenericTreeCtrl::GetBoundingRect(const wxTreeItemId& item, GetViewStart(& startX, & startY); rect.x = i->GetX() - startX*PIXELS_PER_UNIT; - rect.y = i->GetY() - startY*PIXELS_PER_UNIT; + rect.y = i->GetY() - startY*PIXELS_PER_UNIT; rect.width = i->GetWidth(); - //rect.height = i->GetHeight(); - rect.height = GetLineHeight(i); + //rect.height = i->GetHeight(); + rect.height = GetLineHeight(i); return TRUE; } @@ -2282,34 +2373,26 @@ void wxGenericTreeCtrl::Edit( const wxTreeItemId& item ) m_imageListNormal->GetSize( image, image_w, image_h ); image_w += 4; } - else // !RightDown() && !LeftUp() ==> LeftDown() || LeftDClick() + else { wxFAIL_MSG(_T("you must create an image list to use images!")); } } x += image_w; w -= image_w + 4; // I don't know why +4 is needed - if ( flags & wxTREE_HITTEST_ONITEMBUTTON ) - { - // only toggle the item for a single click, double click on - // the button doesn't do anything (it toggles the item twice) - if ( event.LeftDown() ) - { - Toggle( item ); - } - - // don't select the item if the button was clicked - return; - } - 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) ); + wxTreeTextCtrl *text = new wxTreeTextCtrl(this, -1, + &m_renameAccept, + &m_renameRes, + this, + s, + wxPoint(x-4,y-4), + wxSize(w+11,h+8)); text->SetFocus(); } @@ -2676,3 +2759,4 @@ void wxGenericTreeCtrl::RefreshLine( wxGenericTreeItem *item ) Refresh( TRUE, &rect ); } +#endif // wxUSE_TREECTRL