#include "wx/renderer.h"
#ifdef __WXMAC__
- #include "wx/mac/private.h"
+ #include "wx/osx/private.h"
#endif
// -----------------------------------------------------------------------------
// array types
// -----------------------------------------------------------------------------
-class WXDLLEXPORT wxGenericTreeItem;
+class WXDLLIMPEXP_FWD_CORE wxGenericTreeItem;
-WX_DEFINE_EXPORTED_ARRAY_PTR(wxGenericTreeItem *, wxArrayGenericTreeItems);
+WX_DEFINE_ARRAY_PTR(wxGenericTreeItem *, wxArrayGenericTreeItems);
// ----------------------------------------------------------------------------
// constants
static const int PIXELS_PER_UNIT = 10;
+// the margin between the item state image and the item normal image
+static const int MARGIN_BETWEEN_STATE_AND_IMAGE = 2;
+
// the margin between the item image and the item text
static const int MARGIN_BETWEEN_IMAGE_AND_TEXT = 4;
public:
wxTreeTextCtrl(wxGenericTreeCtrl *owner, wxGenericTreeItem *item);
- void EndEdit(bool discardChanges = false)
- {
- if ( discardChanges )
- {
- StopEditing();
- }
- else
- {
- m_aboutToFinish = true;
-
- // Notify the owner about the changes
- AcceptChanges();
-
- // Even if vetoed, close the control (consistent with MSW)
- Finish();
- }
- }
+ void EndEdit( bool discardChanges );
- void StopEditing()
- {
- Finish();
- m_owner->OnRenameCancelled(m_itemEdited);
- }
const wxGenericTreeItem* item() const { return m_itemEdited; }
protected:
void OnKillFocus( wxFocusEvent &event );
bool AcceptChanges();
- void Finish();
+ void Finish( bool setfocus );
private:
wxGenericTreeCtrl *m_owner;
wxGenericTreeItem *m_itemEdited;
wxString m_startValue;
- bool m_finished;
bool m_aboutToFinish;
DECLARE_EVENT_TABLE()
{
public:
// ctors & dtor
- wxGenericTreeItem() { m_data = NULL; }
+ wxGenericTreeItem()
+ {
+ m_data = NULL;
+ m_widthText =
+ m_heightText = -1;
+ }
+
wxGenericTreeItem( wxGenericTreeItem *parent,
const wxString& text,
int image,
int GetImage(wxTreeItemIcon which = wxTreeItemIcon_Normal) const
{ return m_images[which]; }
wxTreeItemData *GetData() const { return m_data; }
+ int GetState() const { return m_state; }
// returns the current image for the item (depending on its
// selected/expanded/whatever state)
int GetCurrentImage() const;
- void SetText( const wxString &text );
- void SetImage(int image, wxTreeItemIcon which) { m_images[which] = image; }
+ void SetText(const wxString& text)
+ {
+ m_text = text;
+
+ ResetTextSize();
+ }
+
+ void SetImage(int image, wxTreeItemIcon which)
+ {
+ m_images[which] = image;
+ m_width = 0;
+ }
+
void SetData(wxTreeItemData *data) { m_data = data; }
+ void SetState(int state) { m_state = state; m_width = 0; }
void SetHasPlus(bool has = true) { m_hasPlus = has; }
- void SetBold(bool bold) { m_isBold = bold; }
+ void SetBold(bool bold)
+ {
+ m_isBold = bold;
+
+ ResetTextSize();
+ }
int GetX() const { return m_x; }
int GetY() const { return m_y; }
void SetX(int x) { m_x = x; }
void SetY(int y) { m_y = y; }
- int GetHeight() const { return m_height; }
- int GetWidth() const { return m_width; }
+ int GetHeight() const { return m_height; }
+ int GetWidth() const { return m_width; }
- void SetHeight(int h) { m_height = h; }
- void SetWidth(int w) { m_width = w; }
+ int GetTextHeight() const
+ {
+ wxASSERT_MSG( m_heightText != -1, "must call CalculateSize() first" );
+
+ return m_heightText;
+ }
+
+ int GetTextWidth() const
+ {
+ wxASSERT_MSG( m_widthText != -1, "must call CalculateSize() first" );
+
+ return m_widthText;
+ }
wxGenericTreeItem *GetParent() const { return m_parent; }
+ // sets the items font for the specified DC if it uses any special font or
+ // simply returns false otherwise
+ bool SetFont(wxGenericTreeCtrl *control, wxDC& dc) const
+ {
+ wxFont font;
+
+ wxTreeItemAttr * const attr = GetAttributes();
+ if ( attr && attr->HasFont() )
+ font = attr->GetFont();
+ else if ( IsBold() )
+ font = control->m_boldFont;
+ else
+ return false;
+
+ dc.SetFont(font);
+ return true;
+ }
+
// operations
// deletes all children notifying the treectrl about it
size_t GetChildrenCount(bool recursively = true) const;
void Insert(wxGenericTreeItem *child, size_t index)
- { m_children.Insert(child, index); }
+ { m_children.Insert(child, index); }
+
+ // calculate and cache the item size using either the provided DC (which is
+ // supposed to have wxGenericTreeCtrl::m_normalFont selected into it!) or a
+ // wxClientDC on the control window
+ void CalculateSize(wxGenericTreeCtrl *control, wxDC& dc)
+ { DoCalculateSize(control, dc, true /* dc uses normal font */); }
+ void CalculateSize(wxGenericTreeCtrl *control);
void GetSize( int &x, int &y, const wxGenericTreeCtrl* );
+ void ResetSize() { m_width = 0; }
+ void ResetTextSize() { m_width = 0; m_widthText = -1; }
+ void RecursiveResetSize();
+ void RecursiveResetTextSize();
+
// return the item at given position (or NULL if no item), onButton is
// true if the point belongs to the item's button, otherwise it lies
// on the item's label
if ( m_ownsAttr ) delete m_attr;
m_attr = attr;
m_ownsAttr = false;
+ m_width = 0;
+ m_widthText = -1;
}
// set them and delete when done
void AssignAttributes(wxTreeItemAttr *attr)
{
SetAttributes(attr);
m_ownsAttr = true;
+ m_width = 0;
+ m_widthText = -1;
}
private:
+ // calculate the size of this item, i.e. set m_width, m_height and
+ // m_widthText and m_heightText properly
+ //
+ // if dcUsesNormalFont is true, the current dc font must be the normal tree
+ // control font
+ void DoCalculateSize(wxGenericTreeCtrl *control,
+ wxDC& dc,
+ bool dcUsesNormalFont);
+
// since there can be very many of these, we save size by chosing
// the smallest representation for the elements and by ordering
// the members to avoid padding.
wxString m_text; // label to be rendered for item
+ int m_widthText;
+ int m_heightText;
wxTreeItemData *m_data; // user-provided data
+ int m_state; // item state
+
wxArrayGenericTreeItems m_children; // list of children
wxGenericTreeItem *m_parent; // parent of this item
}
// check if the given item is under another one
-static bool IsDescendantOf(const wxGenericTreeItem *parent, const wxGenericTreeItem *item)
+static bool
+IsDescendantOf(const wxGenericTreeItem *parent, const wxGenericTreeItem *item)
{
while ( item )
{
: m_itemEdited(item), m_startValue(item->GetText())
{
m_owner = owner;
- m_finished = false;
m_aboutToFinish = false;
int w = m_itemEdited->GetWidth(),
wxPoint(x - 4, y - 4), wxSize(w + 11, h + 8));
}
+void wxTreeTextCtrl::EndEdit(bool discardChanges)
+{
+ m_aboutToFinish = true;
+
+ if ( discardChanges )
+ {
+ m_owner->OnRenameCancelled(m_itemEdited);
+
+ Finish( true );
+ }
+ else
+ {
+ // Notify the owner about the changes
+ AcceptChanges();
+
+ // Even if vetoed, close the control (consistent with MSW)
+ Finish( true );
+ }
+}
+
bool wxTreeTextCtrl::AcceptChanges()
{
const wxString value = GetValue();
return true;
}
-void wxTreeTextCtrl::Finish()
+void wxTreeTextCtrl::Finish( bool setfocus )
{
- if ( !m_finished )
- {
- m_owner->ResetTextControl();
-
- wxPendingDelete.Append(this);
+ m_owner->ResetTextControl();
- m_finished = true;
+ wxPendingDelete.Append(this);
+ if (setfocus)
m_owner->SetFocus();
- }
}
void wxTreeTextCtrl::OnChar( wxKeyEvent &event )
switch ( event.m_keyCode )
{
case WXK_RETURN:
- EndEdit();
+ EndEdit( false );
break;
case WXK_ESCAPE:
- StopEditing();
+ EndEdit( true );
break;
default:
void wxTreeTextCtrl::OnKeyUp( wxKeyEvent &event )
{
- if ( !m_finished )
+ if ( !m_aboutToFinish )
{
// auto-grow the textctrl:
wxSize parentSize = m_owner->GetSize();
void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &event )
{
- if ( !m_finished && !m_aboutToFinish )
+ if ( !m_aboutToFinish )
{
- // We must finish regardless of success, otherwise we'll get
- // focus problems:
- Finish();
-
if ( !AcceptChanges() )
m_owner->OnRenameCancelled( m_itemEdited );
+
+ Finish( false );
}
- // We must let the native text control handle focus, too, otherwise
- // it could have problems with the cursor (e.g., in wxGTK).
+ // We should let the native text control handle focus, too.
event.Skip();
}
m_images[wxTreeItemIcon_SelectedExpanded] = NO_IMAGE;
m_data = data;
+ m_state = wxTREE_ITEMSTATE_NONE;
m_x = m_y = 0;
m_isCollapsed = true;
// We don't know the height here yet.
m_width = 0;
m_height = 0;
+
+ m_widthText = -1;
+ m_heightText = -1;
}
wxGenericTreeItem::~wxGenericTreeItem()
if (m_ownsAttr) delete m_attr;
wxASSERT_MSG( m_children.IsEmpty(),
- wxT("please call DeleteChildren() before deleting the item") );
+ "must call DeleteChildren() before deleting the item" );
}
void wxGenericTreeItem::DeleteChildren(wxGenericTreeCtrl *tree)
{
- size_t count = m_children.Count();
+ size_t count = m_children.GetCount();
for ( size_t n = 0; n < count; n++ )
{
wxGenericTreeItem *child = m_children[n];
m_children.Empty();
}
-void wxGenericTreeItem::SetText( const wxString &text )
-{
- m_text = text;
-}
-
size_t wxGenericTreeItem::GetChildrenCount(bool recursively) const
{
- size_t count = m_children.Count();
+ size_t count = m_children.GetCount();
if ( !recursively )
return count;
if (IsExpanded())
{
- size_t count = m_children.Count();
+ size_t count = m_children.GetCount();
for ( size_t n = 0; n < count; ++n )
{
m_children[n]->GetSize( x, y, theButton );
// assuming every image (normal and selected) has the same size!
if ( (GetImage() != NO_IMAGE) && theCtrl->m_imageListNormal )
+ {
theCtrl->m_imageListNormal->GetSize(GetImage(),
image_w, image_h);
+ }
+
+ int state_w = -1;
+ int state_h;
- if ((image_w != -1) && (point.x <= m_x + image_w + 1))
+ if ( (GetState() != wxTREE_ITEMSTATE_NONE) &&
+ theCtrl->m_imageListState )
+ {
+ theCtrl->m_imageListState->GetSize(GetState(),
+ state_w, state_h);
+ }
+
+ if ((state_w != -1) && (point.x <= m_x + state_w + 1))
+ flags |= wxTREE_HITTEST_ONITEMSTATEICON;
+ else if ((image_w != -1) &&
+ (point.x <= m_x +
+ (state_w != -1 ? state_w +
+ MARGIN_BETWEEN_STATE_AND_IMAGE
+ : 0)
+ + image_w + 1))
flags |= wxTREE_HITTEST_ONITEMICON;
else
flags |= wxTREE_HITTEST_ONITEMLABEL;
}
// evaluate children
- size_t count = m_children.Count();
+ size_t count = m_children.GetCount();
for ( size_t n = 0; n < count; n++ )
{
wxGenericTreeItem *res = m_children[n]->HitTest( point,
return image;
}
+void wxGenericTreeItem::CalculateSize(wxGenericTreeCtrl* control)
+{
+ // check if we need to do anything before creating the DC
+ if ( m_width != 0 )
+ return;
+
+ wxClientDC dc(control);
+ DoCalculateSize(control, dc, false /* normal font not used */);
+}
+
+void
+wxGenericTreeItem::DoCalculateSize(wxGenericTreeCtrl* control,
+ wxDC& dc,
+ bool dcUsesNormalFont)
+{
+ if ( m_width != 0 ) // Size known, nothing to do
+ return;
+
+ if ( m_widthText == -1 )
+ {
+ bool fontChanged;
+ if ( SetFont(control, dc) )
+ {
+ fontChanged = true;
+ }
+ else // we have no special font
+ {
+ if ( !dcUsesNormalFont )
+ {
+ // but we do need to ensure that the normal font is used: notice
+ // that this doesn't count as changing the font as we don't need
+ // to restore it
+ dc.SetFont(control->m_normalFont);
+ }
+
+ fontChanged = false;
+ }
+
+ dc.GetTextExtent( GetText(), &m_widthText, &m_heightText );
+
+ // restore normal font if the DC used it previously and we changed it
+ if ( fontChanged )
+ dc.SetFont(control->m_normalFont);
+ }
+
+ int text_h = m_heightText + 2;
+
+ int image_h = 0;
+ int image_w = 0;
+ int image = GetCurrentImage();
+ if ( image != NO_IMAGE )
+ {
+ if ( control->m_imageListNormal )
+ {
+ control->m_imageListNormal->GetSize( image, image_w, image_h );
+ image_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;
+ }
+ }
+
+ int state_h = 0, state_w = 0;
+ int state = GetState();
+ if ( state != wxTREE_ITEMSTATE_NONE )
+ {
+ if ( control->m_imageListState )
+ {
+ control->m_imageListState->GetSize( state, state_w, state_h );
+ if ( image != NO_IMAGE )
+ state_w += MARGIN_BETWEEN_STATE_AND_IMAGE;
+ else
+ state_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;
+ }
+ }
+
+ m_height = (image_h > text_h) ? image_h : text_h;
+
+ if (m_height < 30)
+ m_height += 2; // at least 2 pixels
+ else
+ m_height += m_height / 10; // otherwise 10% extra spacing
+
+ if (m_height > control->m_lineHeight)
+ control->m_lineHeight = m_height;
+
+ m_width = state_w + image_w + m_widthText + 2;
+}
+
+void wxGenericTreeItem::RecursiveResetSize()
+{
+ m_width = 0;
+
+ const size_t count = m_children.Count();
+ for (size_t i = 0; i < count; i++ )
+ m_children[i]->RecursiveResetSize();
+}
+
+void wxGenericTreeItem::RecursiveResetTextSize()
+{
+ m_width = 0;
+ m_widthText = -1;
+
+ const size_t count = m_children.Count();
+ for (size_t i = 0; i < count; i++ )
+ m_children[i]->RecursiveResetTextSize();
+}
+
// -----------------------------------------------------------------------------
// wxGenericTreeCtrl implementation
// -----------------------------------------------------------------------------
(
wxSYS_COLOUR_HIGHLIGHT
),
- wxSOLID
+ wxBRUSHSTYLE_SOLID
);
m_hilightUnfocusedBrush = new wxBrush
(
wxSYS_COLOUR_BTNSHADOW
),
- wxSOLID
+ wxBRUSHSTYLE_SOLID
);
m_imageListButtons = NULL;
m_textCtrl = NULL;
m_renameTimer = NULL;
- m_freezeCount = 0;
m_findTimer = NULL;
m_lastOnSame = false;
-#ifdef __WXMAC_CARBON__
- m_normalFont.MacCreateThemeFont( kThemeViewsFont ) ;
+#if defined( __WXMAC__ )
+#if wxOSX_USE_CARBON
+ m_normalFont.MacCreateFromThemeFont( kThemeViewsFont ) ;
+#else
+ m_normalFont.MacCreateFromUIFont( kCTFontViewsFontType ) ;
+#endif
#else
m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
#endif
const wxString& name )
{
#ifdef __WXMAC__
- int major,minor;
- wxGetOsVersion( &major, &minor );
+ int major, minor;
+ wxGetOsVersion(&major, &minor);
- style &= ~wxTR_LINES_AT_ROOT;
- style |= wxTR_NO_LINES;
if (major < 10)
style |= wxTR_ROW_LINES;
-
- if (style == 0 || style & wxTR_DEFAULT_STYLE)
- style |= wxTR_FULL_ROW_HIGHLIGHT;
-
#endif // __WXMAC__
-#ifdef __WXGTK20__
- style |= wxTR_NO_LINES;
-#endif
if ( !wxControl::Create( parent, id, pos, size,
style|wxHSCROLL|wxVSCROLL,
if (!m_hasFont)
SetOwnFont(attr.font);
- m_dottedPen = wxPen( wxT("grey"), 0, 0 );
+ // this is a misnomer: it's called "dotted pen" but uses (default) wxSOLID
+ // style because we apparently get performance problems when using dotted
+ // pen for drawing in some ports -- but under MSW it seems to work fine
+#ifdef __WXMSW__
+ m_dottedPen = wxPen(*wxLIGHT_GREY, 0, wxPENSTYLE_DOT);
+#else
+ m_dottedPen = *wxGREY_PEN;
+#endif
SetInitialSize(size);
return ((wxGenericTreeItem*) item.m_pItem)->GetData();
}
+int wxGenericTreeCtrl::DoGetItemState(const wxTreeItemId& item) const
+{
+ wxCHECK_MSG( item.IsOk(), wxTREE_ITEMSTATE_NONE, wxT("invalid tree item") );
+
+ wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem;
+ return pItem->GetState();
+}
+
wxColour wxGenericTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const
{
wxCHECK_MSG( item.IsOk(), wxNullColour, wxT("invalid tree item") );
return pItem->Attr().GetTextColour();
}
-wxColour wxGenericTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const
+wxColour
+wxGenericTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const
{
wxCHECK_MSG( item.IsOk(), wxNullColour, wxT("invalid tree item") );
return pItem->Attr().GetFont();
}
-void wxGenericTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
+void
+wxGenericTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
{
wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
- wxClientDC dc(this);
wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem;
pItem->SetText(text);
- CalculateSize(pItem, dc);
+ pItem->CalculateSize(this);
RefreshLine(pItem);
}
wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem;
pItem->SetImage(image, which);
-
- wxClientDC dc(this);
- CalculateSize(pItem, dc);
+ pItem->CalculateSize(this);
RefreshLine(pItem);
}
-void wxGenericTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
+void
+wxGenericTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
{
wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
((wxGenericTreeItem*) item.m_pItem)->SetData(data);
}
+void wxGenericTreeCtrl::DoSetItemState(const wxTreeItemId& item, int state)
+{
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
+ wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem;
+ pItem->SetState(state);
+ pItem->CalculateSize(this);
+ RefreshLine(pItem);
+}
+
void wxGenericTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
{
wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
// recalculate the item size as bold and non bold fonts have different
// widths
- wxClientDC dc(this);
- CalculateSize(pItem, dc);
-
+ pItem->CalculateSize(this);
RefreshLine(pItem);
}
}
RefreshLine(pItem);
}
-void wxGenericTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
+void
+wxGenericTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
{
wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem;
pItem->Attr().SetFont(font);
+ pItem->ResetTextSize();
+ pItem->CalculateSize(this);
RefreshLine(pItem);
}
m_normalFont.GetFaceName(),
m_normalFont.GetEncoding());
+ if (m_anchor)
+ m_anchor->RecursiveResetTextSize();
+
return true;
}
{
wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
- wxArrayGenericTreeItems& children = ((wxGenericTreeItem*) item.m_pItem)->GetChildren();
+ wxArrayGenericTreeItems&
+ children = ((wxGenericTreeItem*) item.m_pItem)->GetChildren();
// it's ok to cast cookie to size_t, we never have indices big enough to
// overflow "void *"
size_t *pIndex = (size_t *)&cookie;
- if ( *pIndex < children.Count() )
+ if ( *pIndex < children.GetCount() )
{
return children.Item((*pIndex)++);
}
}
}
-#if WXWIN_COMPATIBILITY_2_4
-
-wxTreeItemId wxGenericTreeCtrl::GetFirstChild(const wxTreeItemId& item,
- long& cookie) const
-{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
-
- cookie = 0;
- return GetNextChild(item, cookie);
-}
-
-wxTreeItemId wxGenericTreeCtrl::GetNextChild(const wxTreeItemId& item,
- long& cookie) const
-{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
-
- wxArrayGenericTreeItems& children = ((wxGenericTreeItem*) item.m_pItem)->GetChildren();
- if ( (size_t)cookie < children.Count() )
- {
- return children.Item((size_t)cookie++);
- }
- else
- {
- // there are no more of them
- return wxTreeItemId();
- }
-}
-
-#endif // WXWIN_COMPATIBILITY_2_4
-
wxTreeItemId wxGenericTreeCtrl::GetLastChild(const wxTreeItemId& item) const
{
wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
- wxArrayGenericTreeItems& children = ((wxGenericTreeItem*) item.m_pItem)->GetChildren();
- return (children.IsEmpty() ? wxTreeItemId() : wxTreeItemId(children.Last()));
+ wxArrayGenericTreeItems&
+ children = ((wxGenericTreeItem*) item.m_pItem)->GetChildren();
+ return children.IsEmpty() ? wxTreeItemId() : wxTreeItemId(children.Last());
}
wxTreeItemId wxGenericTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent?
size_t n = (size_t)(index + 1);
- return n == siblings.Count() ? wxTreeItemId() : wxTreeItemId(siblings[n]);
+ return n == siblings.GetCount() ? wxTreeItemId()
+ : wxTreeItemId(siblings[n]);
}
wxTreeItemId wxGenericTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
wxTreeItemId wxGenericTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
{
wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+ wxASSERT_MSG( IsVisible(item), wxT("this item itself should be visible") );
wxTreeItemId id = item;
if (id.IsOk())
wxTreeItemId wxGenericTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
{
wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+ wxASSERT_MSG( IsVisible(item), wxT("this item itself should be visible") );
- wxFAIL_MSG(wxT("not implemented"));
+ // find out the starting point
+ wxTreeItemId prevItem = GetPrevSibling(item);
+ if ( !prevItem.IsOk() )
+ {
+ prevItem = GetItemParent(item);
+ }
- return wxTreeItemId();
+ // find the first visible item after it
+ while ( prevItem.IsOk() && !IsVisible(prevItem) )
+ {
+ prevItem = GetNext(prevItem);
+ if ( !prevItem.IsOk() || prevItem == item )
+ {
+ // there are no visible items before item
+ return wxTreeItemId();
+ }
+ }
+
+ // from there we must be able to navigate until this item
+ while ( prevItem.IsOk() )
+ {
+ const wxTreeItemId nextItem = GetNextVisible(prevItem);
+ if ( !nextItem.IsOk() || nextItem == item )
+ break;
+
+ prevItem = nextItem;
+ }
+
+ return prevItem;
}
// called by wxTextTreeCtrl when it marks itself for deletion
}
// and try all the items (stop when we get to the one we started from)
- while (id.IsOk() && id != idParent && !GetItemText(id).Lower().StartsWith(prefix) )
+ while ( id.IsOk() && id != idParent &&
+ !GetItemText(id).Lower().StartsWith(prefix) )
{
id = GetNext(id);
}
parent->Insert( item, previous == (size_t)-1 ? parent->GetChildren().size()
: previous );
+ InvalidateBestSize();
return item;
}
int selImage,
wxTreeItemData *data)
{
- wxCHECK_MSG( !m_anchor, wxTreeItemId(), wxT("tree can have only one root") );
+ wxCHECK_MSG( !m_anchor, wxTreeItemId(), "tree can have only one root" );
m_dirty = true; // do this first so stuff below doesn't cause flicker
m_current->SetHilight( true );
}
+ InvalidateBestSize();
return m_anchor;
}
int index = -1;
if (idPrevious.IsOk())
{
- index = parent->GetChildren().Index((wxGenericTreeItem*) idPrevious.m_pItem);
+ index = parent->GetChildren().Index(
+ (wxGenericTreeItem*) idPrevious.m_pItem);
wxASSERT_MSG( index != wxNOT_FOUND,
- wxT("previous item in wxGenericTreeCtrl::InsertItem() is not a sibling") );
+ "previous item in wxGenericTreeCtrl::InsertItem() "
+ "is not a sibling" );
}
return DoInsertItem(parentId, (size_t)++index, text, image, selImage, data);
void wxGenericTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item)
{
wxTreeEvent event(wxEVT_COMMAND_TREE_DELETE_ITEM, this, item);
- ProcessEvent( event );
+ GetEventHandler()->ProcessEvent( event );
}
// Don't leave edit or selection on a child which is about to disappear
void wxGenericTreeCtrl::ChildrenClosing(wxGenericTreeItem* item)
{
- if (m_textCtrl != NULL && item != m_textCtrl->item() && IsDescendantOf(item, m_textCtrl->item())) {
- m_textCtrl->StopEditing();
+ if ( m_textCtrl && item != m_textCtrl->item() &&
+ IsDescendantOf(item, m_textCtrl->item()) )
+ {
+ m_textCtrl->EndEdit( true );
}
- if (item != m_key_current && IsDescendantOf(item, m_key_current)) {
+
+ if ( item != m_key_current && IsDescendantOf(item, m_key_current) )
+ {
m_key_current = NULL;
}
- if (IsDescendantOf(item, m_select_me)) {
+
+ if ( IsDescendantOf(item, m_select_me) )
+ {
m_select_me = item;
}
- if (item != m_current && IsDescendantOf(item, m_current)) {
+
+ if ( item != m_current && IsDescendantOf(item, m_current) )
+ {
m_current->SetHilight( false );
m_current = NULL;
m_select_me = item;
wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
ChildrenClosing(item);
item->DeleteChildren(this);
+ InvalidateBestSize();
}
void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
if (m_textCtrl != NULL && IsDescendantOf(item, m_textCtrl->item()))
{
// can't delete the item being edited, cancel editing it first
- m_textCtrl->StopEditing();
+ m_textCtrl->EndEdit( true );
}
wxGenericTreeItem *parent = item->GetParent();
m_select_me = NULL;
delete item;
+
+ InvalidateBestSize();
}
void wxGenericTreeCtrl::DeleteAllItems()
wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_EXPANDING, this, item);
- if ( ProcessEvent( event ) && !event.IsAllowed() )
+ if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
{
// cancelled by program
return;
}
item->Expand();
- CalculatePositions();
+ if ( !IsFrozen() )
+ {
+ CalculatePositions();
- RefreshSubtree(item);
+ RefreshSubtree(item);
+ }
+ else // frozen
+ {
+ m_dirty = true;
+ }
event.SetEventType(wxEVT_COMMAND_TREE_ITEM_EXPANDED);
- ProcessEvent( event );
+ GetEventHandler()->ProcessEvent( event );
}
void wxGenericTreeCtrl::Collapse(const wxTreeItemId& itemId)
return;
wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSING, this, item);
- if ( ProcessEvent( event ) && !event.IsAllowed() )
+ if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
{
// cancelled by program
return;
#if 0 // TODO why should items be collapsed recursively?
wxArrayGenericTreeItems& children = item->GetChildren();
- size_t count = children.Count();
+ size_t count = children.GetCount();
for ( size_t n = 0; n < count; n++ )
{
Collapse(children[n]);
RefreshSubtree(item);
event.SetEventType(wxEVT_COMMAND_TREE_ITEM_COLLAPSED);
- ProcessEvent( event );
+ GetEventHandler()->ProcessEvent( event );
}
void wxGenericTreeCtrl::CollapseAndReset(const wxTreeItemId& item)
if (item->HasChildren())
{
wxArrayGenericTreeItems& children = item->GetChildren();
- size_t count = children.Count();
+ size_t count = children.GetCount();
for ( size_t n = 0; n < count; ++n )
{
UnselectAllChildren(children[n]);
// Tag all next children, when no more children,
// Move to parent (not to tag)
// Keep going... if we found last_item, we stop.
-bool wxGenericTreeCtrl::TagNextChildren(wxGenericTreeItem *crt_item, wxGenericTreeItem *last_item, bool select)
+bool
+wxGenericTreeCtrl::TagNextChildren(wxGenericTreeItem *crt_item,
+ wxGenericTreeItem *last_item,
+ bool select)
{
wxGenericTreeItem *parent = crt_item->GetParent();
int index = children.Index(crt_item);
wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent?
- size_t count = children.Count();
+ size_t count = children.GetCount();
for (size_t n=(size_t)(index+1); n<count; ++n)
{
- if (TagAllChildrenUntilLast(children[n], last_item, select)) return true;
+ if ( TagAllChildrenUntilLast(children[n], last_item, select) )
+ return true;
}
return TagNextChildren(parent, last_item, select);
}
-bool wxGenericTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, wxGenericTreeItem *last_item, bool select)
+bool
+wxGenericTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item,
+ wxGenericTreeItem *last_item,
+ bool select)
{
crt_item->SetHilight(select);
RefreshLine(crt_item);
if (crt_item->HasChildren())
{
wxArrayGenericTreeItems& children = crt_item->GetChildren();
- size_t count = children.Count();
+ size_t count = children.GetCount();
for ( size_t n = 0; n < count; ++n )
{
if (TagAllChildrenUntilLast(children[n], last_item, select))
return false;
}
-void wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *item2)
+void
+wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem *item1,
+ wxGenericTreeItem *item2)
{
m_select_me = NULL;
{
if ( !m_current )
{
- m_current = m_key_current = (wxGenericTreeItem*) GetRootItem().m_pItem;
+ m_current =
+ m_key_current = (wxGenericTreeItem*) GetRootItem().m_pItem;
}
// don't change the mark (m_current)
{
wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
wxCHECK_RET( item, wxT("SelectItem(): invalid tree item") );
-
+
wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);
if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
return;
}
//else: the tree is empty, so no selections
- return array.Count();
+ return array.GetCount();
}
void wxGenericTreeCtrl::EnsureVisible(const wxTreeItemId& item)
x += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
int x_pos = GetScrollPos( wxHORIZONTAL );
// Item should appear at top
- SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, item_y/PIXELS_PER_UNIT );
+ SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT,
+ x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT,
+ x_pos, item_y/PIXELS_PER_UNIT );
}
else if (item_y+GetLineHeight(gitem) > start_y+client_h)
{
item_y += PIXELS_PER_UNIT+2;
int x_pos = GetScrollPos( wxHORIZONTAL );
// Item should appear at bottom
- SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, (item_y+GetLineHeight(gitem)-client_h)/PIXELS_PER_UNIT );
+ SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT,
+ x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT,
+ x_pos,
+ (item_y+GetLineHeight(gitem)-client_h)/PIXELS_PER_UNIT );
}
}
static int LINKAGEMODE tree_ctrl_compare_func(wxGenericTreeItem **item1,
wxGenericTreeItem **item2)
{
- wxCHECK_MSG( s_treeBeingSorted, 0, wxT("bug in wxGenericTreeCtrl::SortChildren()") );
+ wxCHECK_MSG( s_treeBeingSorted, 0,
+ "bug in wxGenericTreeCtrl::SortChildren()" );
return s_treeBeingSorted->OnCompareItems(*item1, *item2);
}
wxT("wxGenericTreeCtrl::SortChildren is not reentrant") );
wxArrayGenericTreeItems& children = item->GetChildren();
- if ( children.Count() > 1 )
+ if ( children.GetCount() > 1 )
{
m_dirty = true;
}
}
+ if ( m_imageListState )
+ {
+ // Calculate a m_lineHeight value from the state Image sizes.
+ // May be toggle off. Then wxGenericTreeCtrl will spread when
+ // necessary (which might look ugly).
+ int n = m_imageListState->GetImageCount();
+ for (int i = 0; i < n ; i++)
+ {
+ int width = 0, height = 0;
+ m_imageListState->GetSize(i, width, height);
+ if (height > m_lineHeight) m_lineHeight = height;
+ }
+ }
+
if (m_imageListButtons)
{
// Calculate a m_lineHeight value from the Button image sizes.
m_imageListNormal = imageList;
m_ownsImageListNormal = false;
m_dirty = true;
+
+ if (m_anchor)
+ m_anchor->RecursiveResetSize();
+
// Don't do any drawing if we're setting the list to NULL,
// since we may be in the process of deleting the tree control.
if (imageList)
if (m_ownsImageListState) delete m_imageListState;
m_imageListState = imageList;
m_ownsImageListState = false;
+ m_dirty = true;
+
+ if (m_anchor)
+ m_anchor->RecursiveResetSize();
+
+ // Don't do any drawing if we're setting the list to NULL,
+ // since we may be in the process of deleting the tree control.
+ if (imageList)
+ CalculateLineHeight();
}
void wxGenericTreeCtrl::SetButtonsImageList(wxImageList *imageList)
m_imageListButtons = imageList;
m_ownsImageListButtons = false;
m_dirty = true;
+
+ if (m_anchor)
+ m_anchor->RecursiveResetSize();
+
CalculateLineHeight();
}
x += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
int x_pos = GetScrollPos( wxHORIZONTAL );
int y_pos = GetScrollPos( wxVERTICAL );
- SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, y_pos );
+ SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT,
+ x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT,
+ x_pos, y_pos );
}
else
{
void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
{
- // TODO implement "state" icon on items
-
- wxTreeItemAttr *attr = item->GetAttributes();
- if ( attr && attr->HasFont() )
- dc.SetFont(attr->GetFont());
- else if (item->IsBold())
- dc.SetFont(m_boldFont);
+ item->SetFont(this, dc);
+ item->CalculateSize(this, dc);
- long text_w = 0, text_h = 0;
- dc.GetTextExtent( item->GetText(), &text_w, &text_h );
+ wxCoord text_h = item->GetTextHeight();
int image_h = 0, image_w = 0;
int image = item->GetCurrentImage();
}
}
+ int state_h = 0, state_w = 0;
+ int state = item->GetState();
+ if ( state != wxTREE_ITEMSTATE_NONE )
+ {
+ if ( m_imageListState )
+ {
+ m_imageListState->GetSize( state, state_w, state_h );
+ if ( image != NO_IMAGE )
+ state_w += MARGIN_BETWEEN_STATE_AND_IMAGE;
+ else
+ state_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;
+ }
+ else
+ {
+ state = wxTREE_ITEMSTATE_NONE;
+ }
+ }
+
int total_h = GetLineHeight(item);
- bool drawItemBackground = false;
+ bool drawItemBackground = false,
+ hasBgColour = false;
if ( item->IsSelected() )
{
else
{
wxColour colBg;
+ wxTreeItemAttr * const attr = item->GetAttributes();
if ( attr && attr->HasBackgroundColour() )
{
- drawItemBackground = true;
+ drawItemBackground =
+ hasBgColour = true;
colBg = attr->GetBackgroundColour();
}
else
{
colBg = GetBackgroundColour();
}
- dc.SetBrush(wxBrush(colBg, wxSOLID));
+ dc.SetBrush(wxBrush(colBg, wxBRUSHSTYLE_SOLID));
}
int offset = HasFlag(wxTR_ROW_LINES) ? 1 : 0;
x=0;
GetVirtualSize(&w, &h);
wxRect rect( x, item->GetY()+offset, w, total_h-offset);
-#if !defined(__WXGTK20__) && !defined(__WXMAC__)
- dc.DrawRectangle(rect);
-#else
if (!item->IsSelected())
{
dc.DrawRectangle(rect);
{
int flags = wxCONTROL_SELECTED;
if (m_hasFocus
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON // TODO CS
&& IsControlActive( (ControlRef)GetHandle() )
#endif
)
flags |= wxCONTROL_FOCUSED;
if ((item == m_current) && (m_hasFocus))
flags |= wxCONTROL_CURRENT;
- wxRendererNative::Get().DrawItemSelectionRect( this, dc, rect, flags );
+
+ wxRendererNative::Get().
+ DrawItemSelectionRect(this, dc, rect, flags);
}
-#endif
}
- else
+ else // no full row highlight
{
- if ( item->IsSelected() && image != NO_IMAGE )
+ if ( item->IsSelected() &&
+ (state != wxTREE_ITEMSTATE_NONE || 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.
- wxRect rect( item->GetX() + image_w - 2, item->GetY()+offset,
- item->GetWidth() - image_w + 2, total_h-offset );
+ // If it's selected, and there's an state image or normal image,
+ // then we should take care to leave the area under the image
+ // painted in the background colour.
+ wxRect rect( item->GetX() + state_w + image_w - 2,
+ item->GetY() + offset,
+ item->GetWidth() - state_w - image_w + 2,
+ total_h - offset );
#if !defined(__WXGTK20__) && !defined(__WXMAC__)
dc.DrawRectangle( rect );
#else
rect.x -= 1;
rect.width += 2;
-
+
int flags = wxCONTROL_SELECTED;
if (m_hasFocus)
flags |= wxCONTROL_FOCUSED;
if ((item == m_current) && (m_hasFocus))
flags |= wxCONTROL_CURRENT;
- wxRendererNative::Get().DrawItemSelectionRect( this, dc, rect, flags );
+ wxRendererNative::Get().
+ DrawItemSelectionRect(this, dc, rect, flags);
#endif
}
// On GTK+ 2, drawing a 'normal' background is wrong for themes that
{
wxRect rect( item->GetX()-2, item->GetY()+offset,
item->GetWidth()+2, total_h-offset );
-#if !defined(__WXGTK20__) && !defined(__WXMAC__)
- dc.DrawRectangle( rect );
-#else
- if ( attr && attr->HasBackgroundColour() )
+ if ( hasBgColour )
{
dc.DrawRectangle( rect );
}
- else
+ else // no specific background colour
{
rect.x -= 1;
rect.width += 2;
-
+
int flags = wxCONTROL_SELECTED;
if (m_hasFocus)
flags |= wxCONTROL_FOCUSED;
if ((item == m_current) && (m_hasFocus))
flags |= wxCONTROL_CURRENT;
- wxRendererNative::Get().DrawItemSelectionRect( this, dc, rect, flags );
+ wxRendererNative::Get().
+ DrawItemSelectionRect(this, dc, rect, flags);
}
-#endif
}
}
+ if ( state != wxTREE_ITEMSTATE_NONE )
+ {
+ dc.SetClippingRegion( item->GetX(), item->GetY(), state_w, total_h );
+ m_imageListState->Draw( state, dc,
+ item->GetX(),
+ item->GetY() +
+ (total_h > state_h ? (total_h-state_h)/2
+ : 0),
+ wxIMAGELIST_DRAW_TRANSPARENT );
+ dc.DestroyClippingRegion();
+ }
+
if ( image != NO_IMAGE )
{
- dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h );
+ dc.SetClippingRegion(item->GetX() + state_w, item->GetY(),
+ image_w, total_h);
m_imageListNormal->Draw( image, dc,
- item->GetX(),
- item->GetY() +((total_h > image_h)?((total_h-image_h)/2):0),
+ item->GetX() + state_w,
+ item->GetY() +
+ (total_h > image_h ? (total_h-image_h)/2
+ : 0),
wxIMAGELIST_DRAW_TRANSPARENT );
dc.DestroyClippingRegion();
}
- dc.SetBackgroundMode(wxTRANSPARENT);
+ dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
int extraH = (total_h > text_h) ? (total_h - text_h)/2 : 0;
dc.DrawText( item->GetText(),
- (wxCoord)(image_w + item->GetX()),
+ (wxCoord)(state_w + image_w + item->GetX()),
(wxCoord)(item->GetY() + extraH));
// restore normal font
dc.SetFont( m_normalFont );
}
-// 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 )
+void
+wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem *item,
+ wxDC &dc,
+ int level,
+ int &y)
{
int x = level*m_indent;
if (!HasFlag(wxTR_HIDE_ROOT))
// always expand hidden root
int origY = y;
wxArrayGenericTreeItems& children = item->GetChildren();
- int count = children.Count();
+ int count = children.GetCount();
if (count > 0)
{
int n = 0, oldY;
PaintLevel(children[n], dc, 1, y);
} while (++n < count);
- if (!HasFlag(wxTR_NO_LINES) && HasFlag(wxTR_LINES_AT_ROOT) && count > 0)
+ if ( !HasFlag(wxTR_NO_LINES) && HasFlag(wxTR_LINES_AT_ROOT)
+ && count > 0 )
{
// draw line down to last child
origY += GetLineHeight(children[0])>>1;
wxColour colText;
if ( item->IsSelected()
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON // TODO CS
// On wxMac, if the tree doesn't have the focus we draw an empty
// rectangle, so we want to make sure that the text is visible
// against the normal background, not the highlightbackground, so
if (item->IsExpanded())
{
wxArrayGenericTreeItems& children = item->GetChildren();
- int count = children.Count();
+ int count = children.GetCount();
if (count > 0)
{
int n = 0, oldY;
oldY += GetLineHeight(children[n-1])>>1;
if (HasButtons()) y_mid += 5;
- // Only draw the portion of the line that is visible, in case it is huge
+ // Only draw the portion of the line that is visible, in case
+ // it is huge
wxCoord xOrigin=0, yOrigin=0, width, height;
dc.GetDeviceOrigin(&xOrigin, &yOrigin);
yOrigin = abs(yOrigin);
if (oldY > yOrigin + height)
oldY = yOrigin + height;
- // after the adjustments if y_mid is larger than oldY then the line
- // isn't visible at all so don't draw anything
+ // after the adjustments if y_mid is larger than oldY then the
+ // line isn't visible at all so don't draw anything
if (y_mid < oldY)
dc.DrawLine(x, y_mid, x, oldY);
}
void wxGenericTreeCtrl::DrawBorder(const wxTreeItemId &item)
{
- wxCHECK_RET( item.IsOk(), _T("invalid item in wxGenericTreeCtrl::DrawLine") );
+ wxCHECK_RET( item.IsOk(), "invalid item in wxGenericTreeCtrl::DrawLine" );
wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem;
void wxGenericTreeCtrl::DrawLine(const wxTreeItemId &item, bool below)
{
- wxCHECK_RET( item.IsOk(), _T("invalid item in wxGenericTreeCtrl::DrawLine") );
+ wxCHECK_RET( item.IsOk(), "invalid item in wxGenericTreeCtrl::DrawLine" );
wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem;
case WXK_MENU:
{
- // Use the item's bounding rectangle to determine position for the event
+ // Use the item's bounding rectangle to determine position for
+ // the event
wxRect ItemRect;
GetBoundingRect(m_current, ItemRect, true);
- wxTreeEvent eventMenu(wxEVT_COMMAND_TREE_ITEM_MENU, this, m_current);
+ wxTreeEvent
+ eventMenu(wxEVT_COMMAND_TREE_ITEM_MENU, this, m_current);
// Use the left edge, vertical middle
eventMenu.m_pointDrag = wxPoint(ItemRect.GetX(),
- ItemRect.GetY() + ItemRect.GetHeight() / 2);
+ ItemRect.GetY() +
+ ItemRect.GetHeight() / 2);
GetEventHandler()->ProcessEvent( eventMenu );
}
break;
case WXK_RETURN:
if ( !event.HasModifiers() )
{
- wxTreeEvent eventAct(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, this, m_current);
+ wxTreeEvent
+ eventAct(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, this, m_current);
GetEventHandler()->ProcessEvent( eventAct );
}
{
wxTreeItemIdValue cookie;
wxTreeItemId current = m_key_current;
- // TODO: Huh? If we get here, we'd better be the first child of our parent. How else could it be?
+ // TODO: Huh? If we get here, we'd better be the first
+ // child of our parent. How else could it be?
if (current == GetFirstChild( prev, cookie ))
{
// otherwise we return to where we came from
- DoSelectItem( prev, unselect_others, extended_select );
- m_key_current= (wxGenericTreeItem*) prev.m_pItem;
+ DoSelectItem(prev,
+ unselect_others,
+ extended_select);
+ m_key_current = (wxGenericTreeItem*) prev.m_pItem;
break;
}
}
case WXK_RIGHT:
// this works the same as the down arrow except that we
// also expand the item if it wasn't expanded yet
- Expand(m_current);
+ if (m_current != GetRootItem().m_pItem || !HasFlag(wxTR_HIDE_ROOT))
+ Expand(m_current);
+ //else: don't try to expand hidden root item (which can be the
+ // current one when the tree is empty)
+
// fall through
case WXK_DOWN:
{
wxTreeItemIdValue cookie;
wxTreeItemId child = GetFirstChild( m_key_current, cookie );
+ if ( !child )
+ break;
+
DoSelectItem( child, unselect_others, extended_select );
m_key_current=(wxGenericTreeItem*) child.m_pItem;
}
wxRect& rect,
bool textOnly) const
{
- wxCHECK_MSG( item.IsOk(), false, _T("invalid item in wxGenericTreeCtrl::GetBoundingRect") );
+ wxCHECK_MSG( item.IsOk(), false,
+ "invalid item in wxGenericTreeCtrl::GetBoundingRect" );
wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem;
// Determines what item we are hovering over and need a tooltip for
wxTreeItemId hoverItem = thisItem;
- // We do not want a tooltip if we are dragging, or if the rename timer is running
- if (underMouseChanged && hoverItem.IsOk() && !m_isDragging && (!m_renameTimer || !m_renameTimer->IsRunning()))
+ // We do not want a tooltip if we are dragging, or if the rename timer is
+ // running
+ if ( underMouseChanged &&
+ hoverItem.IsOk() &&
+ !m_isDragging &&
+ (!m_renameTimer || !m_renameTimer->IsRunning()) )
{
// Ask the tree control what tooltip (if any) should be shown
- wxTreeEvent hevent(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, this, hoverItem);
+ wxTreeEvent
+ hevent(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, this, hoverItem);
if ( GetEventHandler()->ProcessEvent(hevent) && hevent.IsAllowed() )
{
else
{
// If we got to this point, we are not dragging or moving the mouse.
- // Because the code in carbon/toplevel.cpp will only set focus to the tree
- // if we skip for EVT_LEFT_DOWN, we MUST skip this event here for focus to work.
+ // Because the code in carbon/toplevel.cpp will only set focus to the
+ // tree if we skip for EVT_LEFT_DOWN, we MUST skip this event here for
+ // focus to work.
// We skip even if we didn't hit an item because we still should
- // restore focus to the tree control even if we didn't exactly hit an item.
+ // restore focus to the tree control even if we didn't exactly hit an
+ // item.
if ( event.LeftDown() )
{
event.Skip();
if ( event.RightDown() )
{
// If the item is already selected, do not update the selection.
- // Multi-selections should not be cleared if a selected item is clicked.
+ // Multi-selections should not be cleared if a selected item is
+ // clicked.
if (!IsSelected(item))
{
DoSelectItem(item, true, false);
}
- wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, this, item);
+ wxTreeEvent
+ nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, this, item);
nevent.m_pointDrag = CalcScrolledPosition(pt);
event.Skip(!GetEventHandler()->ProcessEvent(nevent));
}
else if ( event.MiddleDown() )
{
- wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, this, item);
+ wxTreeEvent
+ nevent(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, this, item);
nevent.m_pointDrag = CalcScrolledPosition(pt);
event.Skip(!GetEventHandler()->ProcessEvent(nevent));
}
else if ( event.LeftUp() )
{
+ if (flags & wxTREE_HITTEST_ONITEMSTATEICON)
+ {
+ wxTreeEvent
+ nevent(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, this, item);
+ GetEventHandler()->ProcessEvent(nevent);
+ }
+
// this facilitates multiple-item drag-and-drop
if ( /* item && */ HasFlag(wxTR_MULTIPLE))
m_lastOnSame = false;
}
}
- else // !RightDown() && !MiddleDown() && !LeftUp() ==> LeftDown() || LeftDClick()
+ else // !RightDown() && !MiddleDown() && !LeftUp()
{
+ // ==> LeftDown() || LeftDClick()
if ( event.LeftDown() )
{
m_lastOnSame = item == m_current;
EventFlagsToSelType(GetWindowStyleFlag(),
event.ShiftDown(),
event.CmdDown(),
- is_multiple, extended_select, unselect_others);
+ is_multiple,
+ extended_select,
+ unselect_others);
DoSelectItem(item, unselect_others, extended_select);
}
m_lastOnSame = false;
// send activate event first
- wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, this, item);
+ wxTreeEvent
+ nevent(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, this, item);
nevent.m_pointDrag = CalcScrolledPosition(pt);
if ( !GetEventHandler()->ProcessEvent( nevent ) )
{
DoDirtyProcessing();
}
-void wxGenericTreeCtrl::CalculateSize( wxGenericTreeItem *item, wxDC &dc )
-{
- wxCoord text_w = 0;
- wxCoord text_h = 0;
-
- wxTreeItemAttr *attr = item->GetAttributes();
- if ( attr && attr->HasFont() )
- dc.SetFont(attr->GetFont());
- else if ( item->IsBold() )
- dc.SetFont(m_boldFont);
- else
- dc.SetFont(m_normalFont);
-
- dc.GetTextExtent( item->GetText(), &text_w, &text_h );
- text_h+=2;
-
- // restore normal font
- dc.SetFont( m_normalFont );
-
- int image_h = 0;
- int image_w = 0;
- int image = item->GetCurrentImage();
- if ( image != NO_IMAGE )
- {
- if ( m_imageListNormal )
- {
- m_imageListNormal->GetSize( image, image_w, image_h );
- image_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;
- }
- }
-
- int total_h = (image_h > text_h) ? image_h : text_h;
-
- if (total_h < 30)
- total_h += 2; // at least 2 pixels
- else
- total_h += total_h/10; // otherwise 10% extra spacing
-
- item->SetHeight(total_h);
- if (total_h>m_lineHeight)
- m_lineHeight=total_h;
-
- item->SetWidth(image_w+text_w+2);
-}
-
-// -----------------------------------------------------------------------------
-// for developper : y is now the top of the level
-// not the middle of it !
-void wxGenericTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
+void
+wxGenericTreeCtrl::CalculateLevel(wxGenericTreeItem *item,
+ wxDC &dc,
+ int level,
+ int &y )
{
int x = level*m_indent;
if (!HasFlag(wxTR_HIDE_ROOT))
goto Recurse;
}
- CalculateSize( item, dc );
+ item->CalculateSize(this, dc);
// set its position
item->SetX( x+m_spacing );
Recurse:
wxArrayGenericTreeItems& children = item->GetChildren();
- size_t n, count = children.Count();
+ size_t n, count = children.GetCount();
++level;
for (n = 0; n < count; ++n )
CalculateLevel( children[n], dc, level, y ); // recurse
void wxGenericTreeCtrl::Refresh(bool eraseBackground, const wxRect *rect)
{
- if ( !m_freezeCount )
+ if ( !IsFrozen() )
wxTreeCtrlBase::Refresh(eraseBackground, rect);
}
void wxGenericTreeCtrl::RefreshSubtree(wxGenericTreeItem *item)
{
- if (m_dirty || m_freezeCount)
+ if (m_dirty || IsFrozen() )
return;
wxSize client = GetClientSize();
void wxGenericTreeCtrl::RefreshLine( wxGenericTreeItem *item )
{
- if (m_dirty || m_freezeCount)
+ if (m_dirty || IsFrozen() )
return;
wxRect rect;
void wxGenericTreeCtrl::RefreshSelected()
{
- if (m_freezeCount)
+ if (IsFrozen())
return;
// TODO: this is awfully inefficient, we should keep the list of all
void wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem *item)
{
- if (m_freezeCount)
+ if (IsFrozen())
return;
if ( item->IsSelected() )
}
}
-void wxGenericTreeCtrl::Freeze()
-{
- m_freezeCount++;
-}
-
-void wxGenericTreeCtrl::Thaw()
+void wxGenericTreeCtrl::DoThaw()
{
- wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen tree control?") );
+ wxTreeCtrlBase::DoThaw();
- if ( --m_freezeCount == 0 )
- {
+ if ( m_dirty )
+ DoDirtyProcessing();
+ else
Refresh();
- }
}
// ----------------------------------------------------------------------------
return wxListBox::GetClassDefaultAttributes(variant);
#else
wxVisualAttributes attr;
- attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+ attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT);
attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);
attr.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
return attr;
#endif
}
-#if WXWIN_COMPATIBILITY_2_4
-
-int wxGenericTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
-{
- return GetItemImage(item, wxTreeItemIcon_Selected);
-}
-
-void wxGenericTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
-{
- SetItemImage(item, image, wxTreeItemIcon_Selected);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_4
-
void wxGenericTreeCtrl::DoDirtyProcessing()
{
- if (m_freezeCount)
+ if (IsFrozen())
return;
m_dirty = false;
projects / wxWidgets.git / blobdiff