removed 2nd frame from html test sample; test sample now shows DL,DT,DD support

[wxWidgets.git] / src / generic / treectrl.cpp

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 3dd2b16562503e8038cab4355e01447cf602ede5..36f8be5bfa143882acc66f71193c2556005eaf85 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -47,6 +47,12 @@ class WXDLLEXPORT wxGenericTreeItem;
 WX_DEFINE_ARRAY(wxGenericTreeItem *, wxArrayGenericTreeItems);
 WX_DEFINE_OBJARRAY(wxArrayTreeItemIds);
 
 WX_DEFINE_ARRAY(wxGenericTreeItem *, wxArrayGenericTreeItems);
 WX_DEFINE_OBJARRAY(wxArrayTreeItemIds);
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+static const int NO_IMAGE = -1;
+

 // -----------------------------------------------------------------------------
 // private classes
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // private classes
 // -----------------------------------------------------------------------------


@@ -55,102 +61,121 @@ WX_DEFINE_OBJARRAY(wxArrayTreeItemIds);
 class WXDLLEXPORT wxGenericTreeItem
 {
 public:
 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() const { return m_image; }
-  int GetSelectedImage() const { return m_selImage; }
-  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; }

 
 

-  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; }
+    // returns the current image for the item (depending on its
+    // selected/expanded/whatever state)
+    int GetCurrentImage() const;

 
 

-  void SetHasPlus(bool has = TRUE) { m_hasPlus = has; }
+    void SetText( const wxString &text );
+    void SetImage(int image, wxTreeItemIcon which) { m_images[which] = image; }
+    void SetData(wxTreeItemData *data) { m_data = data; }

 
 

-  void SetBold(bool bold) { m_isBold = bold; }
+    void SetHasPlus(bool has = TRUE) { m_hasPlus = has; }

 
 

-  int GetX() const { return m_x; }
-  int GetY() const { return m_y; }
+    void SetBold(bool bold) { m_isBold = bold; }

 
 

-  void SetX(int x) { m_x = x; }
-  void SetY(int y) { m_y = y; }
+    int GetX() const { return m_x; }
+    int GetY() const { return m_y; }

 
 

-  int  GetHeight() const { return m_height; }
-  int  GetWidth()  const { return m_width; }
+    void SetX(int x) { m_x = x; }
+    void SetY(int y) { m_y = y; }

 
 

-  void SetHeight(int h) { m_height = h; }
-  void SetWidth(int w) { m_width = w; }
+    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; }

 
 

-  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();
+    wxGenericTreeItem *GetParent() const { return m_parent; }

 
 

-  // get count of all children (and grand children if 'recursively')
-  size_t GetChildrenCount(bool recursively = TRUE) const;
+    // 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();

 
 

-  void Insert(wxGenericTreeItem *child, size_t index)
+    // get count of all children (and grand children if 'recursively')
+    size_t GetChildrenCount(bool recursively = TRUE) const;
+
+    void Insert(wxGenericTreeItem *child, size_t index)

     { m_children.Insert(child, 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; }

 
 

-  // 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; }
+    // 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:
 
 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
+
+    int                 m_x, m_y;
+    long                m_height, m_width;
+    int                 m_xCross, m_yCross;
+    int                 m_level;
+
+    wxArrayGenericTreeItems m_children;
+    wxGenericTreeItem  *m_parent;
+
+    wxTreeItemAttr     *m_attr;

 };
 
 // =============================================================================
 };
 
 // =============================================================================


@@ -186,7 +211,9 @@ 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,
 wxTreeTextCtrl::wxTreeTextCtrl( wxWindow *parent, const wxWindowID id,
     bool *accept, wxString *res, wxTreeCtrl *owner,
     const wxString &value, const wxPoint &pos, const wxSize &size,

+#if wxUSE_VALIDATORS

     int style, const wxValidator& validator, const wxString &name ) :
     int style, const wxValidator& validator, const wxString &name ) :

+#endif

   wxTextCtrl( parent, id, value, pos, size, style, validator, name )
 {
     m_res = res;
   wxTextCtrl( parent, id, value, pos, size, style, validator, name )
 {
     m_res = res;


@@ -251,8 +278,11 @@ wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent,
                                      wxTreeItemData *data)
                  : m_text(text)
 {
                                      wxTreeItemData *data)
                  : m_text(text)
 {

-  m_image = image;
-  m_selImage = selImage;
+  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;


@@ -266,6 +296,8 @@ wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent,
 
   m_parent = parent;
 
 
   m_parent = parent;
 

+  m_attr = (wxTreeItemAttr *)NULL;
+

   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)
   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)


@@ -277,8 +309,10 @@ wxGenericTreeItem::~wxGenericTreeItem()
 {
   delete m_data;
 
 {
   delete m_data;
 

+  delete m_attr;
+

   wxASSERT_MSG( m_children.IsEmpty(),
   wxASSERT_MSG( m_children.IsEmpty(),

-                _T("please call DeleteChildren() before deleting the item") );
+                wxT("please call DeleteChildren() before deleting the item") );

 }
 
 void wxGenericTreeItem::DeleteChildren(wxTreeCtrl *tree)
 }
 
 void wxGenericTreeItem::DeleteChildren(wxTreeCtrl *tree)


@@ -307,8 +341,11 @@ void wxGenericTreeItem::SetText( const wxString &text )
 void wxGenericTreeItem::Reset()
 {
   m_text.Empty();
 void wxGenericTreeItem::Reset()
 {
   m_text.Empty();

-  m_image =
-  m_selImage = -1;
+  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_data = NULL;
   m_x = m_y =
   m_height = m_width = 0;


@@ -367,11 +404,12 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
 {
   if ((point.y > m_y) && (point.y < m_y + theTree->GetLineHeight(this)))
   {
 {
   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;
+    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
+    // 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.x > m_xCross-5) && (point.x < m_xCross+5) &&
         (point.y > m_yCross-5) && (point.y < m_yCross+5) &&
         (IsExpanded() || HasPlus()))


@@ -386,19 +424,21 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
       int image_h;
 
       // assuming every image (normal and selected ) has the same size !
       int image_h;
 
       // 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 ( (GetImage() != NO_IMAGE) && theTree->m_imageListNormal )
+          theTree->m_imageListNormal->GetSize(GetImage(), image_w, image_h);

 
       if ((image_w != -1) && (point.x <= m_x + image_w + 1))
 
       if ((image_w != -1) && (point.x <= m_x + image_w + 1))

-        flags|=wxTREE_HITTEST_ONITEMICON;
+        flags |= wxTREE_HITTEST_ONITEMICON;

       else
       else

-        flags|=wxTREE_HITTEST_ONITEMLABEL;
+        flags |= wxTREE_HITTEST_ONITEMLABEL;

 
       return this;
     }
 
 
       return this;
     }
 

-    if (point.x < m_x)         flags|=wxTREE_HITTEST_ONITEMIDENT;
-    if (point.x > m_x+m_width) flags|=wxTREE_HITTEST_ONITEMRIGHT;
+    if (point.x < m_x)
+        flags |= wxTREE_HITTEST_ONITEMINDENT;
+    if (point.x > m_x+m_width)
+        flags |= wxTREE_HITTEST_ONITEMRIGHT;

 
     return this;
   }
 
     return this;
   }


@@ -420,6 +460,39 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
   return NULL;
 }
 
   return NULL;
 }
 

+int wxGenericTreeItem::GetCurrentImage() const
+{
+    int image = NO_IMAGE;
+    if ( IsExpanded() )
+    {
+        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();
+    }
+
+    return image;
+}
+

 // -----------------------------------------------------------------------------
 // wxTreeCtrl implementation
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // wxTreeCtrl implementation
 // -----------------------------------------------------------------------------


@@ -465,12 +538,21 @@ void wxTreeCtrl::Init()
   m_dragCount = 0;
 
   m_renameTimer = new wxTreeRenameTimer( this );
   m_dragCount = 0;
 
   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,
 }
 
 bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
                         const wxPoint& pos, const wxSize& size,
                         long style,

+#if wxUSE_VALIDATORS

             const wxValidator &validator,
             const wxValidator &validator,

+#endif

             const wxString& name )
 {
   Init();
             const wxString& name )
 {
   Init();


@@ -522,7 +604,7 @@ void wxTreeCtrl::SetSpacing(unsigned int spacing)
 
 size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
 {
 
 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);
 }


@@ -533,35 +615,29 @@ size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
 
 wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
 {
 
 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
-{
-  wxCHECK_MSG( item.IsOk(), -1, _T("invalid tree item") );
-
-  return item.m_pItem->GetImage();
-}
-
-int wxTreeCtrl::GetItemSelectedImage(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->GetSelectedImage();
+  return item.m_pItem->GetImage(which);

 }
 
 wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
 {
 }
 
 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();
 }
 
 void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
 {
 
   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;
 
   wxClientDC dc(this);
   wxGenericTreeItem *pItem = item.m_pItem;


@@ -570,38 +646,30 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
   RefreshLine(pItem);
 }
 
   RefreshLine(pItem);
 }
 

-void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image)
+void wxTreeCtrl::SetItemImage(const wxTreeItemId& item,
+                              int image,
+                              wxTreeItemIcon which)

 {
 {

-  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
-
-  wxClientDC dc(this);
-  wxGenericTreeItem *pItem = item.m_pItem;
-  pItem->SetImage(image);
-  CalculateSize(pItem, dc);
-  RefreshLine(pItem);
-}
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );

 
 

-void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
-{
-  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+    wxGenericTreeItem *pItem = item.m_pItem;
+    pItem->SetImage(image, which);

 
 

-  wxClientDC dc(this);
-  wxGenericTreeItem *pItem = item.m_pItem;
-  pItem->SetSelectedImage(image);
-  CalculateSize(pItem, dc);
-  RefreshLine(pItem);
+    wxClientDC dc(this);
+    CalculateSize(pItem, dc);
+    RefreshLine(pItem);

 }
 
 void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
 {
 }
 
 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);
 }
 
 void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
 {
 
   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);
 
   wxGenericTreeItem *pItem = item.m_pItem;
   pItem->SetHasPlus(has);


@@ -610,15 +678,44 @@ void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
 
 void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
 {
 
 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);
     RefreshLine(pItem);

-  }

 }
 
 // -----------------------------------------------------------------------------
 }
 
 // -----------------------------------------------------------------------------


@@ -627,35 +724,35 @@ void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
 
 bool wxTreeCtrl::IsVisible(const wxTreeItemId& WXUNUSED(item)) const
 {
 
 bool wxTreeCtrl::IsVisible(const wxTreeItemId& WXUNUSED(item)) const
 {

-  wxFAIL_MSG(_T("not implemented"));
+  wxFAIL_MSG(wxT("not implemented"));

 
   return TRUE;
 }
 
 bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
 {
 
   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();
 }
 
 bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
 {
 
   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();
 }
 
 bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
 {
 
   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
 {
 }
 
 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();
 }


@@ -666,14 +763,14 @@ bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
 
 wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
 {
 
 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
 {
 
   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);
 
   cookie = 0;
   return GetNextChild(item, cookie);


@@ -681,7 +778,7 @@ wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) c
 
 wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) const
 {
 
 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() )
 
   wxArrayGenericTreeItems& children = item.m_pItem->GetChildren();
   if ( (size_t)cookie < children.Count() )


@@ -697,7 +794,7 @@ wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) co
 
 wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
 {
 
 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()));
 
   wxArrayGenericTreeItems& children = item.m_pItem->GetChildren();
   return (children.IsEmpty() ? wxTreeItemId() : wxTreeItemId(children.Last()));


@@ -705,7 +802,7 @@ wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
 
 wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
 {
 
 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();
 
   wxGenericTreeItem *i = item.m_pItem;
   wxGenericTreeItem *parent = i->GetParent();


@@ -725,7 +822,7 @@ wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
 
 wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
 {
 
 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();
 
   wxGenericTreeItem *i = item.m_pItem;
   wxGenericTreeItem *parent = i->GetParent();


@@ -745,25 +842,25 @@ wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
 
 wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
 {
 
 wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
 {

-  wxFAIL_MSG(_T("not implemented"));
+  wxFAIL_MSG(wxT("not implemented"));

 
   return wxTreeItemId();
 }
 
 wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 {
 
   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
 {
 
   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();
 }
 
   return wxTreeItemId();
 }


@@ -778,49 +875,53 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parentId,
                                       int image, int selImage,
                                       wxTreeItemData *data)
 {
                                       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)
 {
 }
 
 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);
                                    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 );
+    }
+
+    Refresh();
+    AdjustMyScrollbars();

 
 

-  return m_anchor;
+    return m_anchor;

 }
 
 wxTreeItemId wxTreeCtrl::PrependItem(const wxTreeItemId& parent,
 }
 
 wxTreeItemId wxTreeCtrl::PrependItem(const wxTreeItemId& parent,


@@ -846,7 +947,7 @@ wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parentId,
 
   int index = parent->GetChildren().Index(idPrevious.m_pItem);
   wxASSERT_MSG( index != wxNOT_FOUND,
 
   int index = parent->GetChildren().Index(idPrevious.m_pItem);
   wxASSERT_MSG( index != wxNOT_FOUND,

-                _T("previous item in wxTreeCtrl::InsertItem() is not a sibling") );
+                wxT("previous item in wxTreeCtrl::InsertItem() is not a sibling") );

   return DoInsertItem(parentId, (size_t)++index, text, image, selImage, data);
 }
 
   return DoInsertItem(parentId, (size_t)++index, text, image, selImage, data);
 }
 


@@ -884,32 +985,32 @@ void wxTreeCtrl::DeleteChildren(const wxTreeItemId& itemId)
 
 void wxTreeCtrl::Delete(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()
 {
 }
 
 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)
 }
 
 void wxTreeCtrl::Expand(const wxTreeItemId& itemId)


@@ -925,7 +1026,9 @@ void wxTreeCtrl::Expand(const wxTreeItemId& itemId)
   wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, GetId() );
   event.m_item = item;
   event.SetEventObject( this );
   wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, GetId() );
   event.m_item = item;
   event.SetEventObject( this );

-  if ( ProcessEvent( event ) && event.m_code )
+
+//  if ( ProcessEvent( event ) && event.m_code )  TODO: Was this a typo ?
+  if ( ProcessEvent( event ) && !event.IsAllowed() )

   {
     // cancelled by program
     return;
   {
     // cancelled by program
     return;


@@ -950,7 +1053,7 @@ void wxTreeCtrl::Collapse(const wxTreeItemId& itemId)
   wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId() );
   event.m_item = item;
   event.SetEventObject( this );
   wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId() );
   event.m_item = item;
   event.SetEventObject( this );

-  if ( ProcessEvent( event ) && event.m_code )
+  if ( ProcessEvent( event ) && !event.IsAllowed() )

   {
     // cancelled by program
     return;
   {
     // cancelled by program
     return;


@@ -1066,19 +1169,20 @@ void wxTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *it
 
   // 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);
 }


@@ -1087,28 +1191,29 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
                             bool unselect_others,
                             bool extended_select)
 {
                             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),
 
     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)
 
     // to keep going anyhow !!!
     if (is_single)

-      { 
-        if (item->HasHilight()) return; // nothing to do
-        unselect_others=TRUE;
-        extended_select=FALSE;
-      }
-    else // check if selection will really change
-      if (unselect_others && item->HasHilight())
-      {
-       // selection change if there is more than one item currently selected
-       wxArrayTreeItemIds selected_items;
-       if (GetSelections(selected_items)==1) return;
-      }
+    {
+        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;
+    }

 
     wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGING, GetId() );
     event.m_item = item;
 
     wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGING, GetId() );
     event.m_item = item;


@@ -1139,7 +1244,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
 
         // Check if we need to toggle hilight (ctrl mode)
         if (!unselect_others)
 
         // 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);
 
         m_current = m_key_current = item;
         m_current->SetHilight(select);


@@ -1153,7 +1258,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
 void wxTreeCtrl::FillArray(wxGenericTreeItem *item,
                            wxArrayTreeItemIds &array) const
 {
 void wxTreeCtrl::FillArray(wxGenericTreeItem *item,
                            wxArrayTreeItemIds &array) const
 {

-    if ( item->HasHilight() )
+    if ( item->IsSelected() )

         array.Add(wxTreeItemId(item));
 
     if ( item->HasChildren() )
         array.Add(wxTreeItemId(item));
 
     if ( item->HasChildren() )


@@ -1183,7 +1288,7 @@ void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
     wxGenericTreeItem *parent = gitem->GetParent();
     while ( parent )
     {
     wxGenericTreeItem *parent = gitem->GetParent();
     while ( parent )
     {

-       Expand(parent);
+        Expand(parent);

         parent = parent->GetParent();
     }
 
         parent = parent->GetParent();
     }
 


@@ -1205,7 +1310,7 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId &item)
 
     // now scroll to the item
     int item_y = gitem->GetY();
 
     // now scroll to the item
     int item_y = gitem->GetY();

-    
+

     int start_x = 0;
     int start_y = 0;
     ViewStart( &start_x, &start_y );
     int start_x = 0;
     int start_y = 0;
     ViewStart( &start_x, &start_y );


@@ -1243,10 +1348,10 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId &item)
 // FIXME: tree sorting functions are not reentrant and not MT-safe!
 static wxTreeCtrl *s_treeBeingSorted = NULL;
 
 // 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)
 {
                                   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);
 }
 
     return s_treeBeingSorted->OnCompareItems(*item1, *item2);
 }


@@ -1259,12 +1364,12 @@ int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
 
 void wxTreeCtrl::SortChildren(const wxTreeItemId& itemId)
 {
 
 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,
 
     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 )
 
     wxArrayGenericTreeItems& children = item->GetChildren();
     if ( children.Count() > 1 )


@@ -1296,7 +1401,7 @@ void wxTreeCtrl::SetImageList(wxImageList *imageList)
    // May be toggle off. Then wxTreeCtrl will spread when
    // necessary (which might look ugly).
 #if 1
    // May be toggle off. Then wxTreeCtrl will spread when
    // necessary (which might look ugly).
 #if 1

-   wxPaintDC dc(this);
+   wxClientDC dc(this);

    m_lineHeight = (int)(dc.GetCharHeight() + 4);
    int
       width = 0,
    m_lineHeight = (int)(dc.GetCharHeight() + 4);
    int
       width = 0,


@@ -1352,28 +1457,11 @@ int wxTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const
 
 void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
 {
 
 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;
 
     long text_w = 0;
     long text_h = 0;


@@ -1381,14 +1469,10 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
 
     int image_h = 0;
     int image_w = 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;
     }
 
         image_w += 4;
     }
 


@@ -1396,34 +1480,25 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
 
     dc.DrawRectangle( item->GetX()-2, item->GetY(), item->GetWidth()+2, total_h );
 
 
     dc.DrawRectangle( item->GetX()-2, item->GetY(), item->GetWidth()+2, total_h );
 

-    if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
-    {
-        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)
+    if ( image != NO_IMAGE )

     {
         dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h );
     {
         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();
     }
 
                                  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));
 
     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 !
 }
 
 // Now y stands for the top of the item, whereas it used to stand for middle !


@@ -1467,32 +1542,43 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
             dc.SetPen( m_dottedPen );
         }
 
             dc.SetPen( m_dottedPen );
         }
 

-        if (item->HasHilight())
-        {
-            dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
+        wxPen *pen = wxTRANSPARENT_PEN;
+        wxBrush *brush;                 // FIXME is this really needed?
+        wxColour colText;

 
 

-            dc.SetBrush( *m_hilightBrush );
+        if ( item->IsSelected() )
+        {
+            colText = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT );

 
 

-            if (m_hasFocus)
-                dc.SetPen( *wxBLACK_PEN );
-            else
-                dc.SetPen( *wxTRANSPARENT_PEN );
+            brush = m_hilightBrush;

 
 

-            PaintItem(item, dc);
+            if ( m_hasFocus )
+               pen = wxBLACK_PEN;

 
 

-            dc.SetPen( m_dottedPen );
-            dc.SetTextForeground( *wxBLACK );
-            dc.SetBrush( *wxWHITE_BRUSH );

         }
         else
         {
         }
         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);
     }
 
     y = oldY+GetLineHeight(item);


@@ -1500,7 +1586,7 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
     if (item->IsExpanded())
     {
         oldY+=GetLineHeight(item)/2;
     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();
 
         wxArrayGenericTreeItems& children = item->GetChildren();
         size_t n, count = children.Count();


@@ -1514,10 +1600,10 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
         // delete all its children for example) - don't draw the vertical line
         // in this case
         if (count > 0)
         // 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 );
             semiOldY+=GetLineHeight(children[--n])/2;
             dc.DrawLine( horizX+m_indent, oldY+5, horizX+m_indent, semiOldY );

-          }
+        }

     }
 }
 
     }
 }
 


@@ -1527,7 +1613,7 @@ void wxTreeCtrl::DrawBorder(wxTreeItemId &item)
 
     wxGenericTreeItem *i=item.m_pItem;
 
 
     wxGenericTreeItem *i=item.m_pItem;
 

-    wxPaintDC dc(this);
+    wxClientDC dc(this);

     PrepareDC( dc );
     dc.SetLogicalFunction(wxINVERT);
 
     PrepareDC( dc );
     dc.SetLogicalFunction(wxINVERT);
 


@@ -1546,7 +1632,7 @@ void wxTreeCtrl::DrawLine(wxTreeItemId &item, bool below)
 
     wxGenericTreeItem *i=item.m_pItem;
 
 
     wxGenericTreeItem *i=item.m_pItem;
 

-    wxPaintDC dc(this);
+    wxClientDC dc(this);

     PrepareDC( dc );
     dc.SetLogicalFunction(wxINVERT);
 
     PrepareDC( dc );
     dc.SetLogicalFunction(wxINVERT);
 


@@ -1571,9 +1657,10 @@ void wxTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) )
     wxPaintDC dc(this);
     PrepareDC( dc );
 
     wxPaintDC dc(this);
     PrepareDC( dc );
 

-    dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ) );
-
+    dc.SetFont( m_normalFont );

     dc.SetPen( m_dottedPen );
     dc.SetPen( m_dottedPen );

+
+    // this is now done dynamically

     //if(GetImageList() == NULL)
     // m_lineHeight = (int)(dc.GetCharHeight() + 4);
 
     //if(GetImageList() == NULL)
     // m_lineHeight = (int)(dc.GetCharHeight() + 4);
 


@@ -1818,7 +1905,7 @@ void wxTreeCtrl::Edit( const wxTreeItemId& item )
     GetEventHandler()->ProcessEvent( te );
 
     if (!te.IsAllowed()) return;
     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.
     // We have to call this here because the label in
     // question might just have been added and no screen
     // update taken place.


@@ -1832,14 +1919,11 @@ void wxTreeCtrl::Edit( const wxTreeItemId& item )
 
     int image_h = 0;
     int image_w = 0;
 
     int image_h = 0;
     int image_w = 0;

-    if ((m_currentEdit->IsExpanded()) && (m_currentEdit->GetSelectedImage() != -1))
-    {
-        m_imageListNormal->GetSize( m_currentEdit->GetSelectedImage(), image_w, image_h );
-        image_w += 4;
-    }
-    else if (m_currentEdit->GetImage() != -1)
+
+    int image = m_currentEdit->GetCurrentImage();
+    if ( image != NO_IMAGE )

     {
     {

-        m_imageListNormal->GetSize( m_currentEdit->GetImage(), image_w, image_h );
+        m_imageListNormal->GetSize( image, image_w, image_h );

         image_w += 4;
     }
     x += image_w;
         image_w += 4;
     }
     x += image_w;


@@ -1875,7 +1959,7 @@ void wxTreeCtrl::OnRenameAccept()
 
 void wxTreeCtrl::OnMouse( wxMouseEvent &event )
 {
 
 void wxTreeCtrl::OnMouse( wxMouseEvent &event )
 {

-    if ( !(event.LeftUp() || event.LeftDClick() || event.Dragging()) ) return;
+    if ( !(event.LeftUp() || event.RightDown() || event.LeftDClick() || event.Dragging()) ) return;

 
     if ( !m_anchor ) return;
 
 
     if ( !m_anchor ) return;
 


@@ -1891,20 +1975,20 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event )
     if (event.Dragging())
     {
         if (m_dragCount == 0)
     if (event.Dragging())
     {
         if (m_dragCount == 0)

-           m_dragStart = wxPoint(x,y);
-       
+            m_dragStart = wxPoint(x,y);
+

         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;
-       
+
+        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);
         wxTreeEvent nevent( command, GetId() );
         nevent.m_item = m_current;
         nevent.SetEventObject(this);
         GetEventHandler()->ProcessEvent(nevent);

-       return;
+        return;

     }
     else
     {
     }
     else
     {


@@ -1913,6 +1997,15 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event )
 
     if (item == NULL) return;  /* we hit the blank area */
 
 
     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) )


@@ -1964,44 +2057,21 @@ void wxTreeCtrl::CalculateSize( wxGenericTreeItem *item, wxDC &dc )
     long text_w = 0;
     long text_h = 0;
 
     long text_w = 0;
     long text_h = 0;
 

-    wxFont fontOld;
-    wxFont fontNew;

     if (item->IsBold())
     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;
 
 
     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_h = 0;
     int image_w = 0;

-    if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
-    {
-        m_imageListNormal->GetSize( item->GetSelectedImage(), image_w, image_h );
-        image_w += 4;
-    }
-    else if (item->GetImage() != -1)
+    int image = item->GetCurrentImage();
+    if ( image != NO_IMAGE )

     {
     {

-        m_imageListNormal->GetSize( item->GetImage(), image_w, image_h );
+        m_imageListNormal->GetSize( image, image_w, image_h );

         image_w += 4;
     }
 
         image_w += 4;
     }
 


@@ -2049,13 +2119,13 @@ void wxTreeCtrl::CalculatePositions()
     wxClientDC dc(this);
     PrepareDC( dc );
 
     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);
 
 
     dc.SetPen( m_dottedPen );
     //if(GetImageList() == NULL)
     // m_lineHeight = (int)(dc.GetCharHeight() + 4);
 

-    int y = 2; 
+    int y = 2;

     CalculateLevel( m_anchor, dc, 0, y ); // start recursion
 }
 
     CalculateLevel( m_anchor, dc, 0, y ); // start recursion
 }