wxWinCE compile fixes

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

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 342d8188d7eb9aa209a1b28af428ca06b3edb884..024af8d6eb949ef5fde1752b0dda477bb8feda60 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "treectrl.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,61 +26,31 @@
 
 #if wxUSE_TREECTRL
 
 
 #if wxUSE_TREECTRL
 

+#include "wx/treectrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+    #include "wx/msw/missing.h"
+    #include "wx/dynarray.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/settings.h"
+#endif
+

 #include "wx/msw/private.h"
 
 // Set this to 1 to be _absolutely_ sure that repainting will work for all
 // comctl32.dll versions
 #define wxUSE_COMCTL32_SAFELY 0
 
 #include "wx/msw/private.h"
 
 // Set this to 1 to be _absolutely_ sure that repainting will work for all
 // comctl32.dll versions
 #define wxUSE_COMCTL32_SAFELY 0
 

-#include "wx/app.h"
-#include "wx/log.h"
-#include "wx/dynarray.h"

 #include "wx/imaglist.h"
 #include "wx/imaglist.h"

-#include "wx/settings.h"
-#include "wx/msw/treectrl.h"

 #include "wx/msw/dragimag.h"
 
 #include "wx/msw/dragimag.h"
 

-#ifdef __GNUWIN32_OLD__
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
-
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
-    #include <commctrl.h>
-#endif
-
-// Bug in headers, sometimes
-#ifndef TVIS_FOCUSED
-    #define TVIS_FOCUSED            0x0001
-#endif
-
-#ifndef TV_FIRST
-    #define TV_FIRST                0x1100
-#endif
-
-#ifndef TVS_CHECKBOXES
-    #define TVS_CHECKBOXES          0x0100
-#endif
-
-#ifndef TVS_FULLROWSELECT
-    #define TVS_FULLROWSELECT       0x1000
-#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
+// macros to hide the cast ugliness
+// --------------------------------

 
 

-// a macro to hide the cast ugliness
-#define HITEM(item)     (HTREEITEM)((item).m_pItem)
-
-// the native control doesn't support multiple selections under MSW and we
-// have 2 ways to emulate them: either using TVS_CHECKBOXES style and let
-// checkboxes be the selection status (checked == selected) or by really
-// emulating everything, i.e. intercepting mouse and key events &c. The first
-// approach is much easier but doesn't work with comctl32.dll < 4.71 and also
-// looks quite ugly.
-#define wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE 0
+// get HTREEITEM from wxTreeItemId
+#define HITEM(item)     ((HTREEITEM)(((item).m_pItem)))

 
 // ----------------------------------------------------------------------------
 // private functions
 
 // ----------------------------------------------------------------------------
 // private functions


@@ -100,8 +66,6 @@ static HTREEITEM GetItemFromPoint(HWND hwndTV, int x, int y)
     return (HTREEITEM)TreeView_HitTest(hwndTV, &tvht);
 }
 
     return (HTREEITEM)TreeView_HitTest(hwndTV, &tvht);
 }
 

-#if !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
-

 // wrappers for TreeView_GetItem/TreeView_SetItem
 static bool IsItemSelected(HWND hwndTV, HTREEITEM hItem)
 {
 // wrappers for TreeView_GetItem/TreeView_SetItem
 static bool IsItemSelected(HWND hwndTV, HTREEITEM hItem)
 {


@@ -119,7 +83,7 @@ static bool IsItemSelected(HWND hwndTV, HTREEITEM hItem)
     return (tvi.state & TVIS_SELECTED) != 0;
 }
 
     return (tvi.state & TVIS_SELECTED) != 0;
 }
 

-static void SelectItem(HWND hwndTV, HTREEITEM hItem, bool select = true)
+static bool SelectItem(HWND hwndTV, HTREEITEM hItem, bool select = true)

 {
     TV_ITEM tvi;
     tvi.mask = TVIF_STATE | TVIF_HANDLE;
 {
     TV_ITEM tvi;
     tvi.mask = TVIF_STATE | TVIF_HANDLE;


@@ -130,7 +94,10 @@ static void SelectItem(HWND hwndTV, HTREEITEM hItem, bool select = true)
     if ( TreeView_SetItem(hwndTV, &tvi) == -1 )
     {
         wxLogLastError(wxT("TreeView_SetItem"));
     if ( TreeView_SetItem(hwndTV, &tvi) == -1 )
     {
         wxLogLastError(wxT("TreeView_SetItem"));

+        return false;

     }
     }

+
+    return true;

 }
 
 static inline void UnselectItem(HWND hwndTV, HTREEITEM htItem)
 }
 
 static inline void UnselectItem(HWND hwndTV, HTREEITEM htItem)


@@ -264,8 +231,6 @@ static void SetFocus(HWND hwndTV, HTREEITEM htItem)
     }
 }
 
     }
 }
 

-#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
-

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


@@ -290,27 +255,122 @@ struct wxTreeViewItem : public TV_ITEM
     }
 };
 
     }
 };
 

+// ----------------------------------------------------------------------------
+// This class is our userdata/lParam for the TV_ITEMs stored in the treeview.
+//
+// We need this for a couple of reasons:
+//
+// 1) This class is needed for support of different images: the Win32 common
+// control natively supports only 2 images (the normal one and another for the
+// selected state). We wish to provide support for 2 more of them for folder
+// items (i.e. those which have children): for expanded state and for expanded
+// selected state. For this we use this structure to store the additional items
+// images.
+//
+// 2) This class is also needed to hold the HITEM so that we can sort
+// it correctly in the MSW sort callback.
+//
+// In addition it makes other workarounds such as this easier and helps
+// simplify the code.
+// ----------------------------------------------------------------------------
+
+class wxTreeItemParam
+{
+public:
+    wxTreeItemParam()
+    {
+        m_data = NULL;
+
+        for ( size_t n = 0; n < WXSIZEOF(m_images); n++ )
+        {
+            m_images[n] = -1;
+        }
+    }
+
+    // dtor deletes the associated data as well
+    virtual ~wxTreeItemParam() { delete m_data; }
+
+    // accessors
+        // get the real data associated with the item
+    wxTreeItemData *GetData() const { return m_data; }
+        // change it
+    void SetData(wxTreeItemData *data) { m_data = data; }
+
+        // do we have such image?
+    bool HasImage(wxTreeItemIcon which) const { return m_images[which] != -1; }
+        // get image, falling back to the other images if this one is not
+        // specified
+    int GetImage(wxTreeItemIcon which) const
+    {
+        int image = m_images[which];
+        if ( image == -1 )
+        {
+            switch ( which )
+            {
+                case wxTreeItemIcon_SelectedExpanded:
+                    image = GetImage(wxTreeItemIcon_Expanded);
+                    if ( image != -1 )
+                        break;
+                    //else: fall through
+
+                case wxTreeItemIcon_Selected:
+                case wxTreeItemIcon_Expanded:
+                    image = GetImage(wxTreeItemIcon_Normal);
+                    break;
+
+                case wxTreeItemIcon_Normal:
+                    // no fallback
+                    break;
+
+                default:
+                    wxFAIL_MSG( _T("unsupported wxTreeItemIcon value") );
+            }
+        }
+
+        return image;
+    }
+        // change the given image
+    void SetImage(int image, wxTreeItemIcon which) { m_images[which] = image; }
+
+        // get item
+    const wxTreeItemId& GetItem() const { return m_item; }
+        // set item
+    void SetItem(const wxTreeItemId& item) { m_item = item; }
+
+protected:
+    // all the images associated with the item
+    int m_images[wxTreeItemIcon_Max];
+
+    // item for sort callbacks
+    wxTreeItemId m_item;
+
+    // the real client data
+    wxTreeItemData *m_data;
+
+    DECLARE_NO_COPY_CLASS(wxTreeItemParam)
+};
+

 // wxVirutalNode is used in place of a single root when 'hidden' root is
 // specified.
 class wxVirtualNode : public wxTreeViewItem
 {
 public:
 // wxVirutalNode is used in place of a single root when 'hidden' root is
 // specified.
 class wxVirtualNode : public wxTreeViewItem
 {
 public:

-    wxVirtualNode(wxTreeItemData *data)
+    wxVirtualNode(wxTreeItemParam *param)

         : wxTreeViewItem(TVI_ROOT, 0)
     {
         : wxTreeViewItem(TVI_ROOT, 0)
     {

-        m_data = data;
+        m_param = param;

     }
 
     ~wxVirtualNode()
     {
     }
 
     ~wxVirtualNode()
     {

-        delete m_data;
+        delete m_param;

     }
 
     }
 

-    wxTreeItemData *GetData() const { return m_data; }
-    void SetData(wxTreeItemData *data) { delete m_data; m_data = data; }
+    wxTreeItemParam *GetParam() const { return m_param; }
+    void SetParam(wxTreeItemParam *param) { delete m_param; m_param = param; }

 
 private:
 
 private:

-    wxTreeItemData *m_data;
+    wxTreeItemParam *m_param;

 
     DECLARE_NO_COPY_CLASS(wxVirtualNode)
 };
 
     DECLARE_NO_COPY_CLASS(wxVirtualNode)
 };


@@ -335,6 +395,11 @@ public:
         m_tree = tree;
     }
 
         m_tree = tree;
     }
 

+    // give it a virtual dtor: not really needed as the class is never used
+    // polymorphically and not even allocated on heap at all, but this is safer
+    // (in case it ever is) and silences the compiler warnings for now
+    virtual ~wxTreeTraversal() { }
+

     // do traverse the tree: visit all items (recursively by default) under the
     // given one; return true if all items were traversed or false if the
     // traversal was aborted because OnVisit returned false
     // do traverse the tree: visit all items (recursively by default) under the
     // given one; return true if all items were traversed or false if the
     // traversal was aborted because OnVisit returned false


@@ -365,22 +430,21 @@ public:
         {
             m_selections.Empty();
 
         {
             m_selections.Empty();
 

-            DoTraverse(tree->GetRootItem());
+            if (tree->GetCount() > 0)
+                DoTraverse(tree->GetRootItem());

         }
 
     virtual bool OnVisit(const wxTreeItemId& item)
     {
         }
 
     virtual bool OnVisit(const wxTreeItemId& item)
     {

+        const wxTreeCtrl * const tree = GetTree();
+

         // can't visit a virtual node.
         // can't visit a virtual node.

-        if ( (GetTree()->GetRootItem() == item) && (GetTree()->GetWindowStyle() & wxTR_HIDE_ROOT))
+        if ( (tree->GetRootItem() == item) && tree->HasFlag(wxTR_HIDE_ROOT) )

         {
             return true;
         }
 
         {
             return true;
         }
 

-#if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
-        if ( GetTree()->IsItemChecked(item) )
-#else
-        if ( ::IsItemSelected(GetHwndOf(GetTree()), HITEM(item)) )
-#endif
+        if ( ::IsItemSelected(GetHwndOf(tree), HITEM(item)) )

         {
             m_selections.Add(item);
         }
         {
             m_selections.Add(item);
         }


@@ -392,6 +456,8 @@ public:
 
 private:
     wxArrayTreeItemIds& m_selections;
 
 private:
     wxArrayTreeItemIds& m_selections;

+
+    DECLARE_NO_COPY_CLASS(TraverseSelections)

 };
 
 // internal class for counting tree items
 };
 
 // internal class for counting tree items


@@ -419,76 +485,77 @@ public:
 
 private:
     size_t m_count;
 
 private:
     size_t m_count;

-};
-
-// ----------------------------------------------------------------------------
-// This class is needed for support of different images: the Win32 common
-// control natively supports only 2 images (the normal one and another for the
-// selected state). We wish to provide support for 2 more of them for folder
-// items (i.e. those which have children): for expanded state and for expanded
-// selected state. For this we use this structure to store the additional items
-// images.
-//
-// There is only one problem with this: when we retrieve the item's data, we
-// don't know whether we get a pointer to wxTreeItemData or
-// wxTreeItemIndirectData. So we always set the item id to an invalid value
-// in this class and the code using the client data checks for it and retrieves
-// the real client data in this case.
-// ----------------------------------------------------------------------------
-
-class wxTreeItemIndirectData : public wxTreeItemData
-{
-public:
-    // ctor associates this data with the item and the real item data becomes
-    // available through our GetData() method
-    wxTreeItemIndirectData(wxTreeCtrl *tree, const wxTreeItemId& item)
-    {
-        for ( size_t n = 0; n < WXSIZEOF(m_images); n++ )
-        {
-            m_images[n] = -1;
-        }
-
-        // save the old data
-        m_data = tree->GetItemData(item);
-
-        // and set ourselves as the new one
-        tree->SetIndirectItemData(item, this);
-
-        // we must have the invalid value for the item
-        m_pItem = 0l;
-    }
-
-    // dtor deletes the associated data as well
-    virtual ~wxTreeItemIndirectData() { delete m_data; }
-
-    // accessors
-        // get the real data associated with the item
-    wxTreeItemData *GetData() const { return m_data; }
-        // change it
-    void SetData(wxTreeItemData *data) { m_data = data; }

 
 

-        // do we have such image?
-    bool HasImage(wxTreeItemIcon which) const { return m_images[which] != -1; }
-        // get image
-    int GetImage(wxTreeItemIcon which) const { return m_images[which]; }
-        // change it
-    void SetImage(int image, wxTreeItemIcon which) { m_images[which] = image; }
-
-private:
-    // all the images associated with the item
-    int m_images[wxTreeItemIcon_Max];
-
-    // the real client data
-    wxTreeItemData *m_data;
-
-    DECLARE_NO_COPY_CLASS(wxTreeItemIndirectData)
+    DECLARE_NO_COPY_CLASS(TraverseCounter)

 };
 
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 

+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxTreeCtrlStyle )
+
+wxBEGIN_FLAGS( wxTreeCtrlStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxTR_EDIT_LABELS)
+    wxFLAGS_MEMBER(wxTR_NO_BUTTONS)
+    wxFLAGS_MEMBER(wxTR_HAS_BUTTONS)
+    wxFLAGS_MEMBER(wxTR_TWIST_BUTTONS)
+    wxFLAGS_MEMBER(wxTR_NO_LINES)
+    wxFLAGS_MEMBER(wxTR_FULL_ROW_HIGHLIGHT)
+    wxFLAGS_MEMBER(wxTR_LINES_AT_ROOT)
+    wxFLAGS_MEMBER(wxTR_HIDE_ROOT)
+    wxFLAGS_MEMBER(wxTR_ROW_LINES)
+    wxFLAGS_MEMBER(wxTR_HAS_VARIABLE_ROW_HEIGHT)
+    wxFLAGS_MEMBER(wxTR_SINGLE)
+    wxFLAGS_MEMBER(wxTR_MULTIPLE)
+    wxFLAGS_MEMBER(wxTR_EXTENDED)
+    wxFLAGS_MEMBER(wxTR_DEFAULT_STYLE)
+
+wxEND_FLAGS( wxTreeCtrlStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl,"wx/treectrl.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxTreeCtrl)
+    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
+    wxEVENT_RANGE_PROPERTY( TreeEvent , wxEVT_COMMAND_TREE_BEGIN_DRAG , wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK , wxTreeEvent )
+    wxPROPERTY_FLAGS( WindowStyle , wxTreeCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxTreeCtrl)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxTreeCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else

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

+#endif

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -563,13 +630,9 @@ bool wxTreeTraversal::Traverse(const wxTreeItemId& root, bool recursively)
 
 void wxTreeCtrl::Init()
 {
 
 void wxTreeCtrl::Init()
 {

-    m_imageListNormal = NULL;
-    m_imageListState = NULL;
-    m_ownsImageListNormal = m_ownsImageListState = false;

     m_textCtrl = NULL;
     m_hasAnyAttr = false;
     m_dragImage = NULL;
     m_textCtrl = NULL;
     m_hasAnyAttr = false;
     m_dragImage = NULL;

-    m_htSelStart = 0;

     m_pVirtualRoot = NULL;
 
     // initialize the global array of events now as it can't be done statically
     m_pVirtualRoot = NULL;
 
     // initialize the global array of events now as it can't be done statically


@@ -613,26 +676,17 @@ bool wxTreeCtrl::Create(wxWindow *parent,
 
     if ( m_windowStyle & wxTR_FULL_ROW_HIGHLIGHT )
     {
 
     if ( m_windowStyle & wxTR_FULL_ROW_HIGHLIGHT )
     {

-        if ( wxTheApp->GetComCtl32Version() >= 471 )
+        if ( wxApp::GetComCtl32Version() >= 471 )

             wstyle |= TVS_FULLROWSELECT;
     }
 
             wstyle |= TVS_FULLROWSELECT;
     }
 

-    // using TVS_CHECKBOXES for emulation of a multiselection tree control
-    // doesn't work without the new enough headers
-#if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE && \
-    !defined( __GNUWIN32_OLD__ ) && \
-    !defined( __BORLANDC__ ) && \
-    !defined( __WATCOMC__ ) && \
-    (!defined(__VISUALC__) || (__VISUALC__ > 1010))
-
-    // 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 ( m_windowStyle & wxTR_MULTIPLE )
-        wstyle |= TVS_CHECKBOXES;
-#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
+#if !defined(__WXWINCE__) && defined(TVS_INFOTIP)
+    // Need so that TVN_GETINFOTIP messages will be sent
+    wstyle |= TVS_INFOTIP;
+#endif

 
     // Create the tree control.
 
     // Create the tree control.

-    if ( !MSWCreateControl(WC_TREEVIEW, wstyle) )
+    if ( !MSWCreateControl(WC_TREEVIEW, wstyle, pos, size) )

         return false;
 
 #if wxUSE_COMCTL32_SAFELY
         return false;
 
 #if wxUSE_COMCTL32_SAFELY


@@ -665,8 +719,8 @@ bool wxTreeCtrl::Create(wxWindow *parent,
         HDC hdcMem = CreateCompatibleDC(NULL);
 
         // create a mono bitmap of the standard size
         HDC hdcMem = CreateCompatibleDC(NULL);
 
         // create a mono bitmap of the standard size

-        int x = GetSystemMetrics(SM_CXMENUCHECK);
-        int y = GetSystemMetrics(SM_CYMENUCHECK);
+        int x = ::GetSystemMetrics(SM_CXMENUCHECK);
+        int y = ::GetSystemMetrics(SM_CYMENUCHECK);

         wxImageList imagelistCheckboxes(x, y, false, 2);
         HBITMAP hbmpCheck = CreateBitmap(x, y,   // bitmap size
                                          1,      // # of color planes
         wxImageList imagelistCheckboxes(x, y, false, 2);
         HBITMAP hbmpCheck = CreateBitmap(x, y,   // bitmap size
                                          1,      // # of color planes


@@ -704,7 +758,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
     }
 #endif // 0
 
     }
 #endif // 0
 

-    SetSize(pos.x, pos.y, size.x, size.y);
+    wxSetCCUnicodeFormat(GetHwnd());

 
     return true;
 }
 
     return true;
 }


@@ -725,18 +779,27 @@ wxTreeCtrl::~wxTreeCtrl()
     // delete user data to prevent memory leaks
     // also deletes hidden root node storage.
     DeleteAllItems();
     // delete user data to prevent memory leaks
     // also deletes hidden root node storage.
     DeleteAllItems();

-
-    if (m_ownsImageListNormal) delete m_imageListNormal;
-    if (m_ownsImageListState) delete m_imageListState;

 }
 
 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------
 

+/* static */ wxVisualAttributes
+wxTreeCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
+{
+    wxVisualAttributes attrs = GetCompositeControlsDefaultAttributes(variant);
+
+    // common controls have their own default font
+    attrs.font = wxGetCCDefaultFont();
+
+    return attrs;
+}
+
+

 // simple wrappers which add error checking in debug mode
 
 // simple wrappers which add error checking in debug mode
 

-bool wxTreeCtrl::DoGetItem(wxTreeViewItem* tvItem) const
+bool wxTreeCtrl::DoGetItem(wxTreeViewItem *tvItem) const

 {
     wxCHECK_MSG( tvItem->hItem != TVI_ROOT, false,
                  _T("can't retrieve virtual root item") );
 {
     wxCHECK_MSG( tvItem->hItem != TVI_ROOT, false,
                  _T("can't retrieve virtual root item") );


@@ -751,7 +814,7 @@ bool wxTreeCtrl::DoGetItem(wxTreeViewItem* tvItem) const
     return true;
 }
 
     return true;
 }
 

-void wxTreeCtrl::DoSetItem(wxTreeViewItem* tvItem)
+void wxTreeCtrl::DoSetItem(wxTreeViewItem *tvItem)

 {
     if ( TreeView_SetItem(GetHwnd(), tvItem) == -1 )
     {
 {
     if ( TreeView_SetItem(GetHwnd(), tvItem) == -1 )
     {


@@ -759,9 +822,9 @@ void wxTreeCtrl::DoSetItem(wxTreeViewItem* tvItem)
     }
 }
 
     }
 }
 

-size_t wxTreeCtrl::GetCount() const
+unsigned int wxTreeCtrl::GetCount() const

 {
 {

-    return (size_t)TreeView_GetCount(GetHwnd());
+    return (unsigned int)TreeView_GetCount(GetHwnd());

 }
 
 unsigned int wxTreeCtrl::GetIndent() const
 }
 
 unsigned int wxTreeCtrl::GetIndent() const


@@ -774,22 +837,12 @@ void wxTreeCtrl::SetIndent(unsigned int indent)
     TreeView_SetIndent(GetHwnd(), indent);
 }
 
     TreeView_SetIndent(GetHwnd(), indent);
 }
 

-wxImageList *wxTreeCtrl::GetImageList() const
-{
-    return m_imageListNormal;
-}
-
-wxImageList *wxTreeCtrl::GetStateImageList() const
-{
-    return m_imageListState;
-}
-

 void wxTreeCtrl::SetAnyImageList(wxImageList *imageList, int which)
 {
     // no error return
 void wxTreeCtrl::SetAnyImageList(wxImageList *imageList, int which)
 {
     // no error return

-    TreeView_SetImageList(GetHwnd(),
-                          imageList ? imageList->GetHIMAGELIST() : 0,
-                          which);
+    (void) TreeView_SetImageList(GetHwnd(),
+                                 imageList ? imageList->GetHIMAGELIST() : 0,
+                                 which);

 }
 
 void wxTreeCtrl::SetImageList(wxImageList *imageList)
 }
 
 void wxTreeCtrl::SetImageList(wxImageList *imageList)


@@ -808,23 +861,12 @@ void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
     m_ownsImageListState = false;
 }
 
     m_ownsImageListState = false;
 }
 

-void wxTreeCtrl::AssignImageList(wxImageList *imageList)
-{
-    SetImageList(imageList);
-    m_ownsImageListNormal = true;
-}
-
-void wxTreeCtrl::AssignStateImageList(wxImageList *imageList)
-{
-    SetStateImageList(imageList);
-    m_ownsImageListState = true;
-}
-

 size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item,
                                     bool recursively) const
 {
 size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item,
                                     bool recursively) const
 {

-    TraverseCounter counter(this, item, recursively);
+    wxCHECK_MSG( item.IsOk(), 0u, wxT("invalid tree item") );

 
 

+    TraverseCounter counter(this, item, recursively);

     return counter.GetCount() - 1;
 }
 
     return counter.GetCount() - 1;
 }
 


@@ -838,7 +880,7 @@ bool wxTreeCtrl::SetBackgroundColour(const wxColour &colour)
     if ( !wxWindowBase::SetBackgroundColour(colour) )
         return false;
 
     if ( !wxWindowBase::SetBackgroundColour(colour) )
         return false;
 

-    SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0, colour.GetPixel());
+    ::SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0, colour.GetPixel());

 #endif
 
     return true;
 #endif
 
     return true;


@@ -850,7 +892,7 @@ bool wxTreeCtrl::SetForegroundColour(const wxColour &colour)
     if ( !wxWindowBase::SetForegroundColour(colour) )
         return false;
 
     if ( !wxWindowBase::SetForegroundColour(colour) )
         return false;
 

-    SendMessage(GetHwnd(), TVM_SETTEXTCOLOR, 0, colour.GetPixel());
+    ::SendMessage(GetHwnd(), TVM_SETTEXTCOLOR, 0, colour.GetPixel());

 #endif
 
     return true;
 #endif
 
     return true;


@@ -860,8 +902,15 @@ bool wxTreeCtrl::SetForegroundColour(const wxColour &colour)
 // Item access
 // ----------------------------------------------------------------------------
 
 // Item access
 // ----------------------------------------------------------------------------
 

+bool wxTreeCtrl::IsHiddenRoot(const wxTreeItemId& item) const
+{
+    return HITEM(item) == TVI_ROOT && HasFlag(wxTR_HIDE_ROOT);
+}
+

 wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
 {
 wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
 {

+    wxCHECK_MSG( item.IsOk(), wxEmptyString, wxT("invalid tree item") );
+

     wxChar buf[512];  // the size is arbitrary...
 
     wxTreeViewItem tvItem(item, TVIF_TEXT);
     wxChar buf[512];  // the size is arbitrary...
 
     wxTreeViewItem tvItem(item, TVIF_TEXT);


@@ -878,6 +927,8 @@ wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
 
 void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
 {
 
 void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
 {

+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+

     if ( IS_VIRTUAL_ROOT(item) )
         return;
 
     if ( IS_VIRTUAL_ROOT(item) )
         return;
 


@@ -893,260 +944,100 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
     HWND hwndEdit = TreeView_GetEditControl(GetHwnd());
     if ( hwndEdit )
     {
     HWND hwndEdit = TreeView_GetEditControl(GetHwnd());
     if ( hwndEdit )
     {

-        if ( item == GetSelection() )
+        if ( item == m_idEdited )

         {
             ::SetWindowText(hwndEdit, text);
         }
     }
 }
 
         {
             ::SetWindowText(hwndEdit, text);
         }
     }
 }
 

-int wxTreeCtrl::DoGetItemImageFromData(const wxTreeItemId& item,
-                                       wxTreeItemIcon which) const
-{
-    wxTreeViewItem tvItem(item, TVIF_PARAM);
-    if ( !DoGetItem(&tvItem) )
-    {
-        return -1;
-    }
-
-    return ((wxTreeItemIndirectData *)tvItem.lParam)->GetImage(which);
-}
-
-void wxTreeCtrl::DoSetItemImageFromData(const wxTreeItemId& item,
-                                        int image,
-                                        wxTreeItemIcon which) const
-{
-    wxTreeViewItem tvItem(item, TVIF_PARAM);
-    if ( !DoGetItem(&tvItem) )
-    {
-        return;
-    }
-
-    wxTreeItemIndirectData *data = ((wxTreeItemIndirectData *)tvItem.lParam);
-
-    data->SetImage(image, which);
-
-    // make sure that we have selected images as well
-    if ( which == wxTreeItemIcon_Normal &&
-         !data->HasImage(wxTreeItemIcon_Selected) )
-    {
-        data->SetImage(image, wxTreeItemIcon_Selected);
-    }
-
-    if ( which == wxTreeItemIcon_Expanded &&
-         !data->HasImage(wxTreeItemIcon_SelectedExpanded) )
-    {
-        data->SetImage(image, wxTreeItemIcon_SelectedExpanded);
-    }
-}
-
-void wxTreeCtrl::DoSetItemImages(const wxTreeItemId& item,
-                                 int image,
-                                 int imageSel)
-{
-    wxTreeViewItem tvItem(item, TVIF_IMAGE | TVIF_SELECTEDIMAGE);
-    tvItem.iSelectedImage = imageSel;
-    tvItem.iImage = image;
-    DoSetItem(&tvItem);
-}
-

 int wxTreeCtrl::GetItemImage(const wxTreeItemId& item,
                              wxTreeItemIcon which) const
 {
 int wxTreeCtrl::GetItemImage(const wxTreeItemId& item,
                              wxTreeItemIcon which) const
 {

-    if ( (HITEM(item) == TVI_ROOT) && (m_windowStyle & wxTR_HIDE_ROOT) )
-    {
-        // TODO: Maybe a hidden root can still provide images?
-        return -1;
-    }
+    wxCHECK_MSG( item.IsOk(), -1, wxT("invalid tree item") );

 
 

-    if ( HasIndirectData(item) )
+    if ( IsHiddenRoot(item) )

     {
     {

-        return DoGetItemImageFromData(item, which);
-    }
-
-    UINT mask;
-    switch ( which )
-    {
-        default:
-            wxFAIL_MSG( wxT("unknown tree item image type") );
-
-        case wxTreeItemIcon_Normal:
-            mask = TVIF_IMAGE;
-            break;
-
-        case wxTreeItemIcon_Selected:
-            mask = TVIF_SELECTEDIMAGE;
-            break;
-
-        case wxTreeItemIcon_Expanded:
-        case wxTreeItemIcon_SelectedExpanded:
-            return -1;
+        // no images for hidden root item
+        return -1;

     }
 
     }
 

-    wxTreeViewItem tvItem(item, mask);
-    DoGetItem(&tvItem);
+    wxTreeItemParam *param = GetItemParam(item);

 
 

-    return mask == TVIF_IMAGE ? tvItem.iImage : tvItem.iSelectedImage;
+    return param && param->HasImage(which) ? param->GetImage(which) : -1;

 }
 
 void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image,
                               wxTreeItemIcon which)
 {
 }
 
 void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image,
                               wxTreeItemIcon which)
 {

-    if ( IS_VIRTUAL_ROOT(item) )
-    {
-        // TODO: Maybe a hidden root can still store images?
-        return;
-    }
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+    wxCHECK_RET( which >= 0 &&
+                 which < wxTreeItemIcon_Max,
+                 wxT("invalid image index"));

 
 

-    int imageNormal,
-        imageSel;

 
 

-    switch ( which )
+    if ( IsHiddenRoot(item) )

     {
     {

-        default:
-            wxFAIL_MSG( wxT("unknown tree item image type") );
-            // fall through
-
-        case wxTreeItemIcon_Normal:
-            {
-                const int imageNormalOld = GetItemImage(item);
-                const int imageSelOld = GetItemSelectedImage(item);
-
-                // always set the normal image
-                imageNormal = image;
-
-                // if the selected and normal images were the same, they should
-                // be the same after the update, otherwise leave the selected
-                // image as it was
-                imageSel = imageNormalOld == imageSelOld ? image : imageSelOld;
-            }
-            break;
-
-        case wxTreeItemIcon_Selected:
-            imageNormal = GetItemImage(item);
-            imageSel = image;
-            break;
-
-        case wxTreeItemIcon_Expanded:
-        case wxTreeItemIcon_SelectedExpanded:
-            if ( !HasIndirectData(item) )
-            {
-                // we need to get the old images first, because after we create
-                // the wxTreeItemIndirectData GetItemXXXImage() will use it to
-                // get the images
-                imageNormal = GetItemImage(item);
-                imageSel = GetItemSelectedImage(item);
-
-                // if it doesn't have it yet, add it
-                wxTreeItemIndirectData *data = new
-                    wxTreeItemIndirectData(this, item);
-
-                // copy the data to the new location
-                data->SetImage(imageNormal, wxTreeItemIcon_Normal);
-                data->SetImage(imageSel, wxTreeItemIcon_Selected);
-            }
+        // no images for hidden root item
+        return;
+    }

 
 

-            DoSetItemImageFromData(item, image, which);
+    wxTreeItemParam *data = GetItemParam(item);
+    if ( !data )
+        return;

 
 

-            // reset the normal/selected images because we won't use them any
-            // more - now they're stored inside the indirect data
-            imageNormal =
-            imageSel = I_IMAGECALLBACK;
-            break;
-    }
+    data->SetImage(image, which);

 
 

-    // NB: at least in version 5.00.0518.9 of comctl32.dll we need to always
-    //     change both normal and selected image - otherwise the change simply
-    //     doesn't take place!
-    DoSetItemImages(item, imageNormal, imageSel);
+    RefreshItem(item);

 }
 
 }
 

-wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
+wxTreeItemParam *wxTreeCtrl::GetItemParam(const wxTreeItemId& item) const

 {
 {

+    wxCHECK_MSG( item.IsOk(), NULL, wxT("invalid tree item") );
+

     wxTreeViewItem tvItem(item, TVIF_PARAM);
 
     wxTreeViewItem tvItem(item, TVIF_PARAM);
 

-    // Hidden root may have data.
+    // hidden root may still have data.

     if ( IS_VIRTUAL_ROOT(item) )
     {
     if ( IS_VIRTUAL_ROOT(item) )
     {

-        return GET_VIRTUAL_ROOT()->GetData();
+        return GET_VIRTUAL_ROOT()->GetParam();

     }
 
     }
 

-    // Visible node.
+    // visible node.

     if ( !DoGetItem(&tvItem) )
     {
         return NULL;
     }
 
     if ( !DoGetItem(&tvItem) )
     {
         return NULL;
     }
 

-    wxTreeItemData *data = (wxTreeItemData *)tvItem.lParam;
-    if ( IsDataIndirect(data) )
-    {
-        data = ((wxTreeItemIndirectData *)data)->GetData();
-    }
+    return (wxTreeItemParam *)tvItem.lParam;
+}

 
 

-    return data;
+wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
+{
+    wxTreeItemParam *data = GetItemParam(item);
+
+    return data ? data->GetData() : NULL;

 }
 
 void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
 {
 }
 
 void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
 {

-    if ( IS_VIRTUAL_ROOT(item) )
-    {
-        GET_VIRTUAL_ROOT()->SetData(data);
-    }
-

     // first, associate this piece of data with this item
     if ( data )
     {
         data->SetId(item);
     }
 
     // first, associate this piece of data with this item
     if ( data )
     {
         data->SetId(item);
     }
 

-    wxTreeViewItem tvItem(item, TVIF_PARAM);
+    wxTreeItemParam *param = GetItemParam(item);

 
 

-    if ( HasIndirectData(item) )
-    {
-        if ( DoGetItem(&tvItem) )
-        {
-            ((wxTreeItemIndirectData *)tvItem.lParam)->SetData(data);
-        }
-        else
-        {
-            wxFAIL_MSG( wxT("failed to change tree items data") );
-        }
-    }
-    else
-    {
-        tvItem.lParam = (LPARAM)data;
-        DoSetItem(&tvItem);
-    }
-}
-
-void wxTreeCtrl::SetIndirectItemData(const wxTreeItemId& item,
-                                     wxTreeItemIndirectData *data)
-{
-    // this should never happen because it's unnecessary and will probably lead
-    // 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), wxT("setting indirect data twice?") );
-
-    SetItemData(item, data);
-}
-
-bool wxTreeCtrl::HasIndirectData(const wxTreeItemId& item) const
-{
-    // query the item itself
-    wxTreeViewItem tvItem(item, TVIF_PARAM);
-    if ( !DoGetItem(&tvItem) )
-    {
-        return false;
-    }
+    wxCHECK_RET( param, wxT("failed to change tree items data") );

 
 

-    wxTreeItemData *data = (wxTreeItemData *)tvItem.lParam;
-
-    return data && IsDataIndirect(data);
+    param->SetData(data);

 }
 
 void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
 {
 }
 
 void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
 {

+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+

     if ( IS_VIRTUAL_ROOT(item) )
         return;
 
     if ( IS_VIRTUAL_ROOT(item) )
         return;
 


@@ -1157,6 +1048,8 @@ 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(), wxT("invalid tree item") );
+

     if ( IS_VIRTUAL_ROOT(item) )
         return;
 
     if ( IS_VIRTUAL_ROOT(item) )
         return;
 


@@ -1189,35 +1082,40 @@ void wxTreeCtrl::RefreshItem(const wxTreeItemId& item)
 
 wxColour wxTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const
 {
 
 wxColour wxTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const
 {

-    wxMapTreeAttr::const_iterator it = m_attrs.find(item);
+    wxCHECK_MSG( item.IsOk(), wxNullColour, wxT("invalid tree item") );

 
 

+    wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);

     return it == m_attrs.end() ? wxNullColour : it->second->GetTextColour();
 }
 
 wxColour wxTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const
 {
     return it == m_attrs.end() ? wxNullColour : it->second->GetTextColour();
 }
 
 wxColour wxTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const
 {

-    wxMapTreeAttr::const_iterator it = m_attrs.find(item);
+    wxCHECK_MSG( item.IsOk(), wxNullColour, wxT("invalid tree item") );

 
 

+    wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);

     return it == m_attrs.end() ? wxNullColour : it->second->GetBackgroundColour();
 }
 
 wxFont wxTreeCtrl::GetItemFont(const wxTreeItemId& item) const
 {
     return it == m_attrs.end() ? wxNullColour : it->second->GetBackgroundColour();
 }
 
 wxFont wxTreeCtrl::GetItemFont(const wxTreeItemId& item) const
 {

-    wxMapTreeAttr::const_iterator it = m_attrs.find(item);
+    wxCHECK_MSG( item.IsOk(), wxNullFont, wxT("invalid tree item") );

 
 

+    wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);

     return it == m_attrs.end() ? wxNullFont : it->second->GetFont();
 }
 
 void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item,
                                    const wxColour& col)
 {
     return it == m_attrs.end() ? wxNullFont : it->second->GetFont();
 }
 
 void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item,
                                    const wxColour& col)
 {

+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+

     wxTreeItemAttr *attr;
     wxTreeItemAttr *attr;

-    wxMapTreeAttr::iterator it = m_attrs.find(item);
+    wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);

     if ( it == m_attrs.end() )
     {
         m_hasAnyAttr = true;
 
     if ( it == m_attrs.end() )
     {
         m_hasAnyAttr = true;
 

-        m_attrs[item] =
+        m_attrs[item.m_pItem] =

         attr = new wxTreeItemAttr;
     }
     else
         attr = new wxTreeItemAttr;
     }
     else


@@ -1233,13 +1131,15 @@ void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item,
 void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item,
                                          const wxColour& col)
 {
 void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item,
                                          const wxColour& col)
 {

+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+

     wxTreeItemAttr *attr;
     wxTreeItemAttr *attr;

-    wxMapTreeAttr::iterator it = m_attrs.find(item);
+    wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);

     if ( it == m_attrs.end() )
     {
         m_hasAnyAttr = true;
 
     if ( it == m_attrs.end() )
     {
         m_hasAnyAttr = true;
 

-        m_attrs[item] =
+        m_attrs[item.m_pItem] =

         attr = new wxTreeItemAttr;
     }
     else // already in the hash
         attr = new wxTreeItemAttr;
     }
     else // already in the hash


@@ -1254,13 +1154,15 @@ void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item,
 
 void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
 {
 
 void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
 {

+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+

     wxTreeItemAttr *attr;
     wxTreeItemAttr *attr;

-    wxMapTreeAttr::iterator it = m_attrs.find(item);
+    wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);

     if ( it == m_attrs.end() )
     {
         m_hasAnyAttr = true;
 
     if ( it == m_attrs.end() )
     {
         m_hasAnyAttr = true;
 

-        m_attrs[item] =
+        m_attrs[item.m_pItem] =

         attr = new wxTreeItemAttr;
     }
     else // already in the hash
         attr = new wxTreeItemAttr;
     }
     else // already in the hash


@@ -1279,6 +1181,8 @@ void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
 
 bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
 {
 
 bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
 {

+    wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+

     if ( item == wxTreeItemId(TVI_ROOT) )
     {
         // virtual (hidden) root is never visible
     if ( item == wxTreeItemId(TVI_ROOT) )
     {
         // virtual (hidden) root is never visible


@@ -1292,12 +1196,24 @@ bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
     // the HTREEITEM with TVM_GETITEMRECT
     *(HTREEITEM *)&rect = HITEM(item);
 
     // the HTREEITEM with TVM_GETITEMRECT
     *(HTREEITEM *)&rect = HITEM(item);
 

-    // false means get item rect for the whole item, not only text
-    return SendMessage(GetHwnd(), TVM_GETITEMRECT, false, (LPARAM)&rect) != 0;
+    // true means to get rect for just the text, not the whole line
+    if ( !::SendMessage(GetHwnd(), TVM_GETITEMRECT, true, (LPARAM)&rect) )
+    {
+        // if TVM_GETITEMRECT returned false, then the item is definitely not
+        // visible (because its parent is not expanded)
+        return false;
+    }
+
+    // however if it returned true, the item might still be outside the
+    // currently visible part of the tree, test for it (notice that partly
+    // visible means visible here)
+    return rect.bottom > 0 && rect.top < GetClientSize().y;

 }
 
 bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
 {
 }
 
 bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
 {

+    wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+

     wxTreeViewItem tvItem(item, TVIF_CHILDREN);
     DoGetItem(&tvItem);
 
     wxTreeViewItem tvItem(item, TVIF_CHILDREN);
     DoGetItem(&tvItem);
 


@@ -1306,8 +1222,7 @@ bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
 
 bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
 {
 
 bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
 {

-    // probably not a good idea to put it here
-    //wxASSERT( ItemHasChildren(item) );
+    wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );

 
     wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_EXPANDED);
     DoGetItem(&tvItem);
 
     wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_EXPANDED);
     DoGetItem(&tvItem);


@@ -1317,6 +1232,8 @@ bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
 
 bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
 {
 
 bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
 {

+    wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+

     wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_SELECTED);
     DoGetItem(&tvItem);
 
     wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_SELECTED);
     DoGetItem(&tvItem);
 


@@ -1325,6 +1242,8 @@ bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
 
 bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
 {
 
 bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
 {

+    wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+

     wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_BOLD);
     DoGetItem(&tvItem);
 
     wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_BOLD);
     DoGetItem(&tvItem);
 


@@ -1346,7 +1265,7 @@ wxTreeItemId wxTreeCtrl::GetRootItem() const
 
 wxTreeItemId wxTreeCtrl::GetSelection() const
 {
 
 wxTreeItemId wxTreeCtrl::GetSelection() const
 {

-    wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), NULL,
+    wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), wxTreeItemId(),

                  wxT("this only works with single selection controls") );
 
     return wxTreeItemId(TreeView_GetSelection(GetHwnd()));
                  wxT("this only works with single selection controls") );
 
     return wxTreeItemId(TreeView_GetSelection(GetHwnd()));


@@ -1354,6 +1273,8 @@ wxTreeItemId wxTreeCtrl::GetSelection() const
 
 wxTreeItemId wxTreeCtrl::GetItemParent(const wxTreeItemId& item) const
 {
 
 wxTreeItemId wxTreeCtrl::GetItemParent(const wxTreeItemId& item) const
 {

+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+

     HTREEITEM hItem;
 
     if ( IS_VIRTUAL_ROOT(item) )
     HTREEITEM hItem;
 
     if ( IS_VIRTUAL_ROOT(item) )


@@ -1377,6 +1298,8 @@ wxTreeItemId wxTreeCtrl::GetItemParent(const wxTreeItemId& item) const
 wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
                                        wxTreeItemIdValue& cookie) const
 {
 wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
                                        wxTreeItemIdValue& cookie) const
 {

+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+

     // remember the last child returned in 'cookie'
     cookie = TreeView_GetChild(GetHwnd(), HITEM(item));
 
     // remember the last child returned in 'cookie'
     cookie = TreeView_GetChild(GetHwnd(), HITEM(item));
 


@@ -1386,8 +1309,14 @@ wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
 wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
                                       wxTreeItemIdValue& cookie) const
 {
 wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
                                       wxTreeItemIdValue& cookie) const
 {

-    wxTreeItemId item(TreeView_GetNextSibling(GetHwnd(),
-                                              HITEM(wxTreeItemId(cookie))));
+    wxTreeItemId fromCookie(cookie);
+
+    HTREEITEM hitem = HITEM(fromCookie);
+
+    hitem = TreeView_GetNextSibling(GetHwnd(), hitem);
+
+    wxTreeItemId item(hitem);
+

     cookie = item.m_pItem;
 
     return item;
     cookie = item.m_pItem;
 
     return item;


@@ -1398,6 +1327,8 @@ wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
 wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
                                        long& cookie) const
 {
 wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
                                        long& cookie) const
 {

+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+

     cookie = (long)TreeView_GetChild(GetHwnd(), HITEM(item));
 
     return wxTreeItemId((void *)cookie);
     cookie = (long)TreeView_GetChild(GetHwnd(), HITEM(item));
 
     return wxTreeItemId((void *)cookie);


@@ -1406,11 +1337,14 @@ wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
 wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
                                       long& cookie) const
 {
 wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
                                       long& cookie) const
 {

-    wxTreeItemId item(TreeView_GetNextSibling
-                      (
-                        GetHwnd(),
-                        HITEM(wxTreeItemId((void *)cookie)
-                      )));
+    wxTreeItemId fromCookie((void *)cookie);
+
+    HTREEITEM hitem = HITEM(fromCookie);
+
+    hitem = TreeView_GetNextSibling(GetHwnd(), hitem);
+
+    wxTreeItemId item(hitem);
+

     cookie = (long)item.m_pItem;
 
     return item;
     cookie = (long)item.m_pItem;
 
     return item;


@@ -1420,6 +1354,8 @@ wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
 
 wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
 {
 
 wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
 {

+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+

     // can this be done more efficiently?
     wxTreeItemIdValue cookie;
 
     // can this be done more efficiently?
     wxTreeItemIdValue cookie;
 


@@ -1436,11 +1372,13 @@ 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(), wxT("invalid tree item") );

     return wxTreeItemId(TreeView_GetNextSibling(GetHwnd(), HITEM(item)));
 }
 
 wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
 {
     return wxTreeItemId(TreeView_GetNextSibling(GetHwnd(), HITEM(item)));
 }
 
 wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
 {

+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );

     return wxTreeItemId(TreeView_GetPrevSibling(GetHwnd(), HITEM(item)));
 }
 
     return wxTreeItemId(TreeView_GetPrevSibling(GetHwnd(), HITEM(item)));
 }
 


@@ -1451,6 +1389,7 @@ wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
 
 wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 {
 
 wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 {

+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );

     wxASSERT_MSG( IsVisible(item), wxT("The item you call GetNextVisible() for must be visible itself!"));
 
     return wxTreeItemId(TreeView_GetNextVisible(GetHwnd(), HITEM(item)));
     wxASSERT_MSG( IsVisible(item), wxT("The item you call GetNextVisible() for must be visible itself!"));
 
     return wxTreeItemId(TreeView_GetNextVisible(GetHwnd(), HITEM(item)));


@@ -1458,6 +1397,7 @@ wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 
 wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
 {
 
 wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
 {

+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );

     wxASSERT_MSG( IsVisible(item), wxT("The item you call GetPrevVisible() for must be visible itself!"));
 
     return wxTreeItemId(TreeView_GetPrevVisible(GetHwnd(), HITEM(item)));
     wxASSERT_MSG( IsVisible(item), wxT("The item you call GetPrevVisible() for must be visible itself!"));
 
     return wxTreeItemId(TreeView_GetPrevVisible(GetHwnd(), HITEM(item)));


@@ -1469,6 +1409,8 @@ wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
 
 bool wxTreeCtrl::IsItemChecked(const wxTreeItemId& item) const
 {
 
 bool wxTreeCtrl::IsItemChecked(const wxTreeItemId& item) const
 {

+    wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+

     // receive the desired information.
     wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
     DoGetItem(&tvItem);
     // receive the desired information.
     wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
     DoGetItem(&tvItem);


@@ -1479,6 +1421,8 @@ bool wxTreeCtrl::IsItemChecked(const wxTreeItemId& item) const
 
 void wxTreeCtrl::SetItemCheck(const wxTreeItemId& item, bool check)
 {
 
 void wxTreeCtrl::SetItemCheck(const wxTreeItemId& item, bool check)
 {

+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+

     // receive the desired information.
     wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
 
     // receive the desired information.
     wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
 


@@ -1501,11 +1445,11 @@ size_t wxTreeCtrl::GetSelections(wxArrayTreeItemIds& selections) const
 // Usual operations
 // ----------------------------------------------------------------------------
 
 // Usual operations
 // ----------------------------------------------------------------------------
 

-wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
-                                      wxTreeItemId hInsertAfter,
-                                      const wxString& text,
-                                      int image, int selectedImage,
-                                      wxTreeItemData *data)
+wxTreeItemId wxTreeCtrl::DoInsertAfter(const wxTreeItemId& parent,
+                                       const wxTreeItemId& hInsertAfter,
+                                       const wxString& text,
+                                       int image, int selectedImage,
+                                       wxTreeItemData *data)

 {
     wxCHECK_MSG( parent.IsOk() || !TreeView_GetRoot(GetHwnd()),
                  wxTreeItemId(),
 {
     wxCHECK_MSG( parent.IsOk() || !TreeView_GetRoot(GetHwnd()),
                  wxTreeItemId(),


@@ -1523,7 +1467,7 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
     }
 
     UINT mask = 0;
     }
 
     UINT mask = 0;

-    if ( !text.IsEmpty() )
+    if ( !text.empty() )

     {
         mask |= TVIF_TEXT;
         tvIns.item.pszText = (wxChar *)text.c_str();  // cast is ok
     {
         mask |= TVIF_TEXT;
         tvIns.item.pszText = (wxChar *)text.c_str();  // cast is ok


@@ -1534,41 +1478,35 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
         tvIns.item.cchTextMax = 0;
     }
 
         tvIns.item.cchTextMax = 0;
     }
 

-    if ( image != -1 )
-    {
-        mask |= TVIF_IMAGE;
-        tvIns.item.iImage = image;
-
-        if ( selectedImage == -1 )
-        {
-            // take the same image for selected icon if not specified
-            selectedImage = image;
-        }
-    }
+    // create the param which will store the other item parameters
+    wxTreeItemParam *param = new wxTreeItemParam;

 
 

-    if ( selectedImage != -1 )
-    {
-        mask |= TVIF_SELECTEDIMAGE;
-        tvIns.item.iSelectedImage = selectedImage;
-    }
+    // we return the images on demand as they depend on whether the item is
+    // expanded or collapsed too in our case
+    mask |= TVIF_IMAGE | TVIF_SELECTEDIMAGE;
+    tvIns.item.iImage = I_IMAGECALLBACK;
+    tvIns.item.iSelectedImage = I_IMAGECALLBACK;

 
 

-    if ( data != NULL )
-    {
-        mask |= TVIF_PARAM;
-        tvIns.item.lParam = (LPARAM)data;
-    }
+    param->SetImage(image, wxTreeItemIcon_Normal);
+    param->SetImage(selectedImage, wxTreeItemIcon_Selected);

 
 

+    mask |= TVIF_PARAM;
+    tvIns.item.lParam = (LPARAM)param;

     tvIns.item.mask = mask;
 
     tvIns.item.mask = mask;
 

-    HTREEITEM id = (HTREEITEM) TreeView_InsertItem(GetHwnd(), &tvIns);
+    HTREEITEM id = TreeView_InsertItem(GetHwnd(), &tvIns);

     if ( id == 0 )
     {
         wxLogLastError(wxT("TreeView_InsertItem"));
     }
 
     if ( id == 0 )
     {
         wxLogLastError(wxT("TreeView_InsertItem"));
     }
 

+    // associate the application tree item with Win32 tree item handle
+    param->SetItem(id);
+
+    // setup wxTreeItemData

     if ( data != NULL )
     {
     if ( data != NULL )
     {

-        // associate the application tree item with Win32 tree item handle
+        param->SetData(data);

         data->SetId(id);
     }
 
         data->SetId(id);
     }
 


@@ -1578,13 +1516,19 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
 // for compatibility only
 #if WXWIN_COMPATIBILITY_2_4
 
 // for compatibility only
 #if WXWIN_COMPATIBILITY_2_4
 

-wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
-                                    const wxString& text,
-                                    int image, int selImage,
-                                    long insertAfter)
+void wxTreeCtrl::SetImageList(wxImageList *imageList, int)
+{
+    SetImageList(imageList);
+}
+
+int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
+{
+    return GetItemImage(item, wxTreeItemIcon_Selected);
+}
+
+void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)

 {
 {

-    return DoInsertItem(parent, wxTreeItemId((void *)insertAfter), text,
-                        image, selImage, NULL);
+    SetItemImage(item, image, wxTreeItemIcon_Selected);

 }
 
 #endif // WXWIN_COMPATIBILITY_2_4
 }
 
 #endif // WXWIN_COMPATIBILITY_2_4


@@ -1594,67 +1538,51 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
                                  wxTreeItemData *data)
 {
 
                                  wxTreeItemData *data)
 {
 

-    if ( m_windowStyle & wxTR_HIDE_ROOT )
+    if ( HasFlag(wxTR_HIDE_ROOT) )

     {
         // create a virtual root item, the parent for all the others
     {
         // create a virtual root item, the parent for all the others

-        m_pVirtualRoot = new wxVirtualNode(data);
+        wxTreeItemParam *param = new wxTreeItemParam;
+        param->SetData(data);
+
+        m_pVirtualRoot = new wxVirtualNode(param);

 
         return TVI_ROOT;
     }
 
 
         return TVI_ROOT;
     }
 

-    return DoInsertItem(wxTreeItemId(), 0,
-                        text, image, selectedImage, data);
-}
-
-wxTreeItemId wxTreeCtrl::PrependItem(const wxTreeItemId& parent,
-                                     const wxString& text,
-                                     int image, int selectedImage,
-                                     wxTreeItemData *data)
-{
-    return DoInsertItem(parent, TVI_FIRST,
-                        text, image, selectedImage, data);
-}
-
-wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
-                                    const wxTreeItemId& idPrevious,
-                                    const wxString& text,
-                                    int image, int selectedImage,
-                                    wxTreeItemData *data)
-{
-    return DoInsertItem(parent, idPrevious, text, image, selectedImage, data);
+    return DoInsertAfter(wxTreeItemId(), wxTreeItemId(),
+                           text, image, selectedImage, data);

 }
 
 }
 

-wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
-                                    size_t index,
-                                    const wxString& text,
-                                    int image, int selectedImage,
-                                    wxTreeItemData *data)
+wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
+                                      size_t index,
+                                      const wxString& text,
+                                      int image, int selectedImage,
+                                      wxTreeItemData *data)

 {
 {

-    // find the item from index
-    wxTreeItemIdValue cookie;
-    wxTreeItemId idPrev, idCur = GetFirstChild(parent, cookie);
-    while ( index != 0 && idCur.IsOk() )
+    wxTreeItemId idPrev;
+    if ( index == (size_t)-1 )

     {
     {

-        index--;
-
-        idPrev = idCur;
-        idCur = GetNextChild(parent, cookie);
+        // special value: append to the end
+        idPrev = TVI_LAST;

     }
     }

+    else // find the item from index
+    {
+        wxTreeItemIdValue cookie;
+        wxTreeItemId idCur = GetFirstChild(parent, cookie);
+        while ( index != 0 && idCur.IsOk() )
+        {
+            index--;

 
 

-    // 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") );
+            idPrev = idCur;
+            idCur = GetNextChild(parent, cookie);
+        }

 
 

-    return DoInsertItem(parent, idPrev, text, image, selectedImage, data);
-}
+        // 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") );
+    }

 
 

-wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parent,
-                                    const wxString& text,
-                                    int image, int selectedImage,
-                                    wxTreeItemData *data)
-{
-    return DoInsertItem(parent, TVI_LAST,
-                        text, image, selectedImage, data);
+    return DoInsertAfter(parent, idPrev, text, image, selectedImage, data);

 }
 
 void wxTreeCtrl::Delete(const wxTreeItemId& item)
 }
 
 void wxTreeCtrl::Delete(const wxTreeItemId& item)


@@ -1715,8 +1643,8 @@ void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
                   wxT("Unknown flag in wxTreeCtrl::DoExpand") );
 
     // A hidden root can be neither expanded nor collapsed.
                   wxT("Unknown flag in wxTreeCtrl::DoExpand") );
 
     // A hidden root can be neither expanded nor collapsed.

-    wxCHECK_RET( !(m_windowStyle & wxTR_HIDE_ROOT) || (HITEM(item) != TVI_ROOT),
-                 wxT("Can't expand/collapse hidden root node!") )
+    wxCHECK_RET( !IsHiddenRoot(item),
+                 wxT("Can't expand/collapse hidden root node!") );

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


@@ -1732,16 +1660,12 @@ void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
 
     if ( TreeView_Expand(GetHwnd(), HITEM(item), flag) != 0 )
     {
 
     if ( TreeView_Expand(GetHwnd(), HITEM(item), flag) != 0 )
     {

-        wxTreeEvent event(wxEVT_NULL, m_windowId);
-        event.m_item = item;
-        event.SetEventObject(this);
-

         // note that the {EXPAND|COLLAPS}ING event is sent by TreeView_Expand()
         // itself
         // note that the {EXPAND|COLLAPS}ING event is sent by TreeView_Expand()
         // itself

-        event.SetEventType(gs_expandEvents[IsExpanded(item) ? IDX_EXPAND
-                                                            : IDX_COLLAPSE]
-                                          [IDX_DONE]);
-
+        wxTreeEvent event(gs_expandEvents[IsExpanded(item) ? IDX_EXPAND
+                                                           : IDX_COLLAPSE]
+                                         [IDX_DONE],
+                           this, item);

         (void)GetEventHandler()->ProcessEvent(event);
     }
     //else: change didn't took place, so do nothing at all
         (void)GetEventHandler()->ProcessEvent(event);
     }
     //else: change didn't took place, so do nothing at all


@@ -1767,11 +1691,15 @@ void wxTreeCtrl::Toggle(const wxTreeItemId& item)
     DoExpand(item, TVE_TOGGLE);
 }
 
     DoExpand(item, TVE_TOGGLE);
 }
 

+#if WXWIN_COMPATIBILITY_2_4
+

 void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
 {
     DoExpand(item, action);
 }
 
 void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
 {
     DoExpand(item, action);
 }
 

+#endif
+

 void wxTreeCtrl::Unselect()
 {
     wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE),
 void wxTreeCtrl::Unselect()
 {
     wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE),


@@ -1789,12 +1717,10 @@ void wxTreeCtrl::UnselectAll()
         size_t count = GetSelections(selections);
         for ( size_t n = 0; n < count; n++ )
         {
         size_t count = GetSelections(selections);
         for ( size_t n = 0; n < count; n++ )
         {

-#if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
-            SetItemCheck(selections[n], false);
-#else // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE

             ::UnselectItem(GetHwnd(), HITEM(selections[n]));
             ::UnselectItem(GetHwnd(), HITEM(selections[n]));

-#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE

         }
         }

+
+        m_htSelStart.Unset();

     }
     else
     {
     }
     else
     {


@@ -1803,35 +1729,29 @@ void wxTreeCtrl::UnselectAll()
     }
 }
 
     }
 }
 

-void wxTreeCtrl::SelectItem(const wxTreeItemId& item)
+void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)

 {
     if ( m_windowStyle & wxTR_MULTIPLE )
     {
 {
     if ( m_windowStyle & wxTR_MULTIPLE )
     {

-#if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
-        // selecting the item means checking it
-        SetItemCheck(item);
-#else // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
-        ::SelectItem(GetHwnd(), HITEM(item));
-#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
+        ::SelectItem(GetHwnd(), HITEM(item), select);

     }
     else
     {
     }
     else
     {

+        wxASSERT_MSG( select,
+                      _T("SelectItem(false) works only for multiselect") );
+

         // inspite of the docs (MSDN Jan 99 edition), we don't seem to receive
         // the notification from the control (i.e. TVN_SELCHANG{ED|ING}), so
         // send them ourselves
 
         // inspite of the docs (MSDN Jan 99 edition), we don't seem to receive
         // the notification from the control (i.e. TVN_SELCHANG{ED|ING}), so
         // send them ourselves
 

-        wxTreeEvent event(wxEVT_NULL, m_windowId);
-        event.m_item = item;
-        event.SetEventObject(this);
-
-        event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGING);
+        wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);

         if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
         {
             if ( !TreeView_SelectItem(GetHwnd(), HITEM(item)) )
             {
                 wxLogLastError(wxT("TreeView_SelectItem"));
             }
         if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
         {
             if ( !TreeView_SelectItem(GetHwnd(), HITEM(item)) )
             {
                 wxLogLastError(wxT("TreeView_SelectItem"));
             }

-            else
+            else // ok

             {
                 event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
                 (void)GetEventHandler()->ProcessEvent(event);
             {
                 event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
                 (void)GetEventHandler()->ProcessEvent(event);


@@ -1843,6 +1763,8 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item)
 
 void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
 {
 
 void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
 {

+    wxCHECK_RET( !IsHiddenRoot(item), _T("can't show hidden root item") );
+

     // no error return
     TreeView_EnsureVisible(GetHwnd(), HITEM(item));
 }
     // no error return
     TreeView_EnsureVisible(GetHwnd(), HITEM(item));
 }


@@ -1876,16 +1798,19 @@ void wxTreeCtrl::DeleteTextCtrl()
         m_textCtrl->SetHWND(0);
         delete m_textCtrl;
         m_textCtrl = NULL;
         m_textCtrl->SetHWND(0);
         delete m_textCtrl;
         m_textCtrl = NULL;

+
+        m_idEdited.Unset();

     }
 }
 
     }
 }
 

-wxTextCtrl* wxTreeCtrl::EditLabel(const wxTreeItemId& item,
-                                  wxClassInfo* textControlClass)
+wxTextCtrl *wxTreeCtrl::EditLabel(const wxTreeItemId& item,
+                                  wxClassInfo *textControlClass)

 {
     wxASSERT( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)) );
 
     DeleteTextCtrl();
 
 {
     wxASSERT( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)) );
 
     DeleteTextCtrl();
 

+    m_idEdited = item;

     m_textCtrl = (wxTextCtrl *)textControlClass->CreateObject();
     HWND hWnd = (HWND) TreeView_EditLabel(GetHwnd(), HITEM(item));
 
     m_textCtrl = (wxTextCtrl *)textControlClass->CreateObject();
     HWND hWnd = (HWND) TreeView_EditLabel(GetHwnd(), HITEM(item));
 


@@ -1903,20 +1828,20 @@ wxTextCtrl* wxTreeCtrl::EditLabel(const wxTreeItemId& item,
 }
 
 // End label editing, optionally cancelling the edit
 }
 
 // End label editing, optionally cancelling the edit

-void wxTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), bool discardChanges)
+void wxTreeCtrl::DoEndEditLabel(bool discardChanges)

 {
     TreeView_EndEditLabelNow(GetHwnd(), discardChanges);
 
     DeleteTextCtrl();
 }
 
 {
     TreeView_EndEditLabelNow(GetHwnd(), discardChanges);
 
     DeleteTextCtrl();
 }
 

-wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
+wxTreeItemId wxTreeCtrl::DoTreeHitTest(const wxPoint& point, int& flags) const

 {
     TV_HITTESTINFO hitTestInfo;
     hitTestInfo.pt.x = (int)point.x;
     hitTestInfo.pt.y = (int)point.y;
 
 {
     TV_HITTESTINFO hitTestInfo;
     hitTestInfo.pt.x = (int)point.x;
     hitTestInfo.pt.y = (int)point.y;
 

-    TreeView_HitTest(GetHwnd(), &hitTestInfo);
+    (void) TreeView_HitTest(GetHwnd(), &hitTestInfo);

 
     flags = 0;
 
 
     flags = 0;
 


@@ -1979,16 +1904,10 @@ public:
     static int CALLBACK Compare(LPARAM data1, LPARAM data2, LPARAM tree);
 
 private:
     static int CALLBACK Compare(LPARAM data1, LPARAM data2, LPARAM tree);
 
 private:

-    static wxTreeItemId GetIdFromData(wxTreeCtrl *tree, LPARAM item)
+    static wxTreeItemId GetIdFromData(LPARAM lParam)

     {
     {

-        wxTreeItemData *data = (wxTreeItemData *)item;
-        if ( tree->IsDataIndirect(data) )
-        {
-            data = ((wxTreeItemIndirectData *)data)->GetData();
+        return ((wxTreeItemParam*)lParam)->GetItem();

         }
         }

-
-        return data->GetId();
-    }

 };
 
 int CALLBACK wxTreeSortHelper::Compare(LPARAM pItem1,
 };
 
 int CALLBACK wxTreeSortHelper::Compare(LPARAM pItem1,


@@ -2000,21 +1919,21 @@ int CALLBACK wxTreeSortHelper::Compare(LPARAM pItem1,
 
     wxTreeCtrl *tree = (wxTreeCtrl *)htree;
 
 
     wxTreeCtrl *tree = (wxTreeCtrl *)htree;
 

-    return tree->OnCompareItems(GetIdFromData(tree, pItem1),
-                                GetIdFromData(tree, pItem2));
-}
-
-int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
-                               const wxTreeItemId& item2)
-{
-    return wxStrcmp(GetItemText(item1), GetItemText(item2));
+    return tree->OnCompareItems(GetIdFromData(pItem1),
+                                GetIdFromData(pItem2));

 }
 
 void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
 {
 }
 
 void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
 {

+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+

     // rely on the fact that TreeView_SortChildren does the same thing as our
     // default behaviour, i.e. sorts items alphabetically and so call it
     // directly if we're not in derived class (much more efficient!)
     // rely on the fact that TreeView_SortChildren does the same thing as our
     // default behaviour, i.e. sorts items alphabetically and so call it
     // directly if we're not in derived class (much more efficient!)

+    // RN: Note that if you find you're code doesn't sort as expected this
+    //     may be why as if you don't use the DECLARE_CLASS/IMPLEMENT_CLASS
+    //     combo for your derived wxTreeCtrl if will sort without
+    //     OnCompareItems

     if ( GetClassInfo() == CLASSINFO(wxTreeCtrl) )
     {
         TreeView_SortChildren(GetHwnd(), HITEM(item), 0);
     if ( GetClassInfo() == CLASSINFO(wxTreeCtrl) )
     {
         TreeView_SortChildren(GetHwnd(), HITEM(item), 0);


@@ -2033,6 +1952,20 @@ void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
 // implementation
 // ----------------------------------------------------------------------------
 
 // implementation
 // ----------------------------------------------------------------------------
 

+bool wxTreeCtrl::MSWShouldPreProcessMessage(WXMSG* msg)
+{
+    if ( msg->message == WM_KEYDOWN )
+    {
+        if ( msg->wParam == VK_RETURN )
+        {
+            // we need VK_RETURN to generate wxEVT_COMMAND_TREE_ITEM_ACTIVATED
+            return false;
+        }
+    }
+
+    return wxTreeCtrlBase::MSWShouldPreProcessMessage(msg);
+}
+

 bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id)
 {
     if ( cmd == EN_UPDATE )
 bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id)
 {
     if ( cmd == EN_UPDATE )


@@ -2061,13 +1994,47 @@ bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id)
 // only do it during dragging, minimize wxWin overhead (this is important for
 // WM_MOUSEMOVE as they're a lot of them) by catching Windows messages directly
 // instead of passing by wxWin events
 // only do it during dragging, minimize wxWin overhead (this is important for
 // WM_MOUSEMOVE as they're a lot of them) by catching Windows messages directly
 // instead of passing by wxWin events

-long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)

 {
     bool processed = false;
 {
     bool processed = false;

-    long rc = 0;
-    bool isMultiple = (GetWindowStyle() & wxTR_MULTIPLE) != 0;
+    WXLRESULT rc = 0;
+    bool isMultiple = HasFlag(wxTR_MULTIPLE);
+
+    // This message is sent after a right-click, or when the "menu" key is pressed
+    if ( nMsg == WM_CONTEXTMENU )
+    {
+        int x = GET_X_LPARAM(lParam),
+            y = GET_Y_LPARAM(lParam);
+        // Convert the screen point to a client point
+        wxPoint MenuPoint = ScreenToClient(wxPoint(x, y));
+
+        // can't use GetSelection() here as it would assert in multiselect mode
+        wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_MENU, this,
+                          wxTreeItemId(TreeView_GetSelection(GetHwnd())));
+
+        // Get the bounding rectangle for the item, including the non-text areas
+        wxRect ItemRect;
+        GetBoundingRect(event.m_item, ItemRect, false);
+        // If the point is inside the bounding rectangle, use it as the click position.
+        // This should be the case for WM_CONTEXTMENU as the result of a right-click
+        if (ItemRect.Contains(MenuPoint))
+        {
+            event.m_pointDrag = MenuPoint;
+        }
+        // Use the Explorer standard of putting the menu at the left edge of the text,
+        // in the vertical middle of the text. Should be the case for the "menu" key
+        else
+        {
+            // Use the bounding rectangle of only the text part
+            GetBoundingRect(event.m_item, ItemRect, true);
+            event.m_pointDrag = wxPoint(ItemRect.GetX(), ItemRect.GetY() + ItemRect.GetHeight() / 2);
+        }

 
 

-    if ( (nMsg >= WM_MOUSEFIRST) && (nMsg <= WM_MOUSELAST) )
+        if ( GetEventHandler()->ProcessEvent(event) )
+            processed = true;
+        //else: continue with generating wxEVT_CONTEXT_MENU in base class code
+    }
+    else if ( (nMsg >= WM_MOUSEFIRST) && (nMsg <= WM_MOUSELAST) )

     {
         // we only process mouse messages here and these parameters have the
         // same meaning for all of them
     {
         // we only process mouse messages here and these parameters have the
         // same meaning for all of them


@@ -2075,38 +2042,31 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             y = GET_Y_LPARAM(lParam);
         HTREEITEM htItem = GetItemFromPoint(GetHwnd(), x, y);
 
             y = GET_Y_LPARAM(lParam);
         HTREEITEM htItem = GetItemFromPoint(GetHwnd(), x, y);
 

-        switch ( nMsg )
-        {
-            case WM_RBUTTONDOWN:
-                // if the item we are about to right click on
-                // is not already select, remove the entire
-                // previous selection
-                if (!::IsItemSelected(GetHwnd(), htItem))
-                {
-                    UnselectAll();
-                }
+        TV_HITTESTINFO tvht;
+        tvht.pt.x = x;
+        tvht.pt.y = y;

 
 

-                // select item and set the focus to the
-                // newly selected item
-                ::SelectItem(GetHwnd(), htItem);
-                ::SetFocus(GetHwnd(), htItem);
-                break;
+        (void) TreeView_HitTest(GetHwnd(), &tvht);

 
 

-#if !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
+        switch ( nMsg )
+        {

             case WM_LBUTTONDOWN:
             case WM_LBUTTONDOWN:

-                if ( htItem && isMultiple )
+                if ( htItem && isMultiple && (tvht.flags & TVHT_ONITEM) != 0 )

                 {
                 {

+                    m_htClickedItem = (WXHTREEITEM) htItem;
+                    m_ptClick = wxPoint(x, y);
+

                     if ( wParam & MK_CONTROL )
                     {
                         SetFocus();
 
                         // toggle selected state
                     if ( wParam & MK_CONTROL )
                     {
                         SetFocus();
 
                         // toggle selected state

-                        ToggleItemSelection(GetHwnd(), htItem);
+                        ::ToggleItemSelection(GetHwnd(), htItem);

 
                         ::SetFocus(GetHwnd(), htItem);
 
                         // reset on any click without Shift
 
                         ::SetFocus(GetHwnd(), htItem);
 
                         // reset on any click without Shift

-                        m_htSelStart = 0;
+                        m_htSelStart.Unset();

 
                         processed = true;
                     }
 
                         processed = true;
                     }


@@ -2121,8 +2081,11 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                             m_htSelStart = TreeView_GetSelection(GetHwnd());
                         }
 
                             m_htSelStart = TreeView_GetSelection(GetHwnd());
                         }
 

-                        SelectRange(GetHwnd(), HITEM(m_htSelStart), htItem,
+                        if ( m_htSelStart )
+                            SelectRange(GetHwnd(), HITEM(m_htSelStart), htItem,

                                     !(wParam & MK_CONTROL));
                                     !(wParam & MK_CONTROL));

+                        else
+                            ::SelectItem(GetHwnd(), htItem);

 
                         ::SetFocus(GetHwnd(), htItem);
 
 
                         ::SetFocus(GetHwnd(), htItem);
 


@@ -2132,7 +2095,9 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                     {
                         // avoid doing anything if we click on the only
                         // currently selected item
                     {
                         // avoid doing anything if we click on the only
                         // currently selected item

-                        
+
+                        SetFocus();
+

                         wxArrayTreeItemIds selections;
                         size_t count = GetSelections(selections);
                         if ( count == 0 ||
                         wxArrayTreeItemIds selections;
                         size_t count = GetSelections(selections);
                         if ( count == 0 ||


@@ -2143,12 +2108,8 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                             // user clicked outside of the present selection.
                             // otherwise, perform the deselection on mouse-up.
                             // this allows multiple drag and drop to work.
                             // user clicked outside of the present selection.
                             // otherwise, perform the deselection on mouse-up.
                             // this allows multiple drag and drop to work.

-                            
-                            if (IsItemSelected(GetHwnd(), htItem))
-                            {
-                                ::SetFocus(GetHwnd(), htItem);
-                            }
-                             else
+
+                            if (!IsItemSelected(GetHwnd(), htItem))

                             {
                                 UnselectAll();
 
                             {
                                 UnselectAll();
 


@@ -2160,16 +2121,56 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                                 TreeView_SelectItem(GetHwnd(), 0);
                                 ::SelectItem(GetHwnd(), htItem);
                             }
                                 TreeView_SelectItem(GetHwnd(), 0);
                                 ::SelectItem(GetHwnd(), htItem);
                             }

+                            ::SetFocus(GetHwnd(), htItem);
+                            processed = true;

                         }
 
                         // reset on any click without Shift
                         }
 
                         // reset on any click without Shift

-                        m_htSelStart = 0;
+                        m_htSelStart.Unset();

                     }
                 }
                 break;
                     }
                 }
                 break;

-#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE

 
             case WM_MOUSEMOVE:
 
             case WM_MOUSEMOVE:

+#ifndef __WXWINCE__
+                if ( m_htClickedItem )
+                {
+                    int cx = abs(m_ptClick.x - x);
+                    int cy = abs(m_ptClick.y - y);
+
+                    if ( cx > GetSystemMetrics( SM_CXDRAG ) || cy > GetSystemMetrics( SM_CYDRAG ) )
+                    {
+                        HWND pWnd = ::GetParent( GetHwnd() );
+                        if ( pWnd )
+                        {
+                            NM_TREEVIEW tv;
+
+                            tv.hdr.hwndFrom = GetHwnd();
+                            tv.hdr.idFrom = ::GetWindowLong( GetHwnd(), GWL_ID );
+                            tv.hdr.code = TVN_BEGINDRAG;
+
+                            tv.itemNew.hItem = HITEM(m_htClickedItem);
+
+                            TVITEM tviAux;
+                            ZeroMemory(&tviAux, sizeof(tviAux));
+                            tviAux.hItem = HITEM(m_htClickedItem);
+                            tviAux.mask = TVIF_STATE | TVIF_PARAM;
+                            tviAux.stateMask = 0xffffffff;
+                            TreeView_GetItem( GetHwnd(), &tviAux );
+
+                            tv.itemNew.state = tviAux.state;
+                            tv.itemNew.lParam = tviAux.lParam;
+
+                            tv.ptDrag.x = x;
+                            tv.ptDrag.y = y;
+
+                            ::SendMessage( pWnd, WM_NOTIFY, tv.hdr.idFrom, (LPARAM)&tv );
+                        }
+                        m_htClickedItem.Unset();
+                    }
+                }
+#endif // __WXWINCE__
+

                 if ( m_dragImage )
                 {
                     m_dragImage->Move(wxPoint(x, y));
                 if ( m_dragImage )
                 {
                     m_dragImage->Move(wxPoint(x, y));


@@ -2198,7 +2199,10 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                     {
                         UnselectAll();
                         TreeView_SelectItem(GetHwnd(), htItem);
                     {
                         UnselectAll();
                         TreeView_SelectItem(GetHwnd(), htItem);

+                        ::SelectItem(GetHwnd(), htItem);
+                        ::SetFocus(GetHwnd(), htItem);

                     }
                     }

+                    m_htClickedItem.Unset();

                 }
 
                 // fall through
                 }
 
                 // fall through


@@ -2211,12 +2215,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                     m_dragImage = NULL;
 
                     // generate the drag end event
                     m_dragImage = NULL;
 
                     // generate the drag end event

-                    wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, m_windowId);
-
-                    event.m_item = htItem;
-                    event.m_pointDrag = wxPoint(x, y);
-                    event.SetEventObject(this);
-
+                    wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, this, htItem);

                     (void)GetEventHandler()->ProcessEvent(event);
 
                     // if we don't do it, the tree seems to think that 2 items
                     (void)GetEventHandler()->ProcessEvent(event);
 
                     // if we don't do it, the tree seems to think that 2 items


@@ -2226,7 +2225,6 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                 break;
         }
     }
                 break;
         }
     }

-#if !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE

     else if ( (nMsg == WM_SETFOCUS || nMsg == WM_KILLFOCUS) && isMultiple )
     {
         // the tree control greys out the selected item when it loses focus and
     else if ( (nMsg == WM_SETFOCUS || nMsg == WM_KILLFOCUS) && isMultiple )
     {
         // the tree control greys out the selected item when it loses focus and


@@ -2240,9 +2238,9 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             // TreeView_GetItemRect() will return false if item is not visible,
             // which may happen perfectly well
             if ( TreeView_GetItemRect(GetHwnd(), HITEM(selections[n]),
             // TreeView_GetItemRect() will return false if item is not visible,
             // which may happen perfectly well
             if ( TreeView_GetItemRect(GetHwnd(), HITEM(selections[n]),

-                                      &rect, true) )
+                                      &rect, TRUE) )

             {
             {

-                ::InvalidateRect(GetHwnd(), &rect, false);
+                ::InvalidateRect(GetHwnd(), &rect, FALSE);

             }
         }
     }
             }
         }
     }


@@ -2251,68 +2249,110 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
         bool bCtrl = wxIsCtrlDown(),
              bShift = wxIsShiftDown();
 
         bool bCtrl = wxIsCtrlDown(),
              bShift = wxIsShiftDown();
 

-        // we handle.arrows and space, but not page up/down and home/end: the
-        // latter should be easy, but not the former
-

         HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
         HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());

-        if ( !m_htSelStart )
+        switch ( wParam )

         {
         {

-            m_htSelStart = htSel;
-        }
-
-        if ( wParam == VK_SPACE )
-        {
-            if ( bCtrl )
-            {
-                ToggleItemSelection(GetHwnd(), htSel);
-            }
-            else
-            {
-                UnselectAll();
-
-                ::SelectItem(GetHwnd(), htSel);
-            }
+            case VK_SPACE:
+                if ( bCtrl )
+                {
+                    ::ToggleItemSelection(GetHwnd(), htSel);
+                }
+                else
+                {
+                    UnselectAll();

 
 

-            processed = true;
-        }
-        else if ( wParam == VK_UP || wParam == VK_DOWN )
-        {
-            if ( !bCtrl && !bShift )
-            {
-                // no modifiers, just clear selection and then let the default
-                // processing to take place
-                UnselectAll();
-            }
-            else if ( htSel )
-            {
-                (void)wxControl::MSWWindowProc(nMsg, wParam, lParam);
+                    ::SelectItem(GetHwnd(), htSel);
+                }

 
 

-                HTREEITEM htNext = (HTREEITEM)(wParam == VK_UP
-                                    ? TreeView_GetPrevVisible(GetHwnd(), htSel)
-                                    : TreeView_GetNextVisible(GetHwnd(), htSel));
+                processed = true;
+                break;

 
 

-                if ( !htNext )
+            case VK_UP:
+            case VK_DOWN:
+                if ( !bCtrl && !bShift )

                 {
                 {

-                    // at the top/bottom
-                    htNext = htSel;
+                    // no modifiers, just clear selection and then let the default
+                    // processing to take place
+                    UnselectAll();

                 }
                 }

-
-                if ( bShift )
+                else if ( htSel )

                 {
                 {

-                    SelectRange(GetHwnd(), HITEM(m_htSelStart), htNext);
+                    (void)wxControl::MSWWindowProc(nMsg, wParam, lParam);
+
+                    HTREEITEM htNext = (HTREEITEM)
+                        TreeView_GetNextItem
+                        (
+                            GetHwnd(),
+                            htSel,
+                            wParam == VK_UP ? TVGN_PREVIOUSVISIBLE
+                                            : TVGN_NEXTVISIBLE
+                        );
+
+                    if ( !htNext )
+                    {
+                        // at the top/bottom
+                        htNext = htSel;
+                    }
+
+                    if ( bShift )
+                    {
+                        if ( !m_htSelStart )
+                            m_htSelStart = htSel;
+
+                        SelectRange(GetHwnd(), HITEM(m_htSelStart), htNext);
+                    }
+                    else // bCtrl
+                    {
+                        // without changing selection
+                        ::SetFocus(GetHwnd(), htNext);
+                    }
+
+                    processed = true;

                 }
                 }

-                else // bCtrl
+                break;
+
+            case VK_HOME:
+            case VK_END:
+            case VK_PRIOR:
+            case VK_NEXT:
+                // TODO: handle Shift/Ctrl with these keys
+                if ( !bCtrl && !bShift )

                 {
                 {

-                    // without changing selection
-                    ::SetFocus(GetHwnd(), htNext);
+                    UnselectAll();
+
+                    m_htSelStart.Unset();

                 }
                 }

+        }
+    }
+    else if ( nMsg == WM_COMMAND )
+    {
+        // if we receive a EN_KILLFOCUS command from the in-place edit control
+        // used for label editing, make sure to end editing
+        WORD id, cmd;
+        WXHWND hwnd;
+        UnpackCommand(wParam, lParam, &id, &hwnd, &cmd);
+
+        if ( cmd == EN_KILLFOCUS )
+        {
+            if ( m_textCtrl && m_textCtrl->GetHandle() == hwnd )
+            {
+                DoEndEditLabel();

 
                 processed = true;
             }
         }
     }
 
                 processed = true;
             }
         }
     }

-#endif // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
-    else if ( nMsg == WM_CHAR )
+
+    if ( !processed )
+        rc = wxControl::MSWWindowProc(nMsg, wParam, lParam);
+
+    return rc;
+}
+
+WXLRESULT
+wxTreeCtrl::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+    if ( nMsg == WM_CHAR )

     {
         // don't let the control process Space and Return keys because it
         // doesn't do anything useful with them anyhow but always beeps
     {
         // don't let the control process Space and Return keys because it
         // doesn't do anything useful with them anyhow but always beeps


@@ -2320,21 +2360,16 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
         // simply if you just process TREEITEM_ACTIVATED event to which Space
         // and Enter presses are mapped in your code
         if ( wParam == VK_SPACE || wParam == VK_RETURN )
         // simply if you just process TREEITEM_ACTIVATED event to which Space
         // and Enter presses are mapped in your code
         if ( wParam == VK_SPACE || wParam == VK_RETURN )

-        {
-            processed = true;
-        }
+            return 0;

     }
 
     }
 

-    if ( !processed )
-        rc = wxControl::MSWWindowProc(nMsg, wParam, lParam);
-
-    return rc;
+    return wxControl::MSWDefWindowProc(nMsg, wParam, lParam);

 }
 
 // process WM_NOTIFY Windows message
 bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {
 }
 
 // process WM_NOTIFY Windows message
 bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {

-    wxTreeEvent event(wxEVT_NULL, m_windowId);
+    wxTreeEvent event(wxEVT_NULL, this);

     wxEventType eventType = wxEVT_NULL;
     NMHDR *hdr = (NMHDR *)lParam;
 
     wxEventType eventType = wxEVT_NULL;
     NMHDR *hdr = (NMHDR *)lParam;
 


@@ -2367,6 +2402,10 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 eventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 
                 eventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 

+                // although the user event handler may still veto it, it is
+                // important to set it now so that calls to SetItemText() from
+                // the event handler would change the text controls contents
+                m_idEdited =

                 event.m_item = info->item.hItem;
                 event.m_label = info->item.pszText;
                 event.m_editCancelled = false;
                 event.m_item = info->item.hItem;
                 event.m_label = info->item.pszText;
                 event.m_editCancelled = false;


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

-                if (info->item.pszText == NULL)
-                {
-                    event.m_editCancelled = true;
-                }
-                 else
-                {
-                    event.m_editCancelled = false;
-                }
+                event.m_editCancelled = info->item.pszText == NULL;
+                break;
+            }
+
+#ifndef __WXWINCE__
+        // These *must* not be removed or TVN_GETINFOTIP will
+        // not be processed each time the mouse is moved
+        // and the tooltip will only ever update once.
+        case TTN_NEEDTEXTA:
+        case TTN_NEEDTEXTW:
+            {
+                *result = 0;
+

                 break;
             }
 
                 break;
             }
 

+#ifdef TVN_GETINFOTIP
+        case TVN_GETINFOTIP:
+            {
+                eventType = wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP;
+                NMTVGETINFOTIP *info = (NMTVGETINFOTIP*)lParam;
+
+                // Which item are we trying to get a tooltip for?
+                event.m_item = info->hItem;
+
+                break;
+            }
+#endif // TVN_GETINFOTIP
+#endif // !__WXWINCE__
+

         case TVN_GETDISPINFO:
             eventType = wxEVT_COMMAND_TREE_GET_INFO;
             // fall through
         case TVN_GETDISPINFO:
             eventType = wxEVT_COMMAND_TREE_GET_INFO;
             // fall through


@@ -2429,7 +2487,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         case TVN_ITEMEXPANDING:
         case TVN_ITEMEXPANDED:
             {
         case TVN_ITEMEXPANDING:
         case TVN_ITEMEXPANDED:
             {

-                NM_TREEVIEW* tv = (NM_TREEVIEW*)lParam;
+                NM_TREEVIEW *tv = (NM_TREEVIEW*)lParam;

 
                 int what;
                 switch ( tv->action )
 
                 int what;
                 switch ( tv->action )


@@ -2464,12 +2522,12 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 // fabricate the lParam and wParam parameters sufficiently
                 // similar to the ones from a "real" WM_KEYDOWN so that
                 // CreateKeyEvent() works correctly
                 // fabricate the lParam and wParam parameters sufficiently
                 // similar to the ones from a "real" WM_KEYDOWN so that
                 // CreateKeyEvent() works correctly

-                WXLPARAM lParam =
-                     (::GetKeyState(VK_MENU) < 0 ? KF_ALTDOWN : 0) << 16;
+                const bool isAltDown = ::GetKeyState(VK_MENU) < 0;
+                WXLPARAM lParam = (isAltDown ? KF_ALTDOWN : 0) << 16;

 
                 WXWPARAM wParam = info->wVKey;
 
 
                 WXWPARAM wParam = info->wVKey;
 

-                int keyCode = wxCharCodeMSWToWX(info->wVKey);
+                int keyCode = wxCharCodeMSWToWX(wParam);

                 if ( !keyCode )
                 {
                     // wxCharCodeMSWToWX() returns 0 to indicate that this is a
                 if ( !keyCode )
                 {
                     // wxCharCodeMSWToWX() returns 0 to indicate that this is a


@@ -2483,24 +2541,21 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                                                 wParam);
 
                 // a separate event for Space/Return
                                                 wParam);
 
                 // a separate event for Space/Return

-                if ( !wxIsCtrlDown() && !wxIsShiftDown() &&
+                if ( !wxIsCtrlDown() && !wxIsShiftDown() && !isAltDown &&

                      ((info->wVKey == VK_SPACE) || (info->wVKey == VK_RETURN)) )
                 {
                      ((info->wVKey == VK_SPACE) || (info->wVKey == VK_RETURN)) )
                 {

-                    wxTreeEvent event2(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
-                                       m_windowId);
-                    event2.SetEventObject(this);
-                    if ( !(GetWindowStyle() & wxTR_MULTIPLE) )
-                    {
-                        event2.m_item = GetSelection();
-                    }
-                    //else: don't know how to get it
+                   wxTreeItemId item;
+                   if ( !HasFlag(wxTR_MULTIPLE) )
+                       item = GetSelection();

 
 

-                    (void)GetEventHandler()->ProcessEvent(event2);
+                   wxTreeEvent event2(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
+                                        this, item);
+                   (void)GetEventHandler()->ProcessEvent(event2);

                 }
             }
             break;
 
                 }
             }
             break;
 

-        // NB: MSLU is broken and sends TVN_SELCHANGEDA instead of 
+        // NB: MSLU is broken and sends TVN_SELCHANGEDA instead of

         //     TVN_SELCHANGEDW in Unicode mode under Win98. Therefore
         //     we have to handle both messages:
         case TVN_SELCHANGEDA:
         //     TVN_SELCHANGEDW in Unicode mode under Win98. Therefore
         //     we have to handle both messages:
         case TVN_SELCHANGEDA:


@@ -2515,23 +2570,25 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     eventType = wxEVT_COMMAND_TREE_SEL_CHANGING;
                 //else: already set above
 
                     eventType = wxEVT_COMMAND_TREE_SEL_CHANGING;
                 //else: already set above
 

-                if (hdr->code == TVN_SELCHANGINGW || 
+                if (hdr->code == TVN_SELCHANGINGW ||

                     hdr->code == TVN_SELCHANGEDW)
                 {
                     hdr->code == TVN_SELCHANGEDW)
                 {

-                    NM_TREEVIEWW* tv = (NM_TREEVIEWW *)lParam;
+                    NM_TREEVIEWW *tv = (NM_TREEVIEWW *)lParam;

                     event.m_item = tv->itemNew.hItem;
                     event.m_itemOld = tv->itemOld.hItem;
                 }
                 else
                 {
                     event.m_item = tv->itemNew.hItem;
                     event.m_itemOld = tv->itemOld.hItem;
                 }
                 else
                 {

-                    NM_TREEVIEWA* tv = (NM_TREEVIEWA *)lParam;
+                    NM_TREEVIEWA *tv = (NM_TREEVIEWA *)lParam;

                     event.m_item = tv->itemNew.hItem;
                     event.m_itemOld = tv->itemOld.hItem;
                 }
             }
             break;
 
                     event.m_item = tv->itemNew.hItem;
                     event.m_itemOld = tv->itemOld.hItem;
                 }
             }
             break;
 

-#if defined(_WIN32_IE) && _WIN32_IE >= 0x300 && !wxUSE_COMCTL32_SAFELY && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
+            // instead of explicitly checking for _WIN32_IE, check if the
+            // required symbols are available in the headers
+#if defined(CDDS_PREPAINT) && !wxUSE_COMCTL32_SAFELY

         case NM_CUSTOMDRAW:
             {
                 LPNMTVCUSTOMDRAW lptvcd = (LPNMTVCUSTOMDRAW)lParam;
         case NM_CUSTOMDRAW:
             {
                 LPNMTVCUSTOMDRAW lptvcd = (LPNMTVCUSTOMDRAW)lParam;


@@ -2559,60 +2616,49 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
                             wxTreeItemAttr * const attr = it->second;
 
 
                             wxTreeItemAttr * const attr = it->second;
 

-                            HFONT hFont;
-                            if ( attr->HasFont() )
-                            {
-                                hFont = GetHfontOf(attr->GetFont());
-                            }
-                            else
-                            {
-                                hFont = 0;
-                            }
-
-                            wxColour colText;
-                            if ( attr->HasTextColour() )
-                            {
-                                colText = attr->GetTextColour();
-                            }
-                            else
-                            {
-                                colText = GetForegroundColour();
-                            }
+                            wxTreeViewItem tvItem((void *)nmcd.dwItemSpec,
+                                                  TVIF_STATE, TVIS_DROPHILITED);
+                            DoGetItem(&tvItem);
+                            const UINT tvItemState = tvItem.state;

 
 

-                            // selection colours should override ours
-                            if ( nmcd.uItemState & CDIS_SELECTED )
-                            {
-                                lptvcd->clrTextBk =
-                                    ::GetSysColor(COLOR_HIGHLIGHT);
-                                lptvcd->clrText =
-                                    ::GetSysColor(COLOR_HIGHLIGHTTEXT);
-                            }
-                            else // !selected
+                            // selection colours should override ours,
+                            // otherwise it is too confusing to the user
+                            if ( !(nmcd.uItemState & CDIS_SELECTED) &&
+                                 !(tvItemState & TVIS_DROPHILITED) )

                             {
                                 wxColour colBack;
                                 if ( attr->HasBackgroundColour() )
                                 {
                                     colBack = attr->GetBackgroundColour();
                             {
                                 wxColour colBack;
                                 if ( attr->HasBackgroundColour() )
                                 {
                                     colBack = attr->GetBackgroundColour();

+                                    lptvcd->clrTextBk = wxColourToRGB(colBack);

                                 }
                                 }

-                                else
+                            }
+
+                            // but we still want to keep the special foreground
+                            // colour when we don't have focus (we can't keep
+                            // it when we do, it would usually be unreadable on
+                            // the almost inverted bg colour...)
+                            if ( ( !(nmcd.uItemState & CDIS_SELECTED) ||
+                                    FindFocus() != this ) &&
+                                 !(tvItemState & TVIS_DROPHILITED) )
+                            {
+                                wxColour colText;
+                                if ( attr->HasTextColour() )

                                 {
                                 {

-                                    colBack = GetBackgroundColour();
+                                    colText = attr->GetTextColour();
+                                    lptvcd->clrText = wxColourToRGB(colText);

                                 }
                                 }

-
-                                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 )
+                            if ( attr->HasFont() )

                             {
                             {

+                                HFONT hFont = GetHfontOf(attr->GetFont());
+

                                 ::SelectObject(nmcd.hdc, hFont);
 
                                 *result = CDRF_NEWFONT;
                             }
                                 ::SelectObject(nmcd.hdc, hFont);
 
                                 *result = CDRF_NEWFONT;
                             }

-                            else
+                            else // no specific font

                             {
                                 *result = CDRF_DODEFAULT;
                             }
                             {
                                 *result = CDRF_DODEFAULT;
                             }


@@ -2626,7 +2672,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
             // we always process it
             return true;
 
             // we always process it
             return true;

-#endif // _WIN32_IE >= 0x300
+#endif // have owner drawn support in headers

 
         case NM_CLICK:
             {
 
         case NM_CLICK:
             {


@@ -2673,9 +2719,11 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             return wxControl::MSWOnNotify(idCtrl, lParam, result);
     }
 
             return wxControl::MSWOnNotify(idCtrl, lParam, result);
     }
 

-    event.SetEventObject(this);

     event.SetEventType(eventType);
 
     event.SetEventType(eventType);
 

+    if ( event.m_item.IsOk() )
+        event.SetClientObject(GetItemData(event.m_item));
+

     bool processed = GetEventHandler()->ProcessEvent(event);
 
     // post processing
     bool processed = GetEventHandler()->ProcessEvent(event);
 
     // post processing


@@ -2689,6 +2737,17 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             *result = false;
             break;
 
             *result = false;
             break;
 

+        case NM_RCLICK:
+            // prevent tree control from sending WM_CONTEXTMENU to our parent
+            // (which it does if NM_RCLICK is not handled) because we want to
+            // send it to the control itself
+            *result =
+            processed = true;
+
+            ::SendMessage(GetHwnd(), WM_CONTEXTMENU,
+                          (WPARAM)GetHwnd(), ::GetMessagePos());
+            break;
+

         case TVN_BEGINDRAG:
         case TVN_BEGINRDRAG:
             if ( event.IsAllowed() )
         case TVN_BEGINDRAG:
         case TVN_BEGINRDRAG:
             if ( event.IsAllowed() )


@@ -2698,31 +2757,22 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 wxASSERT_MSG( !m_dragImage, _T("starting to drag once again?") );
 
                 m_dragImage = new wxDragImage(*this, event.m_item);
                 wxASSERT_MSG( !m_dragImage, _T("starting to drag once again?") );
 
                 m_dragImage = new wxDragImage(*this, event.m_item);

-                m_dragImage->BeginDrag(wxPoint(0, 0), this);
+                m_dragImage->BeginDrag(wxPoint(0,0), this);

                 m_dragImage->Show();
             }
             break;
 
         case TVN_DELETEITEM:
             {
                 m_dragImage->Show();
             }
             break;
 
         case TVN_DELETEITEM:
             {

-                // NB: we might process this message using wxWindows event
+                // NB: we might process this message using wxWidgets event

                 //     tables, but due to overhead of wxWin event system we
                 //     prefer to do it here ourself (otherwise deleting a tree
                 //     with many items is just too slow)
                 //     tables, but due to overhead of wxWin event system we
                 //     prefer to do it here ourself (otherwise deleting a tree
                 //     with many items is just too slow)

-                NM_TREEVIEW* tv = (NM_TREEVIEW *)lParam;
+                NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;

 
 

-                wxTreeItemId item = event.m_item;
-                if ( HasIndirectData(item) )
-                {
-                    wxTreeItemIndirectData *data = (wxTreeItemIndirectData *)
-                                                        tv->itemOld.lParam;
-                    delete data; // can't be NULL here
-                }
-                else
-                {
-                    wxTreeItemData *data = (wxTreeItemData *)tv->itemOld.lParam;
-                    delete data; // may be NULL, ok
-                }
+                wxTreeItemParam *param =
+                        (wxTreeItemParam *)tv->itemOld.lParam;
+                delete param;

 
                 processed = true; // Make sure we don't get called twice
             }
 
                 processed = true; // Make sure we don't get called twice
             }


@@ -2731,19 +2781,20 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         case TVN_BEGINLABELEDIT:
             // return true to cancel label editing
             *result = !event.IsAllowed();
         case TVN_BEGINLABELEDIT:
             // return true to cancel label editing
             *result = !event.IsAllowed();

+

             // set ES_WANTRETURN ( like we do in BeginLabelEdit )
             // set ES_WANTRETURN ( like we do in BeginLabelEdit )

-            if(event.IsAllowed())
+            if ( event.IsAllowed() )

             {
                 HWND hText = TreeView_GetEditControl(GetHwnd());
             {
                 HWND hText = TreeView_GetEditControl(GetHwnd());

-                if(hText != NULL)
+                if ( hText )

                 {
                 {

-                    // MBN: if m_textCtrl already has an HWND, it is a stale 
+                    // MBN: if m_textCtrl already has an HWND, it is a stale

                     // pointer from a previous edit (because the user
                     // didn't modify the label before dismissing the control,
                     // and TVN_ENDLABELEDIT was not sent), so delete it
                     // pointer from a previous edit (because the user
                     // didn't modify the label before dismissing the control,
                     // and TVN_ENDLABELEDIT was not sent), so delete it

-                    if(m_textCtrl && m_textCtrl->GetHWND() != 0)
+                    if ( m_textCtrl && m_textCtrl->GetHWND() )

                         DeleteTextCtrl();
                         DeleteTextCtrl();

-                    if(!m_textCtrl)
+                    if ( !m_textCtrl )

                         m_textCtrl = new wxTextCtrl();
                     m_textCtrl->SetParent(this);
                     m_textCtrl->SetHWND((WXHWND)hText);
                         m_textCtrl = new wxTextCtrl();
                     m_textCtrl->SetParent(this);
                     m_textCtrl->SetHWND((WXHWND)hText);


@@ -2757,6 +2808,10 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                                                | wxTE_PROCESS_ENTER);
                 }
             }
                                                | wxTE_PROCESS_ENTER);
                 }
             }

+            else // we had set m_idEdited before
+            {
+                m_idEdited.Unset();
+            }

             break;
 
         case TVN_ENDLABELEDIT:
             break;
 
         case TVN_ENDLABELEDIT:


@@ -2772,6 +2827,20 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             DeleteTextCtrl();
             break;
 
             DeleteTextCtrl();
             break;
 

+#ifndef __WXWINCE__
+#ifdef TVN_GETINFOTIP
+         case TVN_GETINFOTIP:
+            {
+                // If the user permitted a tooltip change, change it
+                if (event.IsAllowed())
+                {
+                    SetToolTip(event.m_label);
+                }
+            }
+            break;
+#endif
+#endif
+

         case TVN_SELCHANGING:
         case TVN_ITEMEXPANDING:
             // return true to prevent the action from happening
         case TVN_SELCHANGING:
         case TVN_ITEMEXPANDING:
             // return true to prevent the action from happening


@@ -2783,7 +2852,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             // an image depending on the expanded/collapsed state - bug in
             // comctl32.dll or our code?
             {
             // an image depending on the expanded/collapsed state - bug in
             // comctl32.dll or our code?
             {

-                NM_TREEVIEW* tv = (NM_TREEVIEW *)lParam;
+                NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;

                 wxTreeItemId id(tv->itemNew.hItem);
 
                 int image = GetItemImage(id, wxTreeItemIcon_Expanded);
                 wxTreeItemId id(tv->itemNew.hItem);
 
                 int image = GetItemImage(id, wxTreeItemIcon_Expanded);


@@ -2797,16 +2866,20 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         case TVN_GETDISPINFO:
             // NB: so far the user can't set the image himself anyhow, so do it
             //     anyway - but this may change later
         case TVN_GETDISPINFO:
             // NB: so far the user can't set the image himself anyhow, so do it
             //     anyway - but this may change later

-            //if ( /* !processed && */ 1 )
+            //if ( /* !processed && */ )

             {
                 wxTreeItemId item = event.m_item;
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
             {
                 wxTreeItemId item = event.m_item;
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;

+
+                const wxTreeItemParam * const param = GetItemParam(item);
+                if ( !param )
+                    break;
+

                 if ( info->item.mask & TVIF_IMAGE )
                 {
                     info->item.iImage =
                 if ( info->item.mask & TVIF_IMAGE )
                 {
                     info->item.iImage =

-                        DoGetItemImageFromData
+                        param->GetImage

                         (
                         (

-                         item,

                          IsExpanded(item) ? wxTreeItemIcon_Expanded
                                           : wxTreeItemIcon_Normal
                         );
                          IsExpanded(item) ? wxTreeItemIcon_Expanded
                                           : wxTreeItemIcon_Normal
                         );


@@ -2814,9 +2887,8 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 if ( info->item.mask & TVIF_SELECTEDIMAGE )
                 {
                     info->item.iSelectedImage =
                 if ( info->item.mask & TVIF_SELECTEDIMAGE )
                 {
                     info->item.iSelectedImage =

-                        DoGetItemImageFromData
+                        param->GetImage

                         (
                         (

-                         item,

                          IsExpanded(item) ? wxTreeItemIcon_SelectedExpanded
                                           : wxTreeItemIcon_Selected
                         );
                          IsExpanded(item) ? wxTreeItemIcon_SelectedExpanded
                                           : wxTreeItemIcon_Selected
                         );


@@ -2848,7 +2920,7 @@ void wxTreeCtrl::SetState(const wxTreeItemId& node, int state)
     // Select the specified state, or -1 == cycle to the next one.
     if ( state == -1 )
     {
     // Select the specified state, or -1 == cycle to the next one.
     if ( state == -1 )
     {

-        TreeView_GetItem(GetHwnd(), &tvi); 
+        TreeView_GetItem(GetHwnd(), &tvi);

 
         state = STATEIMAGEMASKTOINDEX(tvi.state) + 1;
         if ( state == m_imageListState->GetImageCount() )
 
         state = STATEIMAGEMASKTOINDEX(tvi.state) + 1;
         if ( state == m_imageListState->GetImageCount() )


@@ -2858,7 +2930,7 @@ void wxTreeCtrl::SetState(const wxTreeItemId& node, int state)
     wxCHECK_RET( state < m_imageListState->GetImageCount(),
                  _T("wxTreeCtrl::SetState(): item index out of bounds") );
 
     wxCHECK_RET( state < m_imageListState->GetImageCount(),
                  _T("wxTreeCtrl::SetState(): item index out of bounds") );
 

-    tvi.state = INDEXTOSTATEIMAGEMASK(state); 
+    tvi.state = INDEXTOSTATEIMAGEMASK(state);

 
     TreeView_SetItem(GetHwnd(), &tvi);
 }
 
     TreeView_SetItem(GetHwnd(), &tvi);
 }


@@ -2869,10 +2941,9 @@ int wxTreeCtrl::GetState(const wxTreeItemId& node)
     tvi.hItem = (HTREEITEM)node.m_pItem;
     tvi.mask = TVIF_STATE;
     tvi.stateMask = TVIS_STATEIMAGEMASK;
     tvi.hItem = (HTREEITEM)node.m_pItem;
     tvi.mask = TVIF_STATE;
     tvi.stateMask = TVIS_STATEIMAGEMASK;

-    TreeView_GetItem(GetHwnd(), &tvi); 
+    TreeView_GetItem(GetHwnd(), &tvi);

 
     return STATEIMAGEMASKTOINDEX(tvi.state);
 }
 
 #endif // wxUSE_TREECTRL
 
     return STATEIMAGEMASKTOINDEX(tvi.state);
 }
 
 #endif // wxUSE_TREECTRL

-