WX_DEFINE_ARRAY(wxGenericTreeItem *, wxArrayGenericTreeItems);
WX_DEFINE_OBJARRAY(wxArrayTreeItemIds);
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+static const int NO_IMAGE = -1;
+
// -----------------------------------------------------------------------------
// private classes
// -----------------------------------------------------------------------------
class WXDLLEXPORT wxGenericTreeItem
{
public:
- // ctors & dtor
- wxGenericTreeItem() { m_data = NULL; }
- wxGenericTreeItem( wxGenericTreeItem *parent,
- const wxString& text,
- wxDC& dc,
- int image, int selImage,
- wxTreeItemData *data );
+ // ctors & dtor
+ wxGenericTreeItem() { m_data = NULL; }
+ wxGenericTreeItem( wxGenericTreeItem *parent,
+ const wxString& text,
+ wxDC& dc,
+ int image, int selImage,
+ wxTreeItemData *data );
+
+ ~wxGenericTreeItem();
- ~wxGenericTreeItem();
+ // trivial accessors
+ wxArrayGenericTreeItems& GetChildren() { return m_children; }
- // trivial accessors
- wxArrayGenericTreeItems& GetChildren() { return m_children; }
+ const wxString& GetText() const { return m_text; }
+ int GetImage(wxTreeItemIcon which = wxTreeItemIcon_Normal) const
+ { return m_images[which]; }
+ wxTreeItemData *GetData() const { return m_data; }
- const wxString& GetText() const { return m_text; }
- int GetImage() const { return m_image; }
- int GetSelectedImage() const { return m_selImage; }
- wxTreeItemData *GetData() const { return m_data; }
+ // 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) { m_image = image; }
- void SetSelectedImage(int image) { m_selImage = image; }
- void SetData(wxTreeItemData *data) { m_data = data; }
+ void SetText( const wxString &text );
+ void SetImage(int image, wxTreeItemIcon which) { m_images[which] = image; }
+ void SetData(wxTreeItemData *data) { m_data = data; }
- void SetHasPlus(bool has = TRUE) { m_hasPlus = has; }
+ void SetHasPlus(bool has = TRUE) { m_hasPlus = has; }
- void SetBold(bool bold) { m_isBold = bold; }
+ void SetBold(bool bold) { m_isBold = bold; }
- int GetX() const { return m_x; }
- int GetY() const { return m_y; }
+ 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; }
+ 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; }
+ void SetHeight(int h) { m_height = h; }
+ void SetWidth(int w) { m_width = w; }
- wxGenericTreeItem *GetParent() const { return m_parent; }
+ wxGenericTreeItem *GetParent() const { return m_parent; }
- // operations
- // deletes all children notifying the treectrl about it if !NULL pointer
- // given
- void DeleteChildren(wxTreeCtrl *tree = NULL);
- // FIXME don't know what is it for
- void Reset();
+ // operations
+ // deletes all children notifying the treectrl about it if !NULL
+ // pointer given
+ void DeleteChildren(wxTreeCtrl *tree = NULL);
+ // FIXME don't know what is it for
+ void Reset();
- // get count of all children (and grand children if 'recursively')
- size_t GetChildrenCount(bool recursively = TRUE) 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)
+ void Insert(wxGenericTreeItem *child, size_t index)
{ m_children.Insert(child, index); }
- void SetCross( int x, int y );
- void GetSize( int &x, int &y, const wxTreeCtrl* );
+ void SetCross( int x, int y );
+ void GetSize( int &x, int &y, const wxTreeCtrl* );
- // 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
- // button's label
- wxGenericTreeItem *HitTest( const wxPoint& point, const wxTreeCtrl *, int &flags);
+ // 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 button's label
+ wxGenericTreeItem *HitTest( const wxPoint& point, const wxTreeCtrl *, int &flags);
- void Expand() { m_isCollapsed = FALSE; }
- void Collapse() { m_isCollapsed = TRUE; }
+ void Expand() { m_isCollapsed = FALSE; }
+ void Collapse() { m_isCollapsed = TRUE; }
- void SetHilight( bool set = TRUE ) { m_hasHilight = set; }
+ void SetHilight( bool set = TRUE ) { m_hasHilight = set; }
- // status inquiries
- bool HasChildren() const { return !m_children.IsEmpty(); }
- bool HasHilight() const { return m_hasHilight; }
- bool IsExpanded() const { return !m_isCollapsed; }
- bool HasPlus() const { return m_hasPlus || HasChildren(); }
- bool IsBold() const { return m_isBold; }
+ // status inquiries
+ bool HasChildren() const { return !m_children.IsEmpty(); }
+ bool IsSelected() const { return m_hasHilight; }
+ bool IsExpanded() const { return !m_isCollapsed; }
+ bool HasPlus() const { return m_hasPlus || HasChildren(); }
+ bool IsBold() const { return m_isBold; }
+
+ // attributes
+ // get them - may be NULL
+ wxTreeItemAttr *GetAttributes() const { return m_attr; }
+ // get them ensuring that the pointer is not NULL
+ wxTreeItemAttr& Attr()
+ {
+ if ( !m_attr )
+ m_attr = new wxTreeItemAttr;
+
+ return *m_attr;
+ }
private:
- wxString m_text;
-
- int m_image,
- m_selImage;
-
- wxTreeItemData *m_data;
-
- // use bitfields to save size
- int m_isCollapsed :1;
- int m_hasHilight :1; // same as focused
- int m_hasPlus :1; // used for item which doesn't have
- // children but still has a [+] button
- int m_isBold :1; // render the label in bold font
-
- int m_x, m_y;
- long m_height, m_width;
- int m_xCross, m_yCross;
- int m_level;
- wxArrayGenericTreeItems m_children;
- wxGenericTreeItem *m_parent;
+ wxString m_text;
+
+ // tree ctrl images for the normal, selected, expanded and
+ // expanded+selected states
+ int m_images[wxTreeItemIcon_Max];
+
+ wxTreeItemData *m_data;
+
+ // use bitfields to save size
+ int m_isCollapsed :1;
+ int m_hasHilight :1; // same as focused
+ int m_hasPlus :1; // used for item which doesn't have
+ // children but has a [+] button
+ int m_isBold :1; // render the label in bold font
+
+ wxCoord m_x, m_y;
+ wxCoord m_height, m_width;
+ int m_xCross, m_yCross;
+ int m_level;
+
+ wxArrayGenericTreeItems m_children;
+ wxGenericTreeItem *m_parent;
+
+ wxTreeItemAttr *m_attr;
};
// =============================================================================
// implementation
// =============================================================================
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+// translate the key or mouse event flags to the type of selection we're
+// dealing with
+static void EventFlagsToSelType(long style,
+ bool shiftDown,
+ bool ctrlDown,
+ bool *is_multiple,
+ bool *extended_select,
+ bool *unselect_others)
+{
+ *is_multiple = (style & wxTR_MULTIPLE) != 0;
+ *extended_select = shiftDown && is_multiple;
+ *unselect_others = !(extended_select || (ctrlDown && is_multiple));
+}
// -----------------------------------------------------------------------------
// wxTreeRenameTimer (internal)
EVT_KILL_FOCUS (wxTreeTextCtrl::OnKillFocus)
END_EVENT_TABLE()
-wxTreeTextCtrl::wxTreeTextCtrl( wxWindow *parent, const wxWindowID id,
- bool *accept, wxString *res, wxTreeCtrl *owner,
- const wxString &value, const wxPoint &pos, const wxSize &size,
- int style, const wxValidator& validator, const wxString &name ) :
- wxTextCtrl( parent, id, value, pos, size, style, validator, name )
+wxTreeTextCtrl::wxTreeTextCtrl( wxWindow *parent,
+ const wxWindowID id,
+ bool *accept,
+ wxString *res,
+ wxTreeCtrl *owner,
+ const wxString &value,
+ const wxPoint &pos,
+ const wxSize &size,
+ int style,
+ const wxValidator& validator,
+ const wxString &name )
+ : wxTextCtrl( parent, id, value, pos, size, style, validator, name )
{
m_res = res;
m_accept = accept;
m_owner = owner;
+ (*m_accept) = FALSE;
+ (*m_res) = "";
+ m_startValue = value;
}
void wxTreeTextCtrl::OnChar( wxKeyEvent &event )
{
(*m_accept) = TRUE;
(*m_res) = GetValue();
- m_owner->OnRenameAccept();
- if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
+ m_owner->SetFocus();
return;
}
if (event.m_keyCode == WXK_ESCAPE)
{
(*m_accept) = FALSE;
(*m_res) = "";
- if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
+ m_owner->SetFocus();
return;
}
event.Skip();
void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
{
- (*m_accept) = FALSE;
- (*m_res) = "";
- if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
+ if (wxPendingDelete.Member(this)) return;
+
+ wxPendingDelete.Append(this);
+
+ if ((*m_accept) && ((*m_res) != m_startValue))
+ m_owner->OnRenameAccept();
}
#define PIXELS_PER_UNIT 10
// -----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)
-
+
wxTreeEvent::wxTreeEvent( wxEventType commandType, int id )
: wxNotifyEvent( commandType, id )
{
- m_code = 0;
- m_itemOld = (wxGenericTreeItem *)NULL;
+ m_code = 0;
+ m_itemOld = (wxGenericTreeItem *)NULL;
}
// -----------------------------------------------------------------------------
wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent,
const wxString& text,
- wxDC& dc,
+ wxDC& WXUNUSED(dc),
int image, int selImage,
wxTreeItemData *data)
: m_text(text)
{
- m_image = image;
- m_selImage = selImage;
- m_data = data;
- m_x = m_y = 0;
- m_xCross = m_yCross = 0;
+ m_images[wxTreeItemIcon_Normal] = image;
+ m_images[wxTreeItemIcon_Selected] = selImage;
+ m_images[wxTreeItemIcon_Expanded] = NO_IMAGE;
+ m_images[wxTreeItemIcon_SelectedExpanded] = NO_IMAGE;
- m_level = 0;
+ m_data = data;
+ m_x = m_y = 0;
+ m_xCross = m_yCross = 0;
- m_isCollapsed = TRUE;
- m_hasHilight = FALSE;
- m_hasPlus = FALSE;
- m_isBold = FALSE;
+ m_level = 0;
- m_parent = parent;
+ m_isCollapsed = TRUE;
+ m_hasHilight = FALSE;
+ m_hasPlus = FALSE;
+ m_isBold = FALSE;
- dc.GetTextExtent( m_text, &m_width, &m_height );
- // TODO : Add the width of the image
- // PB : We don't know which image is shown (image, selImage)
- // We don't even know imageList from the treectrl this item belongs to !!!
- // At this point m_width doesn't mean much, this can be remove !
+ m_parent = parent;
+
+ m_attr = (wxTreeItemAttr *)NULL;
+
+ // We don't know the height here yet.
+ m_width = 0;
+ m_height = 0;
}
wxGenericTreeItem::~wxGenericTreeItem()
{
- delete m_data;
+ delete m_data;
+
+ delete m_attr;
- wxASSERT_MSG( m_children.IsEmpty(),
- _T("please call DeleteChildren() before deleting the item") );
+ wxASSERT_MSG( m_children.IsEmpty(),
+ wxT("please call DeleteChildren() before deleting the item") );
}
void wxGenericTreeItem::DeleteChildren(wxTreeCtrl *tree)
{
- size_t count = m_children.Count();
- for ( size_t n = 0; n < count; n++ )
- {
- wxGenericTreeItem *child = m_children[n];
- if ( tree )
+ size_t count = m_children.Count();
+ for ( size_t n = 0; n < count; n++ )
{
- tree->SendDeleteEvent(child);
- }
+ wxGenericTreeItem *child = m_children[n];
+ if (tree)
+ tree->SendDeleteEvent(child);
- child->DeleteChildren(tree);
- delete child;
- }
+ child->DeleteChildren(tree);
+ delete child;
+ }
- m_children.Empty();
+ m_children.Empty();
}
void wxGenericTreeItem::SetText( const wxString &text )
{
- m_text = text;
+ m_text = text;
}
void wxGenericTreeItem::Reset()
{
- m_text.Empty();
- m_image =
- m_selImage = -1;
- m_data = NULL;
- m_x = m_y =
- m_height = m_width = 0;
- m_xCross =
- m_yCross = 0;
+ m_text.Empty();
+ for ( int i = 0; i < wxTreeItemIcon_Max; i++ )
+ {
+ m_images[i] = NO_IMAGE;
+ }
+
+ m_data = NULL;
+ m_x = m_y =
+ m_height = m_width = 0;
+ m_xCross =
+ m_yCross = 0;
- m_level = 0;
+ m_level = 0;
- DeleteChildren();
- m_isCollapsed = TRUE;
+ DeleteChildren();
+ m_isCollapsed = TRUE;
- m_parent = (wxGenericTreeItem *)NULL;
+ m_parent = (wxGenericTreeItem *)NULL;
}
size_t wxGenericTreeItem::GetChildrenCount(bool recursively) const
{
- size_t count = m_children.Count();
- if ( !recursively )
- return count;
+ 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]->GetChildrenCount();
- }
+ size_t total = count;
+ for (size_t n = 0; n < count; ++n)
+ {
+ total += m_children[n]->GetChildrenCount();
+ }
- return total;
+ return total;
}
void wxGenericTreeItem::SetCross( int x, int y )
{
- m_xCross = x;
- m_yCross = y;
+ m_xCross = x;
+ m_yCross = y;
}
void wxGenericTreeItem::GetSize( int &x, int &y, const wxTreeCtrl *theTree )
{
- int bottomY=m_y+theTree->GetLineHeight(this);
- if ( y < bottomY ) y = bottomY;
- int width = m_x + m_width;
- if ( x < width ) x = width;
+ int bottomY=m_y+theTree->GetLineHeight(this);
+ if ( y < bottomY ) y = bottomY;
+ int width = m_x + m_width;
+ if ( x < width ) x = width;
- if (IsExpanded())
- {
- size_t count = m_children.Count();
- for ( size_t n = 0; n < count; ++n )
+ if (IsExpanded())
{
- m_children[n]->GetSize( x, y, theTree );
+ size_t count = m_children.Count();
+ for ( size_t n = 0; n < count; ++n )
+ {
+ m_children[n]->GetSize( x, y, theTree );
+ }
}
- }
}
wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
const wxTreeCtrl *theTree,
int &flags)
{
- if ((point.y > m_y) && (point.y < m_y + theTree->GetLineHeight(this)))
- {
- if (point.y<m_y+theTree->GetLineHeight(this)/2) flags|=wxTREE_HITTEST_ONITEMUPPERPART;
- else flags|=wxTREE_HITTEST_ONITEMLOWERPART;
-
- // FIXME why +5?
- // Because that is the size of the plus sign, RR
- if ((point.x > m_xCross-5) && (point.x < m_xCross+5) &&
- (point.y > m_yCross-5) && (point.y < m_yCross+5) &&
- (IsExpanded() || HasPlus()))
+ if ((point.y > m_y) && (point.y < m_y + theTree->GetLineHeight(this)))
{
- flags|=wxTREE_HITTEST_ONITEMBUTTON;
- return this;
- }
+ if (point.y<m_y+theTree->GetLineHeight(this)/2)
+ flags |= wxTREE_HITTEST_ONITEMUPPERPART;
+ else
+ flags |= wxTREE_HITTEST_ONITEMLOWERPART;
- if ((point.x >= m_x) && (point.x <= m_x+m_width))
- {
- int image_w = -1;
- int image_h;
+ // 5 is the size of the plus sign
+ if ((point.x > m_xCross-5) && (point.x < m_xCross+5) &&
+ (point.y > m_yCross-5) && (point.y < m_yCross+5) &&
+ (IsExpanded() || HasPlus()))
+ {
+ flags|=wxTREE_HITTEST_ONITEMBUTTON;
+ return this;
+ }
- // assuming every image (normal and selected ) has the same size !
- if ((m_image!=-1) && theTree->m_imageListNormal)
- theTree->m_imageListNormal->GetSize(m_image, image_w, image_h);
+ if ((point.x >= m_x) && (point.x <= m_x+m_width))
+ {
+ int image_w = -1;
+ int image_h;
- if ((image_w != -1) && (point.x <= m_x + image_w + 1))
- flags|=wxTREE_HITTEST_ONITEMICON;
- else
- flags|=wxTREE_HITTEST_ONITEMLABEL;
+ // assuming every image (normal and selected ) has the same size !
+ if ( (GetImage() != NO_IMAGE) && theTree->m_imageListNormal )
+ theTree->m_imageListNormal->GetSize(GetImage(), image_w, image_h);
- return this;
+ if ((image_w != -1) && (point.x <= m_x + image_w + 1))
+ flags |= wxTREE_HITTEST_ONITEMICON;
+ else
+ flags |= wxTREE_HITTEST_ONITEMLABEL;
+
+ return this;
+ }
+
+ if (point.x < m_x)
+ flags |= wxTREE_HITTEST_ONITEMINDENT;
+ if (point.x > m_x+m_width)
+ flags |= wxTREE_HITTEST_ONITEMRIGHT;
+
+ return this;
+ }
+ else
+ {
+ if (!m_isCollapsed)
+ {
+ size_t count = m_children.Count();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ wxGenericTreeItem *res = m_children[n]->HitTest( point, theTree, flags );
+ if ( res != NULL )
+ return res;
+ }
+ }
}
- if (point.x < m_x) flags|=wxTREE_HITTEST_ONITEMIDENT;
- if (point.x > m_x+m_width) flags|=wxTREE_HITTEST_ONITEMRIGHT;
+ flags|=wxTREE_HITTEST_NOWHERE;
- return this;
- }
- else
- {
- if (!m_isCollapsed)
+ return (wxGenericTreeItem*) NULL;
+}
+
+int wxGenericTreeItem::GetCurrentImage() const
+{
+ int image = NO_IMAGE;
+ if ( IsExpanded() )
{
- size_t count = m_children.Count();
- for ( size_t n = 0; n < count; n++ )
- {
- wxGenericTreeItem *res = m_children[n]->HitTest( point, theTree, flags );
- if ( res != NULL )
- return res;
- }
+ if ( IsSelected() )
+ {
+ image = GetImage(wxTreeItemIcon_SelectedExpanded);
+ }
+
+ if ( image == NO_IMAGE )
+ {
+ // we usually fall back to the normal item, but try just the
+ // expanded one (and not selected) first in this case
+ image = GetImage(wxTreeItemIcon_Expanded);
+ }
+ }
+ else // not expanded
+ {
+ if ( IsSelected() )
+ image = GetImage(wxTreeItemIcon_Selected);
+ }
+
+ // may be it doesn't have the specific image we want, try the default one
+ // instead
+ if ( image == NO_IMAGE )
+ {
+ image = GetImage();
}
- }
- flags|=wxTREE_HITTEST_NOWHERE;
- return NULL;
+ return image;
}
// -----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxScrolledWindow)
BEGIN_EVENT_TABLE(wxTreeCtrl,wxScrolledWindow)
- EVT_PAINT (wxTreeCtrl::OnPaint)
- EVT_MOUSE_EVENTS (wxTreeCtrl::OnMouse)
- EVT_CHAR (wxTreeCtrl::OnChar)
- EVT_SET_FOCUS (wxTreeCtrl::OnSetFocus)
- EVT_KILL_FOCUS (wxTreeCtrl::OnKillFocus)
- EVT_IDLE (wxTreeCtrl::OnIdle)
+ EVT_PAINT (wxTreeCtrl::OnPaint)
+ EVT_MOUSE_EVENTS (wxTreeCtrl::OnMouse)
+ EVT_CHAR (wxTreeCtrl::OnChar)
+ EVT_SET_FOCUS (wxTreeCtrl::OnSetFocus)
+ EVT_KILL_FOCUS (wxTreeCtrl::OnKillFocus)
+ EVT_IDLE (wxTreeCtrl::OnIdle)
END_EVENT_TABLE()
// -----------------------------------------------------------------------------
void wxTreeCtrl::Init()
{
- m_current =
- m_key_current =
- m_anchor = (wxGenericTreeItem *) NULL;
- m_hasFocus = FALSE;
- m_dirty = FALSE;
+ m_current =
+ m_key_current =
+ m_anchor = (wxGenericTreeItem *) NULL;
+ m_hasFocus = FALSE;
+ m_dirty = FALSE;
- m_xScroll = 0;
- m_yScroll = 0;
- m_lineHeight = 10;
- m_indent = 15;
- m_spacing = 18;
+ m_xScroll = 0;
+ m_yScroll = 0;
+ m_lineHeight = 10;
+ m_indent = 15;
+ m_spacing = 18;
- m_hilightBrush = new wxBrush
+ m_hilightBrush = new wxBrush
(
wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT),
wxSOLID
);
- m_imageListNormal =
- m_imageListState = (wxImageList *) NULL;
+ m_imageListNormal =
+ m_imageListState = (wxImageList *) NULL;
+
+ m_dragCount = 0;
- m_dragCount = 0;
-
- m_renameTimer = new wxTreeRenameTimer( this );
+ m_renameTimer = new wxTreeRenameTimer( this );
+
+ m_normalFont = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT );
+ m_boldFont = wxFont( m_normalFont.GetPointSize(),
+ m_normalFont.GetFamily(),
+ m_normalFont.GetStyle(),
+ wxBOLD,
+ m_normalFont.GetUnderlined());
}
bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
long style,
- const wxValidator &validator,
- const wxString& name )
+ const wxValidator &validator,
+ const wxString& name )
{
- Init();
+ Init();
- wxScrolledWindow::Create( parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name );
+ wxScrolledWindow::Create( parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name );
#if wxUSE_VALIDATORS
- SetValidator( validator );
+ SetValidator( validator );
#endif
- SetBackgroundColour( *wxWHITE );
-// m_dottedPen = wxPen( "grey", 0, wxDOT );
- m_dottedPen = wxPen( "grey", 0, 0 );
+ SetBackgroundColour( *wxWHITE );
+// m_dottedPen = wxPen( "grey", 0, wxDOT ); too slow under XFree86
+ m_dottedPen = wxPen( "grey", 0, 0 );
- return TRUE;
+ return TRUE;
}
wxTreeCtrl::~wxTreeCtrl()
{
- wxDELETE( m_hilightBrush );
+ wxDELETE( m_hilightBrush );
+
+ DeleteAllItems();
- DeleteAllItems();
-
- delete m_renameTimer;
+ delete m_renameTimer;
}
// -----------------------------------------------------------------------------
size_t wxTreeCtrl::GetCount() const
{
- return m_anchor == NULL ? 0u : m_anchor->GetChildrenCount();
+ return m_anchor == NULL ? 0u : m_anchor->GetChildrenCount();
}
void wxTreeCtrl::SetIndent(unsigned int indent)
{
- m_indent = indent;
- m_dirty = TRUE;
- Refresh();
+ m_indent = indent;
+ m_dirty = TRUE;
}
void wxTreeCtrl::SetSpacing(unsigned int spacing)
{
- m_spacing = spacing;
- m_dirty = TRUE;
- Refresh();
+ m_spacing = spacing;
+ m_dirty = TRUE;
}
size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
{
- wxCHECK_MSG( item.IsOk(), 0u, _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), 0u, wxT("invalid tree item") );
- return item.m_pItem->GetChildrenCount(recursively);
+ return item.m_pItem->GetChildrenCount(recursively);
}
// -----------------------------------------------------------------------------
wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), _T(""), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxT(""), wxT("invalid tree item") );
- return item.m_pItem->GetText();
+ return item.m_pItem->GetText();
}
-int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const
+int wxTreeCtrl::GetItemImage(const wxTreeItemId& item,
+ wxTreeItemIcon which) const
{
- wxCHECK_MSG( item.IsOk(), -1, _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), -1, wxT("invalid tree item") );
- return item.m_pItem->GetImage();
+ return item.m_pItem->GetImage(which);
}
-int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
+wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), -1, _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), NULL, wxT("invalid tree item") );
- return item.m_pItem->GetSelectedImage();
+ return item.m_pItem->GetData();
}
-wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
+void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
{
- wxCHECK_MSG( item.IsOk(), NULL, _T("invalid tree item") );
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
- return item.m_pItem->GetData();
+ wxClientDC dc(this);
+ wxGenericTreeItem *pItem = item.m_pItem;
+ pItem->SetText(text);
+ CalculateSize(pItem, dc);
+ RefreshLine(pItem);
}
-void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
+void wxTreeCtrl::SetItemImage(const wxTreeItemId& item,
+ int image,
+ wxTreeItemIcon which)
{
- wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
- wxClientDC dc(this);
- wxGenericTreeItem *pItem = item.m_pItem;
- pItem->SetText(text);
- CalculateSize(pItem, dc);
- RefreshLine(pItem);
+ wxGenericTreeItem *pItem = item.m_pItem;
+ pItem->SetImage(image, which);
+
+ wxClientDC dc(this);
+ CalculateSize(pItem, dc);
+ RefreshLine(pItem);
}
-void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image)
+void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
{
- wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
- wxClientDC dc(this);
- wxGenericTreeItem *pItem = item.m_pItem;
- pItem->SetImage(image);
- CalculateSize(pItem, dc);
- RefreshLine(pItem);
+ item.m_pItem->SetData(data);
}
-void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
+void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
{
- wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
- wxClientDC dc(this);
- wxGenericTreeItem *pItem = item.m_pItem;
- pItem->SetSelectedImage(image);
- CalculateSize(pItem, dc);
- RefreshLine(pItem);
+ wxGenericTreeItem *pItem = item.m_pItem;
+ pItem->SetHasPlus(has);
+ RefreshLine(pItem);
}
-void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
+void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
{
- wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
- item.m_pItem->SetData(data);
+ // avoid redrawing the tree if no real change
+ wxGenericTreeItem *pItem = item.m_pItem;
+ if ( pItem->IsBold() != bold )
+ {
+ pItem->SetBold(bold);
+ RefreshLine(pItem);
+ }
}
-void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
+void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item,
+ const wxColour& col)
{
- wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
- wxGenericTreeItem *pItem = item.m_pItem;
- pItem->SetHasPlus(has);
- RefreshLine(pItem);
+ wxGenericTreeItem *pItem = item.m_pItem;
+ pItem->Attr().SetTextColour(col);
+ RefreshLine(pItem);
}
-void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
+void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item,
+ const wxColour& col)
{
- wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
- // avoid redrawing the tree if no real change
- wxGenericTreeItem *pItem = item.m_pItem;
- if ( pItem->IsBold() != bold )
- {
- pItem->SetBold(bold);
+ wxGenericTreeItem *pItem = item.m_pItem;
+ pItem->Attr().SetBackgroundColour(col);
+ RefreshLine(pItem);
+}
+
+void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
+{
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
+ wxGenericTreeItem *pItem = item.m_pItem;
+ pItem->Attr().SetFont(font);
RefreshLine(pItem);
- }
}
// -----------------------------------------------------------------------------
bool wxTreeCtrl::IsVisible(const wxTreeItemId& WXUNUSED(item)) const
{
- wxFAIL_MSG(_T("not implemented"));
+ wxFAIL_MSG(wxT("not implemented"));
- return TRUE;
+ return TRUE;
}
bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") );
- return !item.m_pItem->GetChildren().IsEmpty();
+ return !item.m_pItem->GetChildren().IsEmpty();
}
bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") );
- return item.m_pItem->IsExpanded();
+ return item.m_pItem->IsExpanded();
}
bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") );
- return item.m_pItem->HasHilight();
+ return item.m_pItem->IsSelected();
}
bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") );
- return item.m_pItem->IsBold();
+ return item.m_pItem->IsBold();
}
// -----------------------------------------------------------------------------
wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
return item.m_pItem->GetParent();
}
wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
cookie = 0;
return GetNextChild(item, cookie);
wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
wxArrayGenericTreeItems& children = item.m_pItem->GetChildren();
if ( (size_t)cookie < children.Count() )
{
- return children.Item(cookie++);
+ return children.Item((size_t)cookie++);
}
else
{
wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
wxArrayGenericTreeItems& children = item.m_pItem->GetChildren();
return (children.IsEmpty() ? wxTreeItemId() : wxTreeItemId(children.Last()));
wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
wxGenericTreeItem *i = item.m_pItem;
wxGenericTreeItem *parent = i->GetParent();
wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
wxGenericTreeItem *i = item.m_pItem;
wxGenericTreeItem *parent = i->GetParent();
wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
{
- wxFAIL_MSG(_T("not implemented"));
+ wxFAIL_MSG(wxT("not implemented"));
return wxTreeItemId();
}
wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
- wxFAIL_MSG(_T("not implemented"));
+ wxFAIL_MSG(wxT("not implemented"));
return wxTreeItemId();
}
wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
- wxFAIL_MSG(_T("not implemented"));
+ wxFAIL_MSG(wxT("not implemented"));
return wxTreeItemId();
}
int image, int selImage,
wxTreeItemData *data)
{
- wxGenericTreeItem *parent = parentId.m_pItem;
- if ( !parent )
- {
- // should we give a warning here?
- return AddRoot(text, image, selImage, data);
- }
+ wxGenericTreeItem *parent = parentId.m_pItem;
+ if ( !parent )
+ {
+ // should we give a warning here?
+ return AddRoot(text, image, selImage, data);
+ }
- wxClientDC dc(this);
- wxGenericTreeItem *item = new wxGenericTreeItem(parent,
- text, dc,
- image, selImage,
- data);
+ wxClientDC dc(this);
+ wxGenericTreeItem *item =
+ new wxGenericTreeItem( parent, text, dc, image, selImage, data );
- if ( data != NULL )
- {
- data->m_pItem = item;
- }
+ if ( data != NULL )
+ {
+ data->m_pItem = item;
+ }
- parent->Insert( item, previous );
+ parent->Insert( item, previous );
- m_dirty = TRUE;
+ m_dirty = TRUE;
- return item;
+ return item;
}
wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
int image, int selImage,
wxTreeItemData *data)
{
- wxCHECK_MSG( !m_anchor, wxTreeItemId(), _T("tree can have only one root") );
+ wxCHECK_MSG( !m_anchor, wxTreeItemId(), wxT("tree can have only one root") );
- wxClientDC dc(this);
- m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text, dc,
+ wxClientDC dc(this);
+ m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text, dc,
image, selImage, data);
- if ( data != NULL )
- {
- data->m_pItem = m_anchor;
- }
+ if ( data != NULL )
+ {
+ data->m_pItem = m_anchor;
+ }
- Refresh();
- AdjustMyScrollbars();
+ if (!HasFlag(wxTR_MULTIPLE))
+ {
+ m_current = m_key_current = m_anchor;
+ m_current->SetHilight( TRUE );
+ }
- return m_anchor;
+ Refresh();
+ AdjustMyScrollbars();
+
+ return m_anchor;
}
wxTreeItemId wxTreeCtrl::PrependItem(const wxTreeItemId& parent,
int image, int selImage,
wxTreeItemData *data)
{
- return DoInsertItem(parent, 0u, text, image, selImage, data);
+ return DoInsertItem(parent, 0u, text, image, selImage, data);
}
wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parentId,
int image, int selImage,
wxTreeItemData *data)
{
- wxGenericTreeItem *parent = parentId.m_pItem;
- if ( !parent )
- {
- // should we give a warning here?
- return AddRoot(text, image, selImage, data);
- }
+ wxGenericTreeItem *parent = parentId.m_pItem;
+ if ( !parent )
+ {
+ // should we give a warning here?
+ return AddRoot(text, image, selImage, data);
+ }
+
+ int index = parent->GetChildren().Index(idPrevious.m_pItem);
+ wxASSERT_MSG( index != wxNOT_FOUND,
+ wxT("previous item in wxTreeCtrl::InsertItem() is not a sibling") );
+
+ return DoInsertItem(parentId, (size_t)++index, text, image, selImage, data);
+}
+
+wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parentId,
+ size_t before,
+ const wxString& text,
+ int image, int selImage,
+ wxTreeItemData *data)
+{
+ wxGenericTreeItem *parent = parentId.m_pItem;
+ if ( !parent )
+ {
+ // should we give a warning here?
+ return AddRoot(text, image, selImage, data);
+ }
- int index = parent->GetChildren().Index(idPrevious.m_pItem);
- wxASSERT_MSG( index != wxNOT_FOUND,
- _T("previous item in wxTreeCtrl::InsertItem() is not a sibling") );
- return DoInsertItem(parentId, (size_t)++index, text, image, selImage, data);
+ return DoInsertItem(parentId, before, text, image, selImage, data);
}
wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parentId,
int image, int selImage,
wxTreeItemData *data)
{
- wxGenericTreeItem *parent = parentId.m_pItem;
- if ( !parent )
- {
- // should we give a warning here?
- return AddRoot(text, image, selImage, data);
- }
+ wxGenericTreeItem *parent = parentId.m_pItem;
+ if ( !parent )
+ {
+ // should we give a warning here?
+ return AddRoot(text, image, selImage, data);
+ }
- return DoInsertItem(parent, parent->GetChildren().Count(), text,
- image, selImage, data);
+ return DoInsertItem( parent, parent->GetChildren().Count(), text,
+ image, selImage, data);
}
void wxTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item)
{
- wxTreeEvent event( wxEVT_COMMAND_TREE_DELETE_ITEM, GetId() );
- event.m_item = item;
- event.SetEventObject( this );
- ProcessEvent( event );
+ wxTreeEvent event( wxEVT_COMMAND_TREE_DELETE_ITEM, GetId() );
+ event.m_item = item;
+ event.SetEventObject( this );
+ ProcessEvent( event );
}
void wxTreeCtrl::DeleteChildren(const wxTreeItemId& itemId)
void wxTreeCtrl::Delete(const wxTreeItemId& itemId)
{
- wxGenericTreeItem *item = itemId.m_pItem;
- wxGenericTreeItem *parent = item->GetParent();
+ wxGenericTreeItem *item = itemId.m_pItem;
+ wxGenericTreeItem *parent = item->GetParent();
- if ( parent )
- {
- parent->GetChildren().Remove(item);
- }
+ if ( parent )
+ {
+ parent->GetChildren().Remove( item ); // remove by value
+ }
- item->DeleteChildren(this);
- SendDeleteEvent(item);
- delete item;
+ item->DeleteChildren(this);
+ SendDeleteEvent(item);
+ delete item;
- m_dirty = TRUE;
+ m_dirty = TRUE;
}
void wxTreeCtrl::DeleteAllItems()
{
- if ( m_anchor )
- {
- m_anchor->DeleteChildren(this);
- delete m_anchor;
+ if ( m_anchor )
+ {
+ m_anchor->DeleteChildren(this);
+ delete m_anchor;
- m_anchor = NULL;
+ m_anchor = NULL;
- m_dirty = TRUE;
- }
+ m_dirty = TRUE;
+ }
}
void wxTreeCtrl::Expand(const wxTreeItemId& itemId)
{
- wxGenericTreeItem *item = itemId.m_pItem;
+ wxGenericTreeItem *item = itemId.m_pItem;
- if ( !item->HasPlus() )
- return;
+ if ( !item->HasPlus() )
+ return;
- if ( item->IsExpanded() )
- return;
+ if ( item->IsExpanded() )
+ return;
- wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, GetId() );
- event.m_item = item;
- event.SetEventObject( this );
- if ( ProcessEvent( event ) && event.m_code )
- {
- // cancelled by program
- return;
- }
+ wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, GetId() );
+ event.m_item = item;
+ event.SetEventObject( this );
+
+// if ( ProcessEvent( event ) && event.m_code ) TODO: Was this a typo ?
+ if ( ProcessEvent( event ) && !event.IsAllowed() )
+ {
+ // cancelled by program
+ return;
+ }
- item->Expand();
- CalculatePositions();
+ item->Expand();
+ CalculatePositions();
- RefreshSubtree(item);
+ RefreshSubtree(item);
- event.SetEventType(wxEVT_COMMAND_TREE_ITEM_EXPANDED);
- ProcessEvent( event );
+ event.SetEventType(wxEVT_COMMAND_TREE_ITEM_EXPANDED);
+ ProcessEvent( event );
}
void wxTreeCtrl::Collapse(const wxTreeItemId& itemId)
{
- wxGenericTreeItem *item = itemId.m_pItem;
+ wxGenericTreeItem *item = itemId.m_pItem;
- if ( !item->IsExpanded() )
- return;
+ if ( !item->IsExpanded() )
+ return;
- wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId() );
- event.m_item = item;
- event.SetEventObject( this );
- if ( ProcessEvent( event ) && event.m_code )
- {
- // cancelled by program
- return;
- }
+ wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId() );
+ event.m_item = item;
+ event.SetEventObject( this );
+ if ( ProcessEvent( event ) && !event.IsAllowed() )
+ {
+ // cancelled by program
+ return;
+ }
- item->Collapse();
+ item->Collapse();
- wxArrayGenericTreeItems& children = item->GetChildren();
- size_t count = children.Count();
- for ( size_t n = 0; n < count; n++ )
- {
- Collapse(children[n]);
- }
+ wxArrayGenericTreeItems& children = item->GetChildren();
+ size_t count = children.Count();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ Collapse(children[n]);
+ }
- CalculatePositions();
+ CalculatePositions();
- RefreshSubtree(item);
+ RefreshSubtree(item);
- event.SetEventType(wxEVT_COMMAND_TREE_ITEM_COLLAPSED);
- ProcessEvent( event );
+ event.SetEventType(wxEVT_COMMAND_TREE_ITEM_COLLAPSED);
+ ProcessEvent( event );
}
void wxTreeCtrl::CollapseAndReset(const wxTreeItemId& item)
{
- Collapse(item);
- DeleteChildren(item);
+ Collapse(item);
+ DeleteChildren(item);
}
void wxTreeCtrl::Toggle(const wxTreeItemId& itemId)
{
- wxGenericTreeItem *item = itemId.m_pItem;
+ wxGenericTreeItem *item = itemId.m_pItem;
- if ( item->IsExpanded() )
- Collapse(itemId);
- else
- Expand(itemId);
+ if (item->IsExpanded())
+ Collapse(itemId);
+ else
+ Expand(itemId);
}
void wxTreeCtrl::Unselect()
{
- if ( m_current )
- {
- m_current->SetHilight( FALSE );
- RefreshLine( m_current );
- }
+ if (m_current)
+ {
+ m_current->SetHilight( FALSE );
+ RefreshLine( m_current );
+ }
}
void wxTreeCtrl::UnselectAllChildren(wxGenericTreeItem *item)
{
- item->SetHilight(FALSE);
- RefreshLine(item);
+ if (item->IsSelected())
+ {
+ item->SetHilight(FALSE);
+ RefreshLine(item);
+ }
- if (item->HasChildren())
+ if (item->HasChildren())
{
- wxArrayGenericTreeItems& children = item->GetChildren();
- size_t count = children.Count();
- for ( size_t n = 0; n < count; ++n )
- UnselectAllChildren(children[n]);
+ wxArrayGenericTreeItems& children = item->GetChildren();
+ size_t count = children.Count();
+ for ( size_t n = 0; n < count; ++n )
+ {
+ UnselectAllChildren(children[n]);
+ }
}
}
void wxTreeCtrl::UnselectAll()
{
- UnselectAllChildren(GetRootItem().m_pItem);
+ UnselectAllChildren(GetRootItem().m_pItem);
}
// Recursive function !
{
wxGenericTreeItem *parent = crt_item->GetParent();
- if ( parent == NULL ) // This is root item
- return TagAllChildrenUntilLast(crt_item, last_item, select);
+ if (parent == NULL) // This is root item
+ return TagAllChildrenUntilLast(crt_item, last_item, select);
wxArrayGenericTreeItems& children = parent->GetChildren();
int index = children.Index(crt_item);
size_t count = children.Count();
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 wxTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, wxGenericTreeItem *last_item, bool select)
{
- crt_item->SetHilight(select);
- RefreshLine(crt_item);
+ crt_item->SetHilight(select);
+ RefreshLine(crt_item);
- if (crt_item==last_item) return TRUE;
+ if (crt_item==last_item)
+ return TRUE;
- if (crt_item->HasChildren())
+ if (crt_item->HasChildren())
{
- wxArrayGenericTreeItems& children = crt_item->GetChildren();
- size_t count = children.Count();
- for ( size_t n = 0; n < count; ++n )
- if (TagAllChildrenUntilLast(children[n], last_item, select)) return TRUE;
+ wxArrayGenericTreeItems& children = crt_item->GetChildren();
+ size_t count = children.Count();
+ for ( size_t n = 0; n < count; ++n )
+ {
+ if (TagAllChildrenUntilLast(children[n], last_item, select))
+ return TRUE;
+ }
}
return FALSE;
void wxTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *item2)
{
- // item2 is not necessary after item1
- wxGenericTreeItem *first=NULL, *last=NULL;
+ // item2 is not necessary after item1
+ wxGenericTreeItem *first=NULL, *last=NULL;
- // choice first' and 'last' between item1 and item2
- if (item1->GetY()<item2->GetY())
+ // choice first' and 'last' between item1 and item2
+ if (item1->GetY()<item2->GetY())
{
- first=item1;
- last=item2;
+ first=item1;
+ last=item2;
}
- else
+ else
{
- first=item2;
- last=item1;
+ first=item2;
+ last=item1;
}
- bool select=m_current->HasHilight();
+ bool select = m_current->IsSelected();
- if (TagAllChildrenUntilLast(first,last,select)) return;
+ if ( TagAllChildrenUntilLast(first,last,select) )
+ return;
- TagNextChildren(first,last,select);
+ TagNextChildren(first,last,select);
}
void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
bool unselect_others,
bool extended_select)
{
- wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") );
+ wxCHECK_RET( itemId.IsOk(), wxT("invalid tree item") );
bool is_single=!(GetWindowStyleFlag() & wxTR_MULTIPLE);
+ wxGenericTreeItem *item = itemId.m_pItem;
//wxCHECK_RET( ( (!unselect_others) && is_single),
- // _T("this is a single selection tree") );
+ // wxT("this is a single selection tree") );
// to keep going anyhow !!!
if (is_single)
{
- unselect_others=TRUE;
- extended_select=FALSE;
+ if (item->IsSelected())
+ return; // nothing to do
+ unselect_others = TRUE;
+ extended_select = FALSE;
+ }
+ else if ( unselect_others && item->IsSelected() )
+ {
+ // selection change if there is more than one item currently selected
+ wxArrayTreeItemIds selected_items;
+ if ( GetSelections(selected_items) == 1 )
+ return;
}
-
- wxGenericTreeItem *item = itemId.m_pItem;
wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGING, GetId() );
event.m_item = item;
// Check if we need to toggle hilight (ctrl mode)
if (!unselect_others)
- select=!item->HasHilight();
+ select=!item->IsSelected();
m_current = m_key_current = item;
m_current->SetHilight(select);
GetEventHandler()->ProcessEvent( event );
}
-void wxTreeCtrl::FillArray(wxGenericTreeItem *item, wxArrayTreeItemIds &array) const
+void wxTreeCtrl::FillArray(wxGenericTreeItem *item,
+ wxArrayTreeItemIds &array) const
{
- if (item->HasHilight()) array.Add(wxTreeItemId(item));
+ if ( item->IsSelected() )
+ array.Add(wxTreeItemId(item));
- if (item->HasChildren())
+ if ( item->HasChildren() )
{
- wxArrayGenericTreeItems& children = item->GetChildren();
- size_t count = children.Count();
- for ( size_t n = 0; n < count; ++n )
- FillArray(children[n],array);
+ wxArrayGenericTreeItems& children = item->GetChildren();
+ size_t count = children.GetCount();
+ for ( size_t n = 0; n < count; ++n )
+ FillArray(children[n],array);
}
}
// first expand all parent branches
wxGenericTreeItem *parent = gitem->GetParent();
- while ( parent && !parent->IsExpanded() )
+ while ( parent )
{
Expand(parent);
-
parent = parent->GetParent();
}
- if (parent) CalculatePositions();
+ //if (parent) CalculatePositions();
ScrollTo(item);
}
{
if (!item.IsOk()) return;
+ // 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) wxYield();
+
wxGenericTreeItem *gitem = item.m_pItem;
// now scroll to the item
int y = 0;
m_anchor->GetSize( x, y, this );
y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
+ 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 );
}
else if (item_y+GetLineHeight(gitem) > start_y+client_h)
{
- // going up
- int x = 0;
- int y = 0;
- m_anchor->GetSize( x, y, this );
- y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
- item_y += PIXELS_PER_UNIT+2;
- int x_pos = GetScrollPos( wxHORIZONTAL );
+ // going up
+ int x = 0;
+ int y = 0;
+ m_anchor->GetSize( x, y, this );
+ y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
+ x += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
+ 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 );
}
}
// FIXME: tree sorting functions are not reentrant and not MT-safe!
static wxTreeCtrl *s_treeBeingSorted = NULL;
-static int tree_ctrl_compare_func(wxGenericTreeItem **item1,
+static int LINKAGEMODE tree_ctrl_compare_func(wxGenericTreeItem **item1,
wxGenericTreeItem **item2)
{
- wxCHECK_MSG( s_treeBeingSorted, 0, _T("bug in wxTreeCtrl::SortChildren()") );
+ wxCHECK_MSG( s_treeBeingSorted, 0, wxT("bug in wxTreeCtrl::SortChildren()") );
return s_treeBeingSorted->OnCompareItems(*item1, *item2);
}
void wxTreeCtrl::SortChildren(const wxTreeItemId& itemId)
{
- wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") );
+ wxCHECK_RET( itemId.IsOk(), wxT("invalid tree item") );
wxGenericTreeItem *item = itemId.m_pItem;
wxCHECK_RET( !s_treeBeingSorted,
- _T("wxTreeCtrl::SortChildren is not reentrant") );
+ wxT("wxTreeCtrl::SortChildren is not reentrant") );
wxArrayGenericTreeItems& children = item->GetChildren();
if ( children.Count() > 1 )
void wxTreeCtrl::SetImageList(wxImageList *imageList)
{
- m_imageListNormal = imageList;
+ m_imageListNormal = imageList;
- // Calculate a m_lineHeight value from the image sizes.
- // May be toggle off. Then wxTreeCtrl will spread when
- // necessary (which might look ugly).
+ // Calculate a m_lineHeight value from the image sizes.
+ // May be toggle off. Then wxTreeCtrl will spread when
+ // necessary (which might look ugly).
#if 1
- wxPaintDC dc(this);
- m_lineHeight = (int)(dc.GetCharHeight() + 4);
- int
- width = 0,
- height = 0,
- n = m_imageListNormal->GetImageCount();
- for(int i = 0; i < n ; i++)
- {
- m_imageListNormal->GetSize(i, width, height);
- if(height > m_lineHeight) m_lineHeight = height;
- }
-
- if (m_lineHeight<40) m_lineHeight+=4; // at least 4 pixels (odd such that a line can be drawn in between)
- else m_lineHeight+=m_lineHeight/10; // otherwise 10% extra spacing
+ wxClientDC dc(this);
+ m_lineHeight = (int)(dc.GetCharHeight() + 4);
+ int width = 0, height = 0,
+ n = m_imageListNormal->GetImageCount();
+
+ for (int i = 0; i < n ; i++)
+ {
+ m_imageListNormal->GetSize(i, width, height);
+ if (height > m_lineHeight) m_lineHeight = height;
+ }
+ if (m_lineHeight < 40)
+ m_lineHeight += 2; // at least 2 pixels
+ else
+ m_lineHeight += m_lineHeight/10; // otherwise 10% extra spacing
#endif
}
int x = 0;
int y = 0;
m_anchor->GetSize( x, y, this );
- //y += GetLineHeight(m_anchor);
y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
+ 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 );
int wxTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const
{
- if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HEIGHT)
- return item->GetHeight();
- else
- return m_lineHeight;
+ if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HEIGHT)
+ return item->GetHeight();
+ else
+ return m_lineHeight;
}
void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
{
- // render bold items in bold
- wxFont fontOld;
- wxFont fontNew;
-
- if (item->IsBold())
- {
- fontOld = dc.GetFont();
- if (fontOld.Ok())
- {
- // VZ: is there any better way to make a bold variant of old font?
- fontNew = wxFont( fontOld.GetPointSize(),
- fontOld.GetFamily(),
- fontOld.GetStyle(),
- wxBOLD,
- fontOld.GetUnderlined());
- dc.SetFont(fontNew);
- }
- else
- {
- wxFAIL_MSG(_T("wxDC::GetFont() failed!"));
- }
- }
+ wxTreeItemAttr *attr = item->GetAttributes();
+ if ( attr && attr->HasFont() )
+ dc.SetFont(attr->GetFont());
+ else if (item->IsBold())
+ dc.SetFont(m_boldFont);
long text_w = 0;
long text_h = 0;
int image_h = 0;
int image_w = 0;
- if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
+ int image = item->GetCurrentImage();
+ if ( image != NO_IMAGE )
{
- m_imageListNormal->GetSize( item->GetSelectedImage(), image_w, image_h );
- image_w += 4;
- }
- else if (item->GetImage() != -1)
- {
- m_imageListNormal->GetSize( item->GetImage(), image_w, image_h );
+ m_imageListNormal->GetSize( image, image_w, image_h );
image_w += 4;
}
dc.DrawRectangle( item->GetX()-2, item->GetY(), item->GetWidth()+2, total_h );
- if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
+ if ( image != NO_IMAGE )
{
dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h );
- m_imageListNormal->Draw( item->GetSelectedImage(), dc,
- item->GetX(),
- item->GetY() +((total_h > image_h)?((total_h-image_h)/2):0),
- wxIMAGELIST_DRAW_TRANSPARENT );
- dc.DestroyClippingRegion();
- }
- else if (item->GetImage() != -1)
- {
- dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h );
- m_imageListNormal->Draw( item->GetImage(), dc,
+ m_imageListNormal->Draw( image, dc,
item->GetX(),
item->GetY() +((total_h > image_h)?((total_h-image_h)/2):0),
wxIMAGELIST_DRAW_TRANSPARENT );
dc.DestroyClippingRegion();
}
- dc.SetBackgroundMode(wxTRANSPARENT);
+ bool hasBgCol = attr && attr->HasBackgroundColour();
+ dc.SetBackgroundMode(hasBgCol ? wxSOLID : wxTRANSPARENT);
+ if ( hasBgCol )
+ dc.SetTextBackground(attr->GetBackgroundColour());
dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY()
+ ((total_h > text_h) ? (total_h - text_h)/2 : 0));
- // restore normal font for bold items
- if (fontOld.Ok())
- {
- dc.SetFont( fontOld);
- }
+ // restore normal font
+ dc.SetFont( m_normalFont );
}
// Now y stands for the top of the item, whereas it used to stand for middle !
item->SetCross( horizX+m_indent, y );
int exposed_x = dc.LogicalToDeviceX( 0 );
- int exposed_y = dc.LogicalToDeviceY( item->GetY()-2 );
+ int exposed_y = dc.LogicalToDeviceY( item->GetY() );
- if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item)+4 )) // 10000 = very much
+ if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item) )) // 10000 = very much
{
int startX = horizX;
int endX = horizX + (m_indent-5);
dc.SetPen( *wxGREY_PEN );
dc.SetBrush( *wxWHITE_BRUSH );
dc.DrawRectangle( horizX+(m_indent-5), y-4, 11, 9 );
-
+
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->HasHilight())
+ wxPen *pen = wxTRANSPARENT_PEN;
+ wxBrush *brush; // FIXME is this really needed?
+ wxColour colText;
+
+ if ( item->IsSelected() )
{
- dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
+ colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );
- dc.SetBrush( *m_hilightBrush );
+ brush = m_hilightBrush;
- if (m_hasFocus)
- dc.SetPen( *wxBLACK_PEN );
- else
- dc.SetPen( *wxTRANSPARENT_PEN );
+ if ( m_hasFocus )
+ pen = wxBLACK_PEN;
- PaintItem(item, dc);
-
- dc.SetPen( m_dottedPen );
- dc.SetTextForeground( *wxBLACK );
- dc.SetBrush( *wxWHITE_BRUSH );
}
else
{
- dc.SetBrush( *wxWHITE_BRUSH );
- dc.SetPen( *wxTRANSPARENT_PEN );
-
- PaintItem(item, dc);
+ wxTreeItemAttr *attr = item->GetAttributes();
+ if ( attr && attr->HasTextColour() )
+ colText = attr->GetTextColour();
+ else
+ colText = *wxBLACK;
- dc.SetPen( m_dottedPen );
+ brush = wxWHITE_BRUSH;
}
+
+ // prepare to draw
+ dc.SetTextForeground(colText);
+ dc.SetPen(*pen);
+ dc.SetBrush(*brush);
+
+ // draw
+ PaintItem(item, dc);
+
+ // restore DC objects
+ dc.SetBrush( *wxWHITE_BRUSH );
+ dc.SetPen( m_dottedPen );
+ dc.SetTextForeground( *wxBLACK );
}
y = oldY+GetLineHeight(item);
if (item->IsExpanded())
{
oldY+=GetLineHeight(item)/2;
- int semiOldY=y; // (=y) for stupid compilator
+ int semiOldY=0;
wxArrayGenericTreeItems& children = item->GetChildren();
size_t n, count = children.Count();
// delete all its children for example) - don't draw the vertical line
// in this case
if (count > 0)
- {
+ {
semiOldY+=GetLineHeight(children[--n])/2;
dc.DrawLine( horizX+m_indent, oldY+5, horizX+m_indent, semiOldY );
- }
+ }
}
}
wxGenericTreeItem *i=item.m_pItem;
- wxPaintDC dc(this);
+ wxClientDC dc(this);
PrepareDC( dc );
dc.SetLogicalFunction(wxINVERT);
wxGenericTreeItem *i=item.m_pItem;
- wxPaintDC dc(this);
+ wxClientDC dc(this);
PrepareDC( dc );
dc.SetLogicalFunction(wxINVERT);
wxPaintDC dc(this);
PrepareDC( dc );
- dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ) );
-
+ dc.SetFont( m_normalFont );
dc.SetPen( m_dottedPen );
+
+ // this is now done dynamically
//if(GetImageList() == NULL)
// m_lineHeight = (int)(dc.GetCharHeight() + 4);
void wxTreeCtrl::OnChar( wxKeyEvent &event )
{
wxTreeEvent te( wxEVT_COMMAND_TREE_KEY_DOWN, GetId() );
- te.m_code = event.KeyCode();
+ te.m_code = (int)event.KeyCode();
te.SetEventObject( this );
GetEventHandler()->ProcessEvent( te );
return;
}
- bool is_multiple=(GetWindowStyleFlag() & wxTR_MULTIPLE);
- bool extended_select=(event.ShiftDown() && is_multiple);
- bool unselect_others=!(extended_select || (event.ControlDown() && is_multiple));
+ // how should the selection work for this event?
+ bool is_multiple, extended_select, unselect_others;
+ EventFlagsToSelType(GetWindowStyleFlag(),
+ event.ShiftDown(),
+ event.ControlDown(),
+ &is_multiple, &extended_select, &unselect_others);
switch (event.KeyCode())
{
wxTreeItemId wxTreeCtrl::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) wxYield();
+
wxClientDC dc(this);
PrepareDC(dc);
- long x = dc.DeviceToLogicalX( (long)point.x );
- long y = dc.DeviceToLogicalY( (long)point.y );
+ wxCoord x = dc.DeviceToLogicalX( point.x );
+ wxCoord y = dc.DeviceToLogicalY( point.y );
int w, h;
GetSize(&w, &h);
if (!item.IsOk()) return;
m_currentEdit = item.m_pItem;
-
+
wxTreeEvent te( wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, GetId() );
te.m_item = m_currentEdit;
te.SetEventObject( this );
GetEventHandler()->ProcessEvent( te );
if (!te.IsAllowed()) return;
-
+
+ // 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) wxYield();
+
wxString s = m_currentEdit->GetText();
int x = m_currentEdit->GetX();
int y = m_currentEdit->GetY();
int w = m_currentEdit->GetWidth();
int h = m_currentEdit->GetHeight();
+ int image_h = 0;
+ int image_w = 0;
+
+ int image = m_currentEdit->GetCurrentImage();
+ if ( image != NO_IMAGE )
+ {
+ m_imageListNormal->GetSize( image, image_w, image_h );
+ image_w += 4;
+ }
+ x += image_w;
+ w -= image_w + 4; // I don't know why +4 is needed
+
wxClientDC dc(this);
PrepareDC( dc );
x = dc.LogicalToDeviceX( x );
le.SetEventObject( this );
le.m_label = m_renameRes;
GetEventHandler()->ProcessEvent( le );
-
+
if (!le.IsAllowed()) return;
-
- /* DO CHANGE LABEL */
+
+ SetItemText( m_currentEdit, m_renameRes );
}
-
+
void wxTreeCtrl::OnMouse( wxMouseEvent &event )
{
- if (!event.LeftIsDown()) m_dragCount = 0;
-
- if ( !(event.LeftUp() || event.LeftDClick() || event.Dragging()) ) return;
+ if ( !(event.LeftUp() || event.RightDown() || event.LeftDClick() || event.Dragging()) ) return;
if ( !m_anchor ) return;
wxClientDC dc(this);
PrepareDC(dc);
- long x = dc.DeviceToLogicalX( (long)event.GetX() );
- long y = dc.DeviceToLogicalY( (long)event.GetY() );
+ wxCoord x = dc.DeviceToLogicalX( event.GetX() );
+ wxCoord y = dc.DeviceToLogicalY( event.GetY() );
int flags=0;
wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), this, flags);
bool onButton = flags & wxTREE_HITTEST_ONITEMBUTTON;
- if (item == NULL) return; /* we hit the blank area */
-
if (event.Dragging())
{
- if (m_dragCount == 2) /* small drag latency (3?) */
- {
- m_dragCount = 0;
+ if (m_dragCount == 0)
+ m_dragStart = wxPoint(x,y);
- wxTreeEvent nevent(wxEVT_COMMAND_TREE_BEGIN_DRAG, GetId());
- nevent.m_item = m_current;
- nevent.SetEventObject(this);
- GetEventHandler()->ProcessEvent(nevent);
- }
- else
- {
- m_dragCount++;
- }
+ m_dragCount++;
+
+ if (m_dragCount != 3) return;
+
+ int command = wxEVT_COMMAND_TREE_BEGIN_DRAG;
+ if (event.RightIsDown()) command = wxEVT_COMMAND_TREE_BEGIN_RDRAG;
+
+ wxTreeEvent nevent( command, GetId() );
+ nevent.m_item = m_current;
+ nevent.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(nevent);
+ return;
+ }
+ else
+ {
+ m_dragCount = 0;
+ }
+
+ if (item == NULL) return; /* we hit the blank area */
+
+ if (event.RightDown()) {
+ wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK,GetId());
+ nevent.m_item=item;
+ nevent.m_code=0;
+ nevent.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(nevent);
return;
}
- if (event.LeftUp() && (item == m_current) &&
- (flags & wxTREE_HITTEST_ONITEMLABEL) &&
- HasFlag(wxTR_EDIT_LABELS) )
+ if (event.LeftUp() && (item == m_current) &&
+ (flags & wxTREE_HITTEST_ONITEMLABEL) &&
+ HasFlag(wxTR_EDIT_LABELS) )
{
m_renameTimer->Start( 100, TRUE );
return;
}
-
- bool is_multiple=(GetWindowStyleFlag() & wxTR_MULTIPLE);
- bool extended_select=(event.ShiftDown() && is_multiple);
- bool unselect_others=!(extended_select || (event.ControlDown() && is_multiple));
+
+ // how should the selection work for this event?
+ bool is_multiple, extended_select, unselect_others;
+ EventFlagsToSelType(GetWindowStyleFlag(),
+ event.ShiftDown(),
+ event.ControlDown(),
+ &is_multiple, &extended_select, &unselect_others);
if (onButton)
{
{
long text_w = 0;
long text_h = 0;
- // TODO : check for boldness. Here with suppose that font normal and bold
- // have the same height !
- // TODO : bug here, text_w is sometime not the correct answer !!!
+
+ if (item->IsBold())
+ dc.SetFont(m_boldFont);
+
dc.GetTextExtent( item->GetText(), &text_w, &text_h );
- text_h+=4;
+ text_h+=2;
+
+ // restore normal font
+ dc.SetFont( m_normalFont );
int image_h = 0;
int image_w = 0;
- if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
+ int image = item->GetCurrentImage();
+ if ( image != NO_IMAGE )
{
- m_imageListNormal->GetSize( item->GetSelectedImage(), image_w, image_h );
- image_w += 4;
- }
- else if (item->GetImage() != -1)
- {
- m_imageListNormal->GetSize( item->GetImage(), image_w, image_h );
+ m_imageListNormal->GetSize( image, image_w, image_h );
image_w += 4;
}
int total_h = (image_h > text_h) ? image_h : text_h;
- if (total_h<40) total_h+=4; // at least 4 pixels
- else total_h+=total_h/10; // otherwise 10% extra spacing
+ if (total_h < 40)
+ 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;
wxArrayGenericTreeItems& children = item->GetChildren();
size_t n, count = children.Count();
for (n = 0; n < count; ++n )
- CalculateLevel( children[n], dc, level+1, y ); // recurse
+ CalculateLevel( children[n], dc, level+1, y ); // recurse
}
void wxTreeCtrl::CalculatePositions()
wxClientDC dc(this);
PrepareDC( dc );
- dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ) );
+ dc.SetFont( m_normalFont );
dc.SetPen( m_dottedPen );
//if(GetImageList() == NULL)
// m_lineHeight = (int)(dc.GetCharHeight() + 4);
- int y = 2; //GetLineHeight(m_anchor) / 2 + 2;
+ int y = 2;
CalculateLevel( m_anchor, dc, 0, y ); // start recursion
}
void wxTreeCtrl::RefreshSubtree(wxGenericTreeItem *item)
{
+ if (m_dirty) return;
+
wxClientDC dc(this);
PrepareDC(dc);
void wxTreeCtrl::RefreshLine( wxGenericTreeItem *item )
{
+ if (m_dirty) return;
+
wxClientDC dc(this);
PrepareDC( dc );
+ int cw = 0;
+ int ch = 0;
+ GetClientSize( &cw, &ch );
+
wxRect rect;
- rect.x = dc.LogicalToDeviceX( item->GetX() - 2 );
- rect.y = dc.LogicalToDeviceY( item->GetY());
- rect.width = 1000;
+ rect.x = dc.LogicalToDeviceX( 0 );
+ rect.y = dc.LogicalToDeviceY( item->GetY() );
+ rect.width = cw;
rect.height = GetLineHeight(item); //dc.GetCharHeight() + 6;
Refresh( TRUE, &rect );
projects / wxWidgets.git / blobdiff