static const int NO_IMAGE = -1;
+#define PIXELS_PER_UNIT 10
+
// -----------------------------------------------------------------------------
// private classes
// -----------------------------------------------------------------------------
+// timer used for enabling in-place edit
+class WXDLLEXPORT wxTreeRenameTimer: public wxTimer
+{
+public:
+ wxTreeRenameTimer( wxTreeCtrl *owner );
+
+ void Notify();
+
+private:
+ wxTreeCtrl *m_owner;
+};
+
+// control used for in-place edit
+class WXDLLEXPORT wxTreeTextCtrl: public wxTextCtrl
+{
+public:
+ wxTreeTextCtrl() { }
+ wxTreeTextCtrl( wxWindow *parent,
+ const wxWindowID id,
+ bool *accept,
+ wxString *res,
+ wxTreeCtrl *owner,
+ const wxString &value = wxEmptyString,
+ const wxPoint &pos = wxDefaultPosition,
+ const wxSize &size = wxDefaultSize,
+ int style = 0,
+ const wxValidator& validator = wxDefaultValidator,
+ const wxString &name = wxTextCtrlNameStr );
+
+ void OnChar( wxKeyEvent &event );
+ void OnKillFocus( wxFocusEvent &event );
+
+private:
+ bool *m_accept;
+ wxString *m_res;
+ wxTreeCtrl *m_owner;
+ wxString m_startValue;
+
+ DECLARE_EVENT_TABLE()
+ DECLARE_DYNAMIC_CLASS(wxTreeTextCtrl);
+};
+
// a tree item
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(wxTreeItemIcon which = wxTreeItemIcon_Normal) const
+ { return m_images[which]; }
+ wxTreeItemData *GetData() const { return m_data; }
- // returns the current image for the item (depending on its
- // selected/expanded/whatever state)
- int GetCurrentImage() const;
+ // 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 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 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;
- // 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; }
+ return *m_attr;
+ }
private:
- 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 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_res) = wxEmptyString;
m_startValue = value;
}
{
(*m_accept) = TRUE;
(*m_res) = GetValue();
- m_owner->SetFocus();
+
+ if (!wxPendingDelete.Member(this))
+ wxPendingDelete.Append(this);
+
+ if ((*m_accept) && ((*m_res) != m_startValue))
+ m_owner->OnRenameAccept();
+
return;
}
if (event.m_keyCode == WXK_ESCAPE)
{
(*m_accept) = FALSE;
(*m_res) = "";
- m_owner->SetFocus();
+
+ if (!wxPendingDelete.Member(this))
+ wxPendingDelete.Append(this);
+
return;
}
event.Skip();
void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
{
- if (wxPendingDelete.Member(this)) return;
-
- wxPendingDelete.Append(this);
+ if (!wxPendingDelete.Member(this))
+ wxPendingDelete.Append(this);
if ((*m_accept) && ((*m_res) != m_startValue))
m_owner->OnRenameAccept();
}
-#define PIXELS_PER_UNIT 10
// -----------------------------------------------------------------------------
// wxTreeEvent
// -----------------------------------------------------------------------------
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_images[wxTreeItemIcon_Normal] = image;
- m_images[wxTreeItemIcon_Selected] = selImage;
- m_images[wxTreeItemIcon_Expanded] = NO_IMAGE;
- m_images[wxTreeItemIcon_SelectedExpanded] = NO_IMAGE;
+ m_images[wxTreeItemIcon_Normal] = image;
+ m_images[wxTreeItemIcon_Selected] = selImage;
+ m_images[wxTreeItemIcon_Expanded] = NO_IMAGE;
+ m_images[wxTreeItemIcon_SelectedExpanded] = NO_IMAGE;
- m_data = data;
- m_x = m_y = 0;
- m_xCross = m_yCross = 0;
+ m_data = data;
+ m_x = m_y = 0;
+ m_xCross = m_yCross = 0;
- m_level = 0;
+ m_level = 0;
- m_isCollapsed = TRUE;
- m_hasHilight = FALSE;
- m_hasPlus = FALSE;
- m_isBold = FALSE;
+ m_isCollapsed = TRUE;
+ m_hasHilight = FALSE;
+ m_hasPlus = FALSE;
+ m_isBold = FALSE;
- m_parent = parent;
+ m_parent = parent;
- 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_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();
- for ( int i = 0; i < wxTreeItemIcon_Max; i++ )
- {
- m_images[i] = NO_IMAGE;
- }
+ 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_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;
-
- // 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()))
+ 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 ( (GetImage() != NO_IMAGE) && theTree->m_imageListNormal )
- theTree->m_imageListNormal->GetSize(GetImage(), 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;
- if (point.x < m_x)
- flags |= wxTREE_HITTEST_ONITEMIDENT;
- if (point.x > m_x+m_width)
- flags |= wxTREE_HITTEST_ONITEMRIGHT;
+ return this;
+ }
- return this;
- }
- else
- {
- if (!m_isCollapsed)
+ if (point.x < m_x)
+ flags |= wxTREE_HITTEST_ONITEMINDENT;
+ if (point.x > m_x+m_width)
+ flags |= wxTREE_HITTEST_ONITEMRIGHT;
+
+ return this;
+ }
+ else
{
- 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 (!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;
+ }
+ }
}
- }
- flags|=wxTREE_HITTEST_NOWHERE;
- return NULL;
+ flags|=wxTREE_HITTEST_NOWHERE;
+
+ return (wxGenericTreeItem*) NULL;
}
int wxGenericTreeItem::GetCurrentImage() const
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_isDragging = FALSE;
+ m_dropTarget =
+ m_oldSelection = (wxGenericTreeItem *)NULL;
- 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( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
+// 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,
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(which);
+ return item.m_pItem->GetImage(which);
}
wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
{
- wxCHECK_MSG( item.IsOk(), NULL, T("invalid tree item") );
+ wxCHECK_MSG( item.IsOk(), NULL, wxT("invalid tree item") );
- return item.m_pItem->GetData();
+ return item.m_pItem->GetData();
}
void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
{
- 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);
+ wxClientDC dc(this);
+ wxGenericTreeItem *pItem = item.m_pItem;
+ pItem->SetText(text);
+ CalculateSize(pItem, dc);
+ RefreshLine(pItem);
}
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") );
wxGenericTreeItem *pItem = item.m_pItem;
pItem->SetImage(image, which);
void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
{
- wxCHECK_RET( item.IsOk(), T("invalid tree item") );
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
- item.m_pItem->SetData(data);
+ item.m_pItem->SetData(data);
}
void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
{
- 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->SetHasPlus(has);
+ RefreshLine(pItem);
}
void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
{
- 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);
+ // avoid redrawing the tree if no real change
+ wxGenericTreeItem *pItem = item.m_pItem;
+ if ( pItem->IsBold() != bold )
+ {
+ pItem->SetBold(bold);
+ RefreshLine(pItem);
+ }
+}
+
+void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item,
+ const wxColour& col)
+{
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
+ wxGenericTreeItem *pItem = item.m_pItem;
+ pItem->Attr().SetTextColour(col);
+ RefreshLine(pItem);
+}
+
+void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item,
+ const wxColour& col)
+{
+ wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
+ 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->IsSelected();
+ 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;
+ }
+
+ if (!HasFlag(wxTR_MULTIPLE))
+ {
+ m_current = m_key_current = m_anchor;
+ m_current->SetHilight( TRUE );
+ }
- Refresh();
- AdjustMyScrollbars();
+ Refresh();
+ AdjustMyScrollbars();
- return m_anchor;
+ 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 );
- item->Expand();
- CalculatePositions();
+// if ( ProcessEvent( event ) && event.m_code ) TODO: Was this a typo ?
+ if ( ProcessEvent( event ) && !event.IsAllowed() )
+ {
+ // cancelled by program
+ return;
+ }
- RefreshSubtree(item);
+ item->Expand();
+ CalculatePositions();
+
+ 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.IsAllowed() )
- {
- // 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())
- {
- first=item1;
- last=item2;
- }
- else
- {
- first=item2;
- last=item1;
- }
+ // choice first' and 'last' between item1 and item2
+ if (item1->GetY()<item2->GetY())
+ {
+ first=item1;
+ last=item2;
+ }
+ else
+ {
+ first=item2;
+ last=item1;
+ }
- bool select = m_current->IsSelected();
+ 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)
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;
-
- // 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
- 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+=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
+ m_imageListNormal = imageList;
-#endif
+ if ( !m_imageListNormal )
+ return;
+
+ // Calculate a m_lineHeight value from the image sizes.
+ // May be toggle off. Then wxTreeCtrl will spread when
+ // necessary (which might look ugly).
+ 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
}
void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
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 );
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 = item->GetCurrentImage();
if ( image != NO_IMAGE )
{
- m_imageListNormal->GetSize( image, image_w, image_h );
- image_w += 4;
+ if ( m_imageListNormal )
+ {
+ m_imageListNormal->GetSize( image, image_w, image_h );
+ image_w += 4;
+ }
+ else
+ {
+ image = NO_IMAGE;
+ }
}
int total_h = GetLineHeight(item);
+ if (item->IsSelected())
+ dc.SetBrush(*m_hilightBrush);
+ else
+ {
+ wxColour colBg;
+ if ( attr && attr->HasBackgroundColour() )
+ colBg = attr->GetBackgroundColour();
+ else
+ colBg = m_backgroundColour;
+ dc.SetBrush(wxBrush(colBg, wxSOLID));
+ }
+
dc.DrawRectangle( item->GetX()-2, item->GetY(), item->GetWidth()+2, total_h );
if ( image != NO_IMAGE )
}
dc.SetBackgroundMode(wxTRANSPARENT);
- dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY()
+ dc.DrawText( item->GetText(), image_w + item->GetX(), (wxCoord)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 !
dc.SetPen( m_dottedPen );
}
- if (item->IsSelected())
- {
- dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
-
- dc.SetBrush( *m_hilightBrush );
+ wxPen *pen = wxTRANSPARENT_PEN;
+ wxColour colText;
- if (m_hasFocus)
- dc.SetPen( *wxBLACK_PEN );
- else
- dc.SetPen( *wxTRANSPARENT_PEN );
+ if ( item->IsSelected() )
+ {
+ colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );
- PaintItem(item, dc);
+ if ( m_hasFocus )
+ pen = wxBLACK_PEN;
- dc.SetPen( m_dottedPen );
- dc.SetTextForeground( *wxBLACK );
- dc.SetBrush( *wxWHITE_BRUSH );
}
else
{
- dc.SetBrush( *wxWHITE_BRUSH );
- dc.SetPen( *wxTRANSPARENT_PEN );
+ wxTreeItemAttr *attr = item->GetAttributes();
+ if ( attr && attr->HasTextColour() )
+ colText = attr->GetTextColour();
+ else
+ colText = *wxBLACK;
+ }
- PaintItem(item, dc);
+ // prepare to draw
+ dc.SetTextForeground(colText);
+ dc.SetPen(*pen);
- dc.SetPen( m_dottedPen );
- }
+ // 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 );
- }
+ }
+ }
+}
+
+void wxTreeCtrl::DrawDropEffect(wxGenericTreeItem *item)
+{
+ if ( item )
+ {
+ if ( item->HasPlus() )
+ {
+ // it's a folder, indicate it by a border
+ DrawBorder(item);
+ }
+ else
+ {
+ // draw a line under the drop target because the item will be
+ // dropped there
+ DrawLine(item, TRUE /* below */);
+ }
+
+ SetCursor(wxCURSOR_BULLSEYE);
+ }
+ else
+ {
+ // can't drop here
+ SetCursor(wxCURSOR_NO_ENTRY);
}
}
-void wxTreeCtrl::DrawBorder(wxTreeItemId &item)
+void wxTreeCtrl::DrawBorder(const wxTreeItemId &item)
{
- if (!item) return;
+ wxCHECK_RET( item.IsOk(), _T("invalid item in wxTreeCtrl::DrawLine") );
- wxGenericTreeItem *i=item.m_pItem;
+ wxGenericTreeItem *i = item.m_pItem;
wxClientDC dc(this);
PrepareDC( dc );
dc.SetLogicalFunction(wxINVERT);
+ dc.SetBrush(*wxTRANSPARENT_BRUSH);
- int w,h,x;
- ViewStart(&x,&h); // we only need x
- GetClientSize(&w,&h); // we only need w
+ int w = i->GetWidth() + 2;
+ int h = GetLineHeight(i) + 2;
- h=GetLineHeight(i)+1;
- // 2 white column at border
- dc.DrawRectangle( PIXELS_PER_UNIT*x+2, i->GetY()-1, w-6, h);
+ dc.DrawRectangle( i->GetX() - 1, i->GetY() - 1, w, h);
}
-void wxTreeCtrl::DrawLine(wxTreeItemId &item, bool below)
+void wxTreeCtrl::DrawLine(const wxTreeItemId &item, bool below)
{
- if (!item) return;
+ wxCHECK_RET( item.IsOk(), _T("invalid item in wxTreeCtrl::DrawLine") );
- wxGenericTreeItem *i=item.m_pItem;
+ wxGenericTreeItem *i = item.m_pItem;
wxClientDC dc(this);
PrepareDC( dc );
dc.SetLogicalFunction(wxINVERT);
- int w,h,y;
- GetSize(&w,&h);
-
- if (below) y=i->GetY()+GetLineHeight(i)-1;
- else y=i->GetY();
+ int x = i->GetX(),
+ y = i->GetY();
+ if ( below )
+ {
+ y += GetLineHeight(i) - 1;
+ }
- dc.DrawLine( 0, y, w, y);
+ dc.DrawLine( x, y, x + i->GetWidth(), y);
}
// -----------------------------------------------------------------------------
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);
+
+ // + : Expand
+ // - : Collaspe
+ // * : Toggle Expand/Collapse
+ // ' ' | return : activate
+ // up : go up (not last children!)
+ // down : go down
+ // left : go to parent
+ // right : open if parent and go next
+ // home : go to root
+ // end : go to last item without opening parents
switch (event.KeyCode())
{
case '+':
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);
int image = m_currentEdit->GetCurrentImage();
if ( image != NO_IMAGE )
{
- m_imageListNormal->GetSize( image, image_w, image_h );
- image_w += 4;
+ if ( m_imageListNormal )
+ {
+ m_imageListNormal->GetSize( image, image_w, image_h );
+ image_w += 4;
+ }
+ else
+ {
+ wxFAIL_MSG(_T("you must create an image list to use images!"));
+ }
}
x += image_w;
w -= image_w + 4; // I don't know why +4 is needed
void wxTreeCtrl::OnMouse( wxMouseEvent &event )
{
- if ( !(event.LeftUp() || event.LeftDClick() || event.Dragging()) ) return;
-
if ( !m_anchor ) return;
+ // we process left mouse up event (enables in-place edit), right down
+ // (pass to the user code), left dbl click (activate item) and
+ // dragging/moving events for items drag-and-drop
+ if ( !(event.LeftUp() ||
+ event.RightDown() ||
+ event.LeftDClick() ||
+ event.Dragging() ||
+ ((event.Moving() || event.RightUp()) && m_isDragging)) )
+ {
+ event.Skip();
+
+ 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;
+ int flags = 0;
wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), this, flags);
+
bool onButton = flags & wxTREE_HITTEST_ONITEMBUTTON;
- if (event.Dragging())
+ if ( event.Dragging() && !m_isDragging )
{
if (m_dragCount == 0)
m_dragStart = wxPoint(x,y);
m_dragCount++;
- if (m_dragCount != 3) return;
+ if (m_dragCount != 3)
+ {
+ // wait until user drags a bit further...
+ return;
+ }
- int command = wxEVT_COMMAND_TREE_BEGIN_DRAG;
- if (event.RightIsDown()) command = wxEVT_COMMAND_TREE_BEGIN_RDRAG;
+ wxEventType command = event.RightIsDown()
+ ? wxEVT_COMMAND_TREE_BEGIN_RDRAG
+ : wxEVT_COMMAND_TREE_BEGIN_DRAG;
wxTreeEvent nevent( command, GetId() );
nevent.m_item = m_current;
nevent.SetEventObject(this);
- GetEventHandler()->ProcessEvent(nevent);
- return;
+
+ // by default the dragging is not supported, the user code must
+ // explicitly allow the event for it to take place
+ nevent.Veto();
+
+ if ( GetEventHandler()->ProcessEvent(nevent) && nevent.IsAllowed() )
+ {
+ // we're going to drag this item
+ m_isDragging = TRUE;
+
+ // remember the old cursor because we will change it while
+ // dragging
+ m_oldCursor = m_cursor;
+
+ // in a single selection control, hide the selection temporarily
+ if ( !(GetWindowStyleFlag() & wxTR_MULTIPLE) )
+ {
+ m_oldSelection = GetSelection().m_pItem;
+
+ if ( m_oldSelection )
+ {
+ m_oldSelection->SetHilight(FALSE);
+ RefreshLine(m_oldSelection);
+ }
+ }
+
+ CaptureMouse();
+ }
}
- else
+ else if ( event.Moving() )
{
- m_dragCount = 0;
- }
+ if ( item != m_dropTarget )
+ {
+ // unhighlight the previous drop target
+ DrawDropEffect(m_dropTarget);
- if (item == NULL) return; /* we hit the blank area */
+ m_dropTarget = item;
- if (event.LeftUp() && (item == m_current) &&
- (flags & wxTREE_HITTEST_ONITEMLABEL) &&
- HasFlag(wxTR_EDIT_LABELS) )
- {
- m_renameTimer->Start( 100, TRUE );
- return;
+ // highlight the current drop target if any
+ DrawDropEffect(m_dropTarget);
+
+ wxYield();
+ }
}
+ else if ( (event.LeftUp() || event.RightUp()) && m_isDragging )
+ {
+ // erase the highlighting
+ DrawDropEffect(m_dropTarget);
- bool is_multiple=(GetWindowStyleFlag() & wxTR_MULTIPLE);
- bool extended_select=(event.ShiftDown() && is_multiple);
- bool unselect_others=!(extended_select || (event.ControlDown() && is_multiple));
+ // generate the drag end event
+ wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, GetId());
- if (onButton)
- {
- Toggle( item );
- if (is_multiple)
- return;
- }
+ event.m_item = item;
+ event.m_pointDrag = wxPoint(x, y);
+ event.SetEventObject(this);
+
+ (void)GetEventHandler()->ProcessEvent(event);
+
+ m_isDragging = FALSE;
+ m_dropTarget = (wxGenericTreeItem *)NULL;
+
+ if ( m_oldSelection )
+ {
+ m_oldSelection->SetHilight(TRUE);
+ RefreshLine(m_oldSelection);
+ m_oldSelection = (wxGenericTreeItem *)NULL;
+ }
- SelectItem(item, unselect_others, extended_select);
+ ReleaseMouse();
- if (event.LeftDClick())
+ SetCursor(m_oldCursor);
+
+ wxYield();
+ }
+ else
{
- wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
- event.m_item = item;
- event.m_code = 0;
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
+ // here we process only the messages which happen on tree items
+
+ 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);
+ }
+ else if ( event.LeftUp() && (item == m_current) &&
+ (flags & wxTREE_HITTEST_ONITEMLABEL) &&
+ HasFlag(wxTR_EDIT_LABELS) )
+ {
+ m_renameTimer->Start( 100, TRUE );
+ }
+ else
+ {
+ // 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 )
+ {
+ Toggle( item );
+ if ( is_multiple )
+ return;
+ }
+
+ SelectItem(item, unselect_others, extended_select);
+
+ if ( event.LeftDClick() )
+ {
+ wxTreeEvent nevent( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
+ nevent.m_item = item;
+ nevent.m_code = 0;
+ nevent.SetEventObject( this );
+ GetEventHandler()->ProcessEvent( nevent );
+ }
+ }
}
}
void wxTreeCtrl::CalculateSize( wxGenericTreeItem *item, wxDC &dc )
{
- long text_w = 0;
- long text_h = 0;
+ wxCoord text_w = 0;
+ wxCoord text_h = 0;
- 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!"));
- }
- }
+ dc.SetFont(m_boldFont);
dc.GetTextExtent( item->GetText(), &text_w, &text_h );
text_h+=2;
- // restore normal font for bold items
- if (fontOld.Ok())
- dc.SetFont( fontOld);
+ // restore normal font
+ dc.SetFont( m_normalFont );
int image_h = 0;
int image_w = 0;
int image = item->GetCurrentImage();
if ( image != NO_IMAGE )
{
- m_imageListNormal->GetSize( image, image_w, image_h );
- image_w += 4;
+ if ( m_imageListNormal )
+ {
+ 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;
+ if (total_h>m_lineHeight)
+ m_lineHeight=total_h;
item->SetWidth(image_w+text_w+2);
}
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)
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 );
projects / wxWidgets.git / blobdiff