added test mode to wxLongLongWx which allowed to find the bug in operator*=()

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

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index e51192d9d9e0c7a519710e04f1cc256dd4a9dae7..d328e047c7ebe6bc6e02992b395072315780f130 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -62,12 +62,25 @@
     #define TVIS_FOCUSED            0x0001
 #endif
 
     #define TVIS_FOCUSED            0x0001
 #endif
 

+#ifndef TV_FIRST
+    #define TV_FIRST                0x1100
+#endif
+
+// old headers might miss these messages (comctl32.dll 4.71+ only)
+#ifndef TVM_SETBKCOLOR
+    #define TVM_SETBKCOLOR          (TV_FIRST + 29)
+    #define TVM_SETTEXTCOLOR        (TV_FIRST + 30)
+#endif
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 
 // a convenient wrapper around TV_ITEM struct which adds a ctor
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 
 // a convenient wrapper around TV_ITEM struct which adds a ctor

+#ifdef __VISUALC__

 #pragma warning( disable : 4097 )
 #pragma warning( disable : 4097 )

+#endif
+

 struct wxTreeViewItem : public TV_ITEM
 {
     wxTreeViewItem(const wxTreeItemId& item,    // the item handle
 struct wxTreeViewItem : public TV_ITEM
 {
     wxTreeViewItem(const wxTreeItemId& item,    // the item handle


@@ -80,7 +93,10 @@ struct wxTreeViewItem : public TV_ITEM
         hItem = (HTREEITEM) (WXHTREEITEM) item;
     }
 };
         hItem = (HTREEITEM) (WXHTREEITEM) item;
     }
 };

+
+#ifdef __VISUALC__

 #pragma warning( default : 4097 )
 #pragma warning( default : 4097 )

+#endif

 
 // a class which encapsulates the tree traversal logic: it vists all (unless
 // OnVisit() returns FALSE) items under the given one
 
 // a class which encapsulates the tree traversal logic: it vists all (unless
 // OnVisit() returns FALSE) items under the given one


@@ -133,6 +149,8 @@ public:
         return TRUE;
     }
 
         return TRUE;
     }
 

+    size_t GetCount() const { return m_selections.GetCount(); }
+

 private:
     wxArrayTreeItemIds& m_selections;
 };
 private:
     wxArrayTreeItemIds& m_selections;
 };


@@ -177,6 +195,7 @@ private:
 // wxTreeItemIndirectData. So we have to maintain a list of all items which
 // have indirect data inside the listctrl itself.
 // ----------------------------------------------------------------------------
 // wxTreeItemIndirectData. So we have to maintain a list of all items which
 // have indirect data inside the listctrl itself.
 // ----------------------------------------------------------------------------

+

 class wxTreeItemIndirectData
 {
 public:
 class wxTreeItemIndirectData
 {
 public:


@@ -223,9 +242,7 @@ private:
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
     IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)

-#endif

 
 // ----------------------------------------------------------------------------
 // variables
 
 // ----------------------------------------------------------------------------
 // variables


@@ -282,6 +299,7 @@ void wxTreeCtrl::Init()
     m_imageListNormal = NULL;
     m_imageListState = NULL;
     m_textCtrl = NULL;
     m_imageListNormal = NULL;
     m_imageListState = NULL;
     m_textCtrl = NULL;

+    m_hasAnyAttr = FALSE;

 }
 
 bool wxTreeCtrl::Create(wxWindow *parent,
 }
 
 bool wxTreeCtrl::Create(wxWindow *parent,


@@ -309,10 +327,10 @@ bool wxTreeCtrl::Create(wxWindow *parent,
     if ( m_windowStyle & wxTR_LINES_AT_ROOT )
         wstyle |= TVS_LINESATROOT;
 
     if ( m_windowStyle & wxTR_LINES_AT_ROOT )
         wstyle |= TVS_LINESATROOT;
 

-#if !defined( __GNUWIN32__ ) && !defined( __BORLANDC__ ) && !defined(wxUSE_NORLANDER_HEADERS)
+#if !defined( __GNUWIN32__ ) && !defined( __BORLANDC__ ) && !defined( __WATCOMC__ ) && !defined(wxUSE_NORLANDER_HEADERS)

     // we emulate the multiple selection tree controls by using checkboxes: set
     // up the image list we need for this if we do have multiple selections
     // we emulate the multiple selection tree controls by using checkboxes: set
     // up the image list we need for this if we do have multiple selections

-#if !defined(__VISUALC__) || (__VISUALC__ != 1010)
+#if !defined(__VISUALC__) || (__VISUALC__ > 1010)

     if ( m_windowStyle & wxTR_MULTIPLE )
         wstyle |= TVS_CHECKBOXES;
 #endif
     if ( m_windowStyle & wxTR_MULTIPLE )
         wstyle |= TVS_CHECKBOXES;
 #endif


@@ -352,7 +370,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
                                  DFC_BUTTON,
                                  DFCS_BUTTONCHECK | DFCS_CHECKED) )
         {
                                  DFC_BUTTON,
                                  DFCS_BUTTONCHECK | DFCS_CHECKED) )
         {

-            wxLogLastError(T("DrawFrameControl(check)"));
+            wxLogLastError(wxT("DrawFrameControl(check)"));

         }
 
         bmp.SetHBITMAP((WXHBITMAP)hbmpCheck);
         }
 
         bmp.SetHBITMAP((WXHBITMAP)hbmpCheck);


@@ -362,7 +380,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
                                  DFC_BUTTON,
                                  DFCS_BUTTONCHECK) )
         {
                                  DFC_BUTTON,
                                  DFCS_BUTTONCHECK) )
         {

-            wxLogLastError(T("DrawFrameControl(uncheck)"));
+            wxLogLastError(wxT("DrawFrameControl(uncheck)"));

         }
 
         bmp.SetHBITMAP((WXHBITMAP)hbmpCheck);
         }
 
         bmp.SetHBITMAP((WXHBITMAP)hbmpCheck);


@@ -383,6 +401,18 @@ bool wxTreeCtrl::Create(wxWindow *parent,
 
 wxTreeCtrl::~wxTreeCtrl()
 {
 
 wxTreeCtrl::~wxTreeCtrl()
 {

+    // delete any attributes
+    if ( m_hasAnyAttr )
+    {
+        for ( wxNode *node = m_attrs.Next(); node; node = m_attrs.Next() )
+        {
+            delete (wxTreeItemAttr *)node->Data();
+        }
+
+        // prevent TVN_DELETEITEM handler from deleting the attributes again!
+        m_hasAnyAttr = FALSE;
+    }
+

     DeleteTextCtrl();
 
     // delete user data to prevent memory leaks
     DeleteTextCtrl();
 
     // delete user data to prevent memory leaks


@@ -463,7 +493,31 @@ size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item,
 {
     TraverseCounter counter(this, item, recursively);
 
 {
     TraverseCounter counter(this, item, recursively);
 

-    return counter.GetCount();
+    return counter.GetCount() - 1;
+}
+
+// ----------------------------------------------------------------------------
+// control colours
+// ----------------------------------------------------------------------------
+
+bool wxTreeCtrl::SetBackgroundColour(const wxColour &colour)
+{
+    if ( !wxWindowBase::SetBackgroundColour(colour) )
+        return FALSE;
+
+    SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0, colour.GetPixel());
+
+    return TRUE;
+}
+
+bool wxTreeCtrl::SetForegroundColour(const wxColour &colour)
+{
+    if ( !wxWindowBase::SetForegroundColour(colour) )
+        return FALSE;
+
+    SendMessage(GetHwnd(), TVM_SETTEXTCOLOR, 0, colour.GetPixel());
+
+    return TRUE;

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


@@ -480,7 +534,7 @@ wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
     if ( !DoGetItem(&tvItem) )
     {
         // don't return some garbage which was on stack, but an empty string
     if ( !DoGetItem(&tvItem) )
     {
         // don't return some garbage which was on stack, but an empty string

-        buf[0] = T('\0');
+        buf[0] = wxT('\0');

     }
 
     return wxString(buf);
     }
 
     return wxString(buf);


@@ -555,7 +609,7 @@ int wxTreeCtrl::GetItemImage(const wxTreeItemId& item,
     switch ( which )
     {
         default:
     switch ( which )
     {
         default:

-            wxFAIL_MSG( T("unknown tree item image type") );
+            wxFAIL_MSG( wxT("unknown tree item image type") );

 
         case wxTreeItemIcon_Normal:
             mask = TVIF_IMAGE;
 
         case wxTreeItemIcon_Normal:
             mask = TVIF_IMAGE;


@@ -583,7 +637,7 @@ void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image,
     switch ( which )
     {
         default:
     switch ( which )
     {
         default:

-            wxFAIL_MSG( T("unknown tree item image type") );
+            wxFAIL_MSG( wxT("unknown tree item image type") );

 
         case wxTreeItemIcon_Normal:
             imageNormal = image;
 
         case wxTreeItemIcon_Normal:
             imageNormal = image;


@@ -659,7 +713,7 @@ void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
         }
         else
         {
         }
         else
         {

-            wxFAIL_MSG( T("failed to change tree items data") );
+            wxFAIL_MSG( wxT("failed to change tree items data") );

         }
     }
     else
         }
     }
     else


@@ -676,7 +730,7 @@ void wxTreeCtrl::SetIndirectItemData(const wxTreeItemId& item,
     // to crash too because the code elsewhere supposes that the pointer the
     // wxTreeItemIndirectData has is a real wxItemData and not
     // wxTreeItemIndirectData as well
     // to crash too because the code elsewhere supposes that the pointer the
     // wxTreeItemIndirectData has is a real wxItemData and not
     // wxTreeItemIndirectData as well

-    wxASSERT_MSG( !HasIndirectData(item), T("setting indirect data twice?") );
+    wxASSERT_MSG( !HasIndirectData(item), wxT("setting indirect data twice?") );

 
     SetItemData(item, (wxTreeItemData *)data);
 
 
     SetItemData(item, (wxTreeItemData *)data);
 


@@ -709,6 +763,53 @@ void wxTreeCtrl::SetItemDropHighlight(const wxTreeItemId& item, bool highlight)
     DoSetItem(&tvItem);
 }
 
     DoSetItem(&tvItem);
 }
 

+void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item,
+                                   const wxColour& col)
+{
+    m_hasAnyAttr = TRUE;
+
+    long id = (long)(WXHTREEITEM)item;
+    wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id);
+    if ( !attr )
+    {
+        attr = new wxTreeItemAttr;
+        m_attrs.Put(id, (wxObject *)attr);
+    }
+
+    attr->SetTextColour(col);
+}
+
+void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item,
+                                         const wxColour& col)
+{
+    m_hasAnyAttr = TRUE;
+
+    long id = (long)(WXHTREEITEM)item;
+    wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id);
+    if ( !attr )
+    {
+        attr = new wxTreeItemAttr;
+        m_attrs.Put(id, (wxObject *)attr);
+    }
+
+    attr->SetBackgroundColour(col);
+}
+
+void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
+{
+    m_hasAnyAttr = TRUE;
+
+    long id = (long)(WXHTREEITEM)item;
+    wxTreeItemAttr *attr = (wxTreeItemAttr *)m_attrs.Get(id);
+    if ( !attr )
+    {
+        attr = new wxTreeItemAttr;
+        m_attrs.Put(id, (wxObject *)attr);
+    }
+
+    attr->SetFont(font);
+}
+

 // ----------------------------------------------------------------------------
 // Item status
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Item status
 // ----------------------------------------------------------------------------


@@ -717,6 +818,12 @@ bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
 {
     // Bug in Gnu-Win32 headers, so don't use the macro TreeView_GetItemRect
     RECT rect;
 {
     // Bug in Gnu-Win32 headers, so don't use the macro TreeView_GetItemRect
     RECT rect;

+
+    // this ugliness comes directly from MSDN - it *is* the correct way to pass
+    // the HTREEITEM with TVM_GETITEMRECT
+    *(WXHTREEITEM *)&rect = (WXHTREEITEM)item;
+
+    // FALSE means get item rect for the whole item, not only text

     return SendMessage(GetHwnd(), TVM_GETITEMRECT, FALSE, (LPARAM)&rect) != 0;
 
 }
     return SendMessage(GetHwnd(), TVM_GETITEMRECT, FALSE, (LPARAM)&rect) != 0;
 
 }


@@ -768,7 +875,7 @@ wxTreeItemId wxTreeCtrl::GetRootItem() const
 wxTreeItemId wxTreeCtrl::GetSelection() const
 {
     wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), (WXHTREEITEM)0,
 wxTreeItemId wxTreeCtrl::GetSelection() const
 {
     wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), (WXHTREEITEM)0,

-                 T("this only works with single selection controls") );
+                 wxT("this only works with single selection controls") );

 
     return wxTreeItemId((WXHTREEITEM) TreeView_GetSelection(GetHwnd()));
 }
 
     return wxTreeItemId((WXHTREEITEM) TreeView_GetSelection(GetHwnd()));
 }


@@ -830,7 +937,7 @@ wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
 
 wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 {
 
 wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 {

-    wxASSERT_MSG( IsVisible(item), T("The item you call GetNextVisible() "
+    wxASSERT_MSG( IsVisible(item), wxT("The item you call GetNextVisible() "

                                       "for must be visible itself!"));
 
     return wxTreeItemId((WXHTREEITEM) TreeView_GetNextVisible(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item));
                                       "for must be visible itself!"));
 
     return wxTreeItemId((WXHTREEITEM) TreeView_GetNextVisible(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item));


@@ -838,7 +945,7 @@ wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 
 wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
 {
 
 wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
 {

-    wxASSERT_MSG( IsVisible(item), T("The item you call GetPrevVisible() "
+    wxASSERT_MSG( IsVisible(item), wxT("The item you call GetPrevVisible() "

                                       "for must be visible itself!"));
 
     return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevVisible(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item));
                                       "for must be visible itself!"));
 
     return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevVisible(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item));


@@ -873,7 +980,7 @@ size_t wxTreeCtrl::GetSelections(wxArrayTreeItemIds& selections) const
 {
     TraverseSelections selector(this, selections);
 
 {
     TraverseSelections selector(this, selections);
 

-    return selections.GetCount();
+    return selector.GetCount();

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


@@ -981,6 +1088,30 @@ wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
     return DoInsertItem(parent, idPrevious, text, image, selectedImage, data);
 }
 
     return DoInsertItem(parent, idPrevious, text, image, selectedImage, data);
 }
 

+wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
+                                    size_t index,
+                                    const wxString& text,
+                                    int image, int selectedImage,
+                                    wxTreeItemData *data)
+{
+    // find the item from index
+    long cookie;
+    wxTreeItemId idPrev, idCur = GetFirstChild(parent, cookie);
+    while ( index != 0 && idCur.IsOk() )
+    {
+        index--;
+
+        idPrev = idCur;
+        idCur = GetNextChild(parent, cookie);
+    }
+
+    // assert, not check: if the index is invalid, we will append the item
+    // to the end
+    wxASSERT_MSG( index == 0, _T("bad index in wxTreeCtrl::InsertItem") );
+
+    return DoInsertItem(parent, idPrev, text, image, selectedImage, data);
+}
+

 wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parent,
                                     const wxString& text,
                                     int image, int selectedImage,
 wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parent,
                                     const wxString& text,
                                     int image, int selectedImage,


@@ -1036,7 +1167,7 @@ void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
                   flag == (TVE_COLLAPSE | TVE_COLLAPSERESET) ||
                   flag == TVE_EXPAND   ||
                   flag == TVE_TOGGLE,
                   flag == (TVE_COLLAPSE | TVE_COLLAPSERESET) ||
                   flag == TVE_EXPAND   ||
                   flag == TVE_TOGGLE,

-                  T("Unknown flag in wxTreeCtrl::DoExpand") );
+                  wxT("Unknown flag in wxTreeCtrl::DoExpand") );

 
     // TreeView_Expand doesn't send TVN_ITEMEXPAND(ING) messages, so we must
     // emulate them. This behaviour has changed slightly with comctl32.dll
 
     // TreeView_Expand doesn't send TVN_ITEMEXPAND(ING) messages, so we must
     // emulate them. This behaviour has changed slightly with comctl32.dll


@@ -1096,7 +1227,7 @@ void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
 
 void wxTreeCtrl::Unselect()
 {
 
 void wxTreeCtrl::Unselect()
 {

-    wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE), T("doesn't make sense") );
+    wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE), wxT("doesn't make sense") );

 
     // just remove the selection
     SelectItem(wxTreeItemId((WXHTREEITEM) 0));
 
     // just remove the selection
     SelectItem(wxTreeItemId((WXHTREEITEM) 0));


@@ -1274,7 +1405,7 @@ static int CALLBACK TreeView_CompareCallback(wxTreeItemData *pItem1,
                                              wxTreeCtrl *tree)
 {
     wxCHECK_MSG( pItem1 && pItem2, 0,
                                              wxTreeCtrl *tree)
 {
     wxCHECK_MSG( pItem1 && pItem2, 0,

-                 T("sorting tree without data doesn't make sense") );
+                 wxT("sorting tree without data doesn't make sense") );

 
     return tree->OnCompareItems(pItem1->GetId(), pItem2->GetId());
 }
 
     return tree->OnCompareItems(pItem1->GetId(), pItem2->GetId());
 }


@@ -1341,6 +1472,25 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
     switch ( hdr->code )
     {
 
     switch ( hdr->code )
     {

+        case NM_RCLICK:
+            {
+                if ( wxControl::MSWOnNotify(idCtrl, lParam, result) )
+                    return TRUE;
+
+                TV_HITTESTINFO tvhti;
+                ::GetCursorPos(&(tvhti.pt));
+                ::ScreenToClient(GetHwnd(),&(tvhti.pt));
+                if ( TreeView_HitTest(GetHwnd(),&tvhti) )
+                {
+                    if( tvhti.flags & TVHT_ONITEM )
+                    {
+                        event.m_item = (WXHTREEITEM) tvhti.hItem;
+                        eventType = wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
+                    }
+                }
+            }
+            break;
+

         case TVN_BEGINDRAG:
             eventType = wxEVT_COMMAND_TREE_BEGIN_DRAG;
             // fall through
         case TVN_BEGINDRAG:
             eventType = wxEVT_COMMAND_TREE_BEGIN_DRAG;
             // fall through


@@ -1355,8 +1505,8 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
                 event.m_item = (WXHTREEITEM) tv->itemNew.hItem;
                 event.m_pointDrag = wxPoint(tv->ptDrag.x, tv->ptDrag.y);
 
                 event.m_item = (WXHTREEITEM) tv->itemNew.hItem;
                 event.m_pointDrag = wxPoint(tv->ptDrag.x, tv->ptDrag.y);

-                break;

             }
             }

+            break;

 
         case TVN_BEGINLABELEDIT:
             {
 
         case TVN_BEGINLABELEDIT:
             {


@@ -1365,17 +1515,23 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
                 event.m_item = (WXHTREEITEM) info->item.hItem;
                 event.m_label = info->item.pszText;
 
                 event.m_item = (WXHTREEITEM) info->item.hItem;
                 event.m_label = info->item.pszText;

-                break;

             }
             }

+            break;

 
         case TVN_DELETEITEM:
             {
                 eventType = wxEVT_COMMAND_TREE_DELETE_ITEM;
                 NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
 
 
         case TVN_DELETEITEM:
             {
                 eventType = wxEVT_COMMAND_TREE_DELETE_ITEM;
                 NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
 

-                event.m_item = (WXHTREEITEM) tv->itemOld.hItem;
-                break;
+                event.m_item = (WXHTREEITEM)tv->itemOld.hItem;
+
+                if ( m_hasAnyAttr )
+                {
+                    delete (wxTreeItemAttr *)m_attrs.
+                                Delete((long)tv->itemOld.hItem);
+                }

             }
             }

+            break;

 
         case TVN_ENDLABELEDIT:
             {
 
         case TVN_ENDLABELEDIT:
             {


@@ -1384,6 +1540,8 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
                 event.m_item = (WXHTREEITEM)info->item.hItem;
                 event.m_label = info->item.pszText;
 
                 event.m_item = (WXHTREEITEM)info->item.hItem;
                 event.m_label = info->item.pszText;

+                if (info->item.pszText == NULL)
+                    return FALSE;

                 break;
             }
 
                 break;
             }
 


@@ -1423,16 +1581,16 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                         break;
 
                     default:
                         break;
 
                     default:

-                        wxLogDebug(T("unexpected code %d in TVN_ITEMEXPAND "
+                        wxLogDebug(wxT("unexpected code %d in TVN_ITEMEXPAND "

                                       "message"), tv->action);
                 }
 
                                       "message"), tv->action);
                 }
 

-                bool ing = (hdr->code == TVN_ITEMEXPANDING);
+                bool ing = ((int)hdr->code == TVN_ITEMEXPANDING);

                 eventType = g_events[expand][ing];
 
                 event.m_item = (WXHTREEITEM) tv->itemNew.hItem;
                 eventType = g_events[expand][ing];
 
                 event.m_item = (WXHTREEITEM) tv->itemNew.hItem;

-                break;

             }
             }

+            break;

 
         case TVN_KEYDOWN:
             {
 
         case TVN_KEYDOWN:
             {


@@ -1450,8 +1608,8 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
                     GetEventHandler()->ProcessEvent(event2);
                 }
 
                     GetEventHandler()->ProcessEvent(event2);
                 }

-                break;

             }
             }

+            break;

 
         case TVN_SELCHANGED:
             eventType = wxEVT_COMMAND_TREE_SEL_CHANGED;
 
         case TVN_SELCHANGED:
             eventType = wxEVT_COMMAND_TREE_SEL_CHANGED;


@@ -1467,8 +1625,105 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
                 event.m_item = (WXHTREEITEM) tv->itemNew.hItem;
                 event.m_itemOld = (WXHTREEITEM) tv->itemOld.hItem;
 
                 event.m_item = (WXHTREEITEM) tv->itemNew.hItem;
                 event.m_itemOld = (WXHTREEITEM) tv->itemOld.hItem;

-                break;

             }
             }

+            break;
+
+#if defined(_WIN32_IE) && _WIN32_IE >= 0x300
+        case NM_CUSTOMDRAW:
+            {
+                LPNMTVCUSTOMDRAW lptvcd = (LPNMTVCUSTOMDRAW)lParam;
+                NMCUSTOMDRAW& nmcd = lptvcd->nmcd;
+                switch( nmcd.dwDrawStage )
+                {
+                    case CDDS_PREPAINT:
+                        // if we've got any items with non standard attributes,
+                        // notify us before painting each item
+                        *result = m_hasAnyAttr ? CDRF_NOTIFYITEMDRAW
+                                               : CDRF_DODEFAULT;
+                        return TRUE;
+
+                    case CDDS_ITEMPREPAINT:
+                        {
+                            wxTreeItemAttr *attr =
+                                (wxTreeItemAttr *)m_attrs.Get(nmcd.dwItemSpec);
+
+                            if ( !attr )
+                            {
+                                // nothing to do for this item
+                                return CDRF_DODEFAULT;
+                            }
+
+                            HFONT hFont;
+                            wxColour colText, colBack;
+                            if ( attr->HasFont() )
+                            {
+                                wxFont font = attr->GetFont();
+                                hFont = (HFONT)font.GetResourceHandle();
+                            }
+                            else
+                            {
+                                hFont = 0;
+                            }
+
+                            if ( attr->HasTextColour() )
+                            {
+                                colText = attr->GetTextColour();
+                            }
+                            else
+                            {
+                                colText = GetForegroundColour();
+                            }
+
+                            // selection colours should override ours
+                            if ( nmcd.uItemState & CDIS_SELECTED )
+                            {
+                                DWORD clrBk = ::GetSysColor(COLOR_HIGHLIGHT);
+                                lptvcd->clrTextBk = clrBk;
+
+                                // try to make the text visible
+                                lptvcd->clrText = wxColourToRGB(colText);
+                                lptvcd->clrText |= ~clrBk;
+                                lptvcd->clrText &= 0x00ffffff;
+                            }
+                            else
+                            {
+                                if ( attr->HasBackgroundColour() )
+                                {
+                                    colBack = attr->GetBackgroundColour();
+                                }
+                                else
+                                {
+                                    colBack = GetBackgroundColour();
+                                }
+
+                                lptvcd->clrText = wxColourToRGB(colText);
+                                lptvcd->clrTextBk = wxColourToRGB(colBack);
+                            }
+
+                            // note that if we wanted to set colours for
+                            // individual columns (subitems), we would have
+                            // returned CDRF_NOTIFYSUBITEMREDRAW from here
+                            if ( hFont )
+                            {
+                                ::SelectObject(nmcd.hdc, hFont);
+
+                                *result = CDRF_NEWFONT;
+                            }
+                            else
+                            {
+                                *result = CDRF_DODEFAULT;
+                            }
+
+                            return TRUE;
+                        }
+
+                    default:
+                        *result = CDRF_DODEFAULT;
+                        return TRUE;
+                }
+            }
+            break;
+#endif // _WIN32_IE >= 0x300

 
         default:
             return wxControl::MSWOnNotify(idCtrl, lParam, result);
 
         default:
             return wxControl::MSWOnNotify(idCtrl, lParam, result);