#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"
{
(*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();
if (myPos.x + sx > parentSize.x) sx = parentSize.x - myPos.x;
if (mySize.x > sx) sx = mySize.x;
SetSize(sx, -1);
-
+
event.Skip();
}
m_imageListNormal =
m_imageListState = (wxImageList *) NULL;
- m_ownsImageListNormal =
+ m_ownsImageListNormal =
m_ownsImageListState = FALSE;
m_dragCount = 0;
#endif
SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
+
// m_dottedPen = wxPen( "grey", 0, wxDOT ); too slow under XFree86
m_dottedPen = wxPen( "grey", 0, 0 );
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
// -----------------------------------------------------------------------------
{
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);
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)
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();
}
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)
{
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;
int total_h = GetLineHeight(item);
- if (item->IsSelected())
+ bool paintBg = item->IsSelected() && m_hasFocus;
+ if ( paintBg )
+ {
dc.SetBrush(*m_hilightBrush);
+ }
else
{
wxColour colBg;
dc.SetBrush(wxBrush(colBg, wxSOLID));
}
- if (item->IsSelected() && image != NO_IMAGE)
+ int offset = HasFlag(wxTR_ROW_LINES) ? 1 : 0;
+
+ 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(), item->GetWidth() - image_w + 2, total_h );
+ 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(), item->GetWidth()+2, total_h );
+ {
+ dc.DrawRectangle( item->GetX()-2, item->GetY()+offset,
+ item->GetWidth()+2, total_h-offset );
+ }
if ( image != NO_IMAGE )
{
// 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 (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 );
+ if (item->HasPlus())
+ {
+ dc.SetPen( *wxBLACK_PEN );
+ dc.SetBrush( *m_hilightBrush );
- 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 );
+ wxPoint button[3];
- dc.SetPen( m_dottedPen );
+ 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( startX, y, endX, y );
- wxPen *pen = wxTRANSPARENT_PEN;
- wxColour colText;
+ 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;
+#ifndef __WXMAC__
+ // don't draw rect outline if we already have the background color
+ // under Max
if ( item->IsSelected() )
+ pen = wxBLACK_PEN;
+ else
+#endif // !__WXMAC__
+ pen = wxTRANSPARENT_PEN;
+
+ wxColour colText;
+ if ( item->IsSelected() && m_hasFocus )
{
colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );
-
- if ( m_hasFocus )
- pen = wxBLACK_PEN;
-
}
else
{
// 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 );
{
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 );
}
}
}
{
m_hasFocus = TRUE;
- if (m_current) RefreshLine( m_current );
+ if (m_current)
+ RefreshLine( m_current );
}
void wxGenericTreeCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
{
m_hasFocus = FALSE;
- if (m_current) RefreshLine( m_current );
+ if (m_current)
+ RefreshLine( m_current );
}
void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
// 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);
if (m_anchor)
return m_anchor->HitTest( wxPoint(x, y), this, flags);
- else
- return wxTreeItemId();
+
+ return wxTreeItemId();
}
// 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") );
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;
}
// erase the highlighting
DrawDropEffect(m_dropTarget);
+ if ( m_oldSelection )
+ {
+ m_oldSelection->SetHilight(TRUE);
+ RefreshLine(m_oldSelection);
+ m_oldSelection = (wxGenericTreeItem *)NULL;
+ }
+
// generate the drag end event
wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, GetId());
m_isDragging = FALSE;
m_dropTarget = (wxGenericTreeItem *)NULL;
- if ( m_oldSelection )
- {
- m_oldSelection->SetHilight(TRUE);
- RefreshLine(m_oldSelection);
- m_oldSelection = (wxGenericTreeItem *)NULL;
- }
-
ReleaseMouse();
SetCursor(m_oldCursor);
Refresh( TRUE, &rect );
}
+#endif // wxUSE_TREECTRL
projects / wxWidgets.git / blobdiff