#include "wx/intl.h"
#include "wx/dynarray.h"
#include "wx/dcclient.h"
+#include "wx/imaglist.h"
// -----------------------------------------------------------------------------
// array types
// 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); }
m_selImage;
wxTreeItemData *m_data;
-
+
// @@ probably should use bitfields to save size
bool m_isCollapsed,
m_hasHilight, // same as focused
m_isCollapsed = TRUE;
m_hasHilight = FALSE;
+ m_hasPlus = FALSE;
m_parent = parent;
wxGenericTreeItem::~wxGenericTreeItem()
{
delete m_data;
-
+
size_t count = m_children.Count();
for ( size_t n = 0; n < count; n++ )
delete m_children[n];
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;
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 );
+ }
}
}
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)
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);
}
// item status inquiries
// -----------------------------------------------------------------------------
-bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
+bool wxTreeCtrl::IsVisible(const wxTreeItemId& WXUNUSED(item)) const
{
wxFAIL_MSG("not implemented");
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();
}
{
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
// 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
// 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
// should we give a warning here?
return AddRoot(text, image, selImage, data);
}
-
+
wxClientDC dc(this);
wxGenericTreeItem *item = new wxGenericTreeItem(parent,
text, dc,
PrepareDC( dc );
wxRectangle rect;
- rect.x = dc.LogicalToDeviceX( 0 );
+ rect.x = dc.LogicalToDeviceX( 0 );
rect.y = 0;
rect.width = 10000; // @@@ not very elegant...
rect.height = ch;
// cancelled by program
return;
}
-
+
item->Expand();
RefreshSubtree(item);
// cancelled by program
return;
}
-
+
item->Collapse();
wxArrayTreeItems& children = item->GetChildren();
}
}
-void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
+void wxTreeCtrl::EnsureVisible(const wxTreeItemId& WXUNUSED(item))
{
wxFAIL_MSG("not implemented");
}
-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");
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");
}
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.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
dc.SetBrush( *m_hilightBrush );
- long tw, th;
- dc.GetTextExtent( item->GetText(), &tw, &th );
- if (m_hasFocus)
+
+ 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)
{
- dc.SetPen( *wxBLACK_PEN );
- dc.DrawRectangle( item->GetX()-2, item->GetY()-2, tw+4, th+4 );
+ 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, tw+4, th+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(), item->GetX(), item->GetY() );
+ dc.DrawText( item->GetText(), image_w+item->GetX(), item->GetY() );
dc.SetPen( *wxBLACK_PEN );
dc.SetTextForeground( *wxBLACK );
{
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() );
+
+ 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() );
dc.SetPen( *wxBLACK_PEN );
}
}
{
wxClientDC dc(this);
PrepareDC(dc);
-
+
int cw = 0;
int ch = 0;
GetClientSize( &cw, &ch );
-
+
wxRect rect;
rect.x = dc.LogicalToDeviceX( 0 );
rect.width = cw;
projects / wxWidgets.git / blobdiff