// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
-// Id:
+// Id: $Id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/treectrl.h"
#include "wx/settings.h"
+#include "wx/log.h"
+#include <wx/intl.h>
//-----------------------------------------------------------------------------
// wxTreeItem
m_lineHeight = 10;
m_indent = 15;
m_isCreated = FALSE;
- m_dc = NULL;
m_hilightBrush = new wxBrush( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSOLID );
m_imageList = NULL;
m_smallImageList = NULL;
m_lineHeight = 10;
m_indent = 15;
m_isCreated = FALSE;
- m_dc = NULL;
m_hilightBrush = new wxBrush( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSOLID );
m_imageList = NULL;
m_smallImageList = NULL;
wxTreeCtrl::~wxTreeCtrl()
{
- if (m_dc) delete m_dc;
};
bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
CalculatePositions();
if (!p->HasChildren()) p->m_hasChildren = TRUE;
-
+
int ch = 0;
GetClientSize( NULL, &ch );
+ PrepareDC( dc );
+
wxRectangle rect;
- rect.x = 0; rect.y = 0;
- rect.width = 10000; rect.height = ch;
+ rect.x = dc.LogicalToDeviceX( 0 );
+ rect.y = 0;
+ rect.width = 10000;
+ rect.height = ch;
- PrepareDC( dc );
if (p->m_children.Number() == 1)
{
rect.y = dc.LogicalToDeviceY( p->m_y );
rect.y = dc.LogicalToDeviceY( last_child->m_y );
};
- long doX = 0;
- long doY = 0;
- dc.GetDeviceOrigin( &doX, &doY );
- rect.height = ch-rect.y-doY;
-
AdjustMyScrollbars();
if (rect.height > 0) Refresh( FALSE, &rect);
if (p)
{
CalculatePositions();
-
+
if (!p->HasChildren()) p->m_hasChildren = TRUE;
int ch = 0;
GetClientSize( NULL, &ch );
+ PrepareDC( dc );
+
wxRectangle rect;
- rect.x = 0; rect.y = 0;
- rect.width = 10000; rect.height = ch;
+ rect.x = dc.LogicalToDeviceX( 0 );
+ rect.y = 0;
+ rect.width = 10000;
+ rect.height = ch;
- PrepareDC( dc );
if (p->m_children.Number() == 1)
{
rect.y = dc.LogicalToDeviceY( p->m_y );
rect.y = dc.LogicalToDeviceY( last_child->m_y );
};
- long doX = 0;
- long doY = 0;
- dc.GetDeviceOrigin( &doX, &doY );
- rect.height = ch-rect.y-doY;
-
AdjustMyScrollbars();
if (rect.height > 0) Refresh( FALSE, &rect);
};
CalculatePositions();
-
+
i->SendCollapse( this );
break;
}
}
};
+ wxClientDC dc(this);
+ PrepareDC(dc);
+
int cw = 0;
int ch = 0;
GetClientSize( &cw, &ch );
+
wxRect rect;
- rect.x = 0;
+ rect.x = dc.LogicalToDeviceX( 0 );
rect.width = cw;
- wxClientDC dc(this);
- PrepareDC(dc);
rect.y = dc.LogicalToDeviceY( i->m_y );
-
- long doY = 0;
- dc.GetDeviceOrigin( NULL, &doY );
- rect.height = ch-rect.y-doY;
+ rect.height = ch;
Refresh( TRUE, &rect );
AdjustMyScrollbars();
void wxTreeCtrl::DeleteItem( long item )
{
wxGenericTreeItem *pItem = FindItem( item );
- wxCHECK_RET( pItem != NULL, "wxTreeCtrl::DeleteItem: no such pItem." );
-
+ wxCHECK_RET( pItem != NULL, _("wxTreeCtrl::DeleteItem: no such pItem.") );
+
pItem->m_parent->m_children.DeleteObject(pItem);
-
+
Refresh();
}
void wxTreeCtrl::DeleteChildren( long item )
{
wxGenericTreeItem *pItem = FindItem( item );
- wxCHECK_RET( pItem != NULL, "wxTreeCtrl::DeleteChildren: no such pItem." );
-
+ wxCHECK_RET( pItem != NULL, _("wxTreeCtrl::DeleteChildren: no such pItem.") );
+
pItem->m_children.Clear();
-
+
Refresh();
}
long wxTreeCtrl::GetSelection() const
{
- return 0;
+ return m_current ? m_current->GetItemId() : -1;
};
-bool wxTreeCtrl::SelectItem( long WXUNUSED(item) ) const
+bool wxTreeCtrl::SelectItem(long itemId)
{
- return FALSE;
+ wxGenericTreeItem *pItem = FindItem(itemId);
+ if ( !pItem ) {
+ wxLogDebug(_("Can't select an item %d which doesn't exist."), itemId);
+
+ return FALSE;
+ }
+
+ SelectItem(pItem);
+
+ return TRUE;
};
+void wxTreeCtrl::SelectItem(wxGenericTreeItem *item)
+{
+ if (m_current != item)
+ {
+ if (m_current)
+ {
+ m_current->SetHilight( FALSE );
+ RefreshLine( m_current );
+ };
+ m_current = item;
+ m_current->SetHilight( TRUE );
+ RefreshLine( m_current );
+
+ m_current->SendSelected( this );
+ }
+}
+
bool wxTreeCtrl::ItemHasChildren( long item ) const
{
wxGenericTreeItem *i = FindItem( item );
void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
{
int horizX = level*m_indent;
-
+
item->m_x = horizX+33;
item->m_y = y-m_lineHeight/3;
item->m_height = m_lineHeight;
-
+
item->SetCross( horizX+15, y );
int oldY = y;
-
- if (IsExposed( 0, item->m_y-2, 10000, m_lineHeight+4 ))
+
+ int exposed_x = dc.LogicalToDeviceX( 0 );
+ int exposed_y = dc.LogicalToDeviceY( item->m_y-2 );
+
+ if (IsExposed( exposed_x, exposed_y, 1000, m_lineHeight+4 ))
{
int startX = horizX;
int endX = horizX + 10;
if (!item->HasChildren()) endX += 20;
- dc.DrawLine( startX, y, endX, y );
+
+ dc.DrawLine( startX, y, endX, y );
if (item->HasChildren())
{
long tw, th;
dc.GetTextExtent( item->m_text, &tw, &th );
if (m_hasFocus)
- {
+ {
dc.SetPen( *wxBLACK_PEN );
dc.DrawRectangle( item->m_x-2, item->m_y-2, tw+4, th+4 );
- }
- else
- {
- dc.SetPen( *wxTRANSPARENT_PEN );
+ }
+ else
+ {
+ dc.SetPen( *wxTRANSPARENT_PEN );
dc.DrawRectangle( item->m_x-2, item->m_y-2, tw+4, th+4 );
- }
+ }
dc.DrawText( item->m_text, item->m_x, item->m_y );
dc.SetPen( *wxBLACK_PEN );
dc.SetTextForeground( *wxBLACK );
- dc.SetBrush( *wxWHITE_BRUSH );
+ dc.SetBrush( *wxWHITE_BRUSH );
}
else
{
- dc.SetPen( *wxTRANSPARENT_PEN );
+ dc.SetBrush( *wxWHITE_BRUSH );
+ dc.SetPen( *wxTRANSPARENT_PEN );
long tw, th;
dc.GetTextExtent( item->m_text, &tw, &th );
dc.DrawRectangle( item->m_x-2, item->m_y-2, tw+4, th+4 );
if (item->NumberOfVisibleChildren() == 0) return;
- int semiOldY = y;
-
+ int semiOldY = y;
+
wxNode *node = item->m_children.First();
while (node)
{
y += m_lineHeight;
semiOldY = y;
-
+
PaintLevel( child, dc, level+1, y );
-
+
node = node->Next();
};
{
if (!m_anchor) return;
- if (!m_dc)
- {
- m_dc = new wxPaintDC(this);
- PrepareDC( *m_dc );
- };
+ wxPaintDC dc(this);
+ PrepareDC( dc );
- m_dc->SetFont( wxSystemSettings::GetSystemFont( wxSYS_SYSTEM_FONT ) );
+ dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_SYSTEM_FONT ) );
- m_dc->SetPen( m_dottedPen );
- m_lineHeight = (int)(m_dc->GetCharHeight() + 4);
+ dc.SetPen( m_dottedPen );
+ m_lineHeight = (int)(dc.GetCharHeight() + 4);
int y = m_lineHeight / 2 + 2;
- PaintLevel( m_anchor, *m_dc, 0, y );
+ PaintLevel( m_anchor, dc, 0, y );
};
void wxTreeCtrl::OnSetFocus( const wxFocusEvent &WXUNUSED(event) )
if ((flag != wxTREE_HITTEST_ONITEMBUTTON) &&
(flag != wxTREE_HITTEST_ONITEMLABEL)) return;
- if (m_current != item)
- {
- if (m_current)
- {
- m_current->SetHilight( FALSE );
- RefreshLine( m_current );
- };
- m_current = item;
- m_current->SetHilight( TRUE );
- RefreshLine( m_current );
- m_current->SendSelected( this );
- };
+ SelectItem(item);
if (event.LeftDClick())
m_current->SendKeyDown( this );
void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
{
int horizX = level*m_indent;
-
+
item->m_x = horizX+33;
item->m_y = y-m_lineHeight/3-2;
item->m_height = m_lineHeight;
if (item->NumberOfVisibleChildren() == 0) return;
-
+
wxNode *node = item->m_children.First();
while (node)
{
wxGenericTreeItem *child = (wxGenericTreeItem *)node->Data();
-
+
y += m_lineHeight;
CalculateLevel( child, dc, level+1, y );
rect.x = dc.LogicalToDeviceX( item->m_x-2 );
rect.y = dc.LogicalToDeviceY( item->m_y-2 );
rect.width = 1000;
- rect.height = dc.GetCharHeight()+4;
+ rect.height = dc.GetCharHeight()+6;
Refresh( TRUE, &rect );
};
projects / wxWidgets.git / blobdiff