Mac-ify wxTreeCtrl further.

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

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index c6c1cd6d355d36883bba61270fbb905081fba866..18b888bb9b3d845212a004d3b14b128dfa14c684 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        treectrl.cpp
+// Name:        src/msw/treectrl.cpp

 // Purpose:     wxTreeCtrl
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to be less MSW-specific on 10.10.98
 // Purpose:     wxTreeCtrl
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to be less MSW-specific on 10.10.98


@@ -16,6 +16,7 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

+

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


@@ -27,8 +28,14 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_TREECTRL
+

 #include "wx/msw/private.h"
 
 #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
+

 // Mingw32 is a bit mental even though this is done in winundef
 #ifdef GetFirstChild
     #undef GetFirstChild
 // Mingw32 is a bit mental even though this is done in winundef
 #ifdef GetFirstChild
     #undef GetFirstChild


@@ -43,16 +50,15 @@
 #include "wx/log.h"
 #include "wx/dynarray.h"
 #include "wx/imaglist.h"
 #include "wx/log.h"
 #include "wx/dynarray.h"
 #include "wx/imaglist.h"

-#include "wx/treectrl.h"

 #include "wx/settings.h"
 #include "wx/settings.h"

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

 #include "wx/msw/dragimag.h"
 
 #ifdef __GNUWIN32_OLD__
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 
 #include "wx/msw/dragimag.h"
 
 #ifdef __GNUWIN32_OLD__
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 

-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))

     #include <commctrl.h>
 #endif
 
     #include <commctrl.h>
 #endif
 


@@ -86,9 +92,6 @@
 // looks quite ugly.
 #define wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE 0
 
 // looks quite ugly.
 #define wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE 0
 

-// from msw/window.cpp
-extern bool wxIsShiftDown();
-extern bool wxIsCtrlDown();

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


@@ -101,7 +104,6 @@ static HTREEITEM GetItemFromPoint(HWND hwndTV, int x, int y)
     tvht.pt.x = x;
     tvht.pt.y = y;
 
     tvht.pt.x = x;
     tvht.pt.y = y;
 

-    // TreeView_HitTest() doesn't do the right cast in mingw32 headers

     return (HTREEITEM)TreeView_HitTest(hwndTV, &tvht);
 }
 
     return (HTREEITEM)TreeView_HitTest(hwndTV, &tvht);
 }
 


@@ -117,7 +119,7 @@ static bool IsItemSelected(HWND hwndTV, HTREEITEM hItem)
 
     if ( !TreeView_GetItem(hwndTV, &tvi) )
     {
 
     if ( !TreeView_GetItem(hwndTV, &tvi) )
     {

-        wxLogLastError("TreeView_GetItem");
+        wxLogLastError(wxT("TreeView_GetItem"));

     }
 
     return (tvi.state & TVIS_SELECTED) != 0;
     }
 
     return (tvi.state & TVIS_SELECTED) != 0;


@@ -133,7 +135,7 @@ static void SelectItem(HWND hwndTV, HTREEITEM hItem, bool select = TRUE)
 
     if ( TreeView_SetItem(hwndTV, &tvi) == -1 )
     {
 
     if ( TreeView_SetItem(hwndTV, &tvi) == -1 )
     {

-        wxLogLastError("TreeView_SetItem");
+        wxLogLastError(wxT("TreeView_SetItem"));

     }
 }
 
     }
 }
 


@@ -156,7 +158,7 @@ static void SelectRange(HWND hwndTV,
 {
     // find the first (or last) item and select it
     bool cont = TRUE;
 {
     // find the first (or last) item and select it
     bool cont = TRUE;

-    HTREEITEM htItem = TreeView_GetRoot(hwndTV);
+    HTREEITEM htItem = (HTREEITEM)TreeView_GetRoot(hwndTV);

     while ( htItem && cont )
     {
         if ( (htItem == htFirst) || (htItem == htLast) )
     while ( htItem && cont )
     {
         if ( (htItem == htFirst) || (htItem == htLast) )


@@ -176,7 +178,7 @@ static void SelectRange(HWND hwndTV,
             }
         }
 
             }
         }
 

-        htItem = TreeView_GetNextVisible(hwndTV, htItem);
+        htItem = (HTREEITEM)TreeView_GetNextVisible(hwndTV, htItem);

     }
 
     // select the items in range
     }
 
     // select the items in range


@@ -190,7 +192,7 @@ static void SelectRange(HWND hwndTV,
 
         cont = (htItem != htFirst) && (htItem != htLast);
 
 
         cont = (htItem != htFirst) && (htItem != htLast);
 

-        htItem = TreeView_GetNextVisible(hwndTV, htItem);
+        htItem = (HTREEITEM)TreeView_GetNextVisible(hwndTV, htItem);

     }
 
     // unselect the rest
     }
 
     // unselect the rest


@@ -203,7 +205,7 @@ static void SelectRange(HWND hwndTV,
                 UnselectItem(hwndTV, htItem);
             }
 
                 UnselectItem(hwndTV, htItem);
             }
 

-            htItem = TreeView_GetNextVisible(hwndTV, htItem);
+            htItem = (HTREEITEM)TreeView_GetNextVisible(hwndTV, htItem);

         }
     }
 
         }
     }
 


@@ -218,7 +220,7 @@ static void SelectRange(HWND hwndTV,
 static void SetFocus(HWND hwndTV, HTREEITEM htItem)
 {
     // the current focus
 static void SetFocus(HWND hwndTV, HTREEITEM htItem)
 {
     // the current focus

-    HTREEITEM htFocus = TreeView_GetSelection(hwndTV);
+    HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(hwndTV);

 
     if ( htItem )
     {
 
     if ( htItem )
     {


@@ -371,7 +373,7 @@ public:
             DoTraverse(root, recursively);
         }
 
             DoTraverse(root, recursively);
         }
 

-    virtual bool OnVisit(const wxTreeItemId& item)
+    virtual bool OnVisit(const wxTreeItemId& WXUNUSED(item))

     {
         m_count++;
 
     {
         m_count++;
 


@@ -451,7 +453,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
 // ----------------------------------------------------------------------------
 
 // handy table for sending events
 // ----------------------------------------------------------------------------
 
 // handy table for sending events

-static const wxEventType g_events[2][2] =
+static wxEventType g_events[2][2] =

 {
     { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxEVT_COMMAND_TREE_ITEM_COLLAPSING },
     { wxEVT_COMMAND_TREE_ITEM_EXPANDED,  wxEVT_COMMAND_TREE_ITEM_EXPANDING  }
 {
     { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxEVT_COMMAND_TREE_ITEM_COLLAPSING },
     { wxEVT_COMMAND_TREE_ITEM_EXPANDED,  wxEVT_COMMAND_TREE_ITEM_EXPANDING  }


@@ -500,11 +502,19 @@ void wxTreeCtrl::Init()
 {
     m_imageListNormal = NULL;
     m_imageListState = NULL;
 {
     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_htSelStart = 0;

+
+    // Initialize static array of events, because with the new event system,
+    // they may not be initialized yet.
+
+    g_events[0][0] = wxEVT_COMMAND_TREE_ITEM_COLLAPSED;
+    g_events[0][1] = wxEVT_COMMAND_TREE_ITEM_COLLAPSING;
+    g_events[1][0] = wxEVT_COMMAND_TREE_ITEM_EXPANDED;
+    g_events[1][1] = wxEVT_COMMAND_TREE_ITEM_EXPANDING;

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


@@ -521,8 +531,13 @@ bool wxTreeCtrl::Create(wxWindow *parent,
         return FALSE;
 
     DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
         return FALSE;
 
     DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |

-                   TVS_HASLINES | TVS_SHOWSELALWAYS;
+                   TVS_SHOWSELALWAYS;
+
+    if ( m_windowStyle & wxCLIP_SIBLINGS )
+        wstyle |= WS_CLIPSIBLINGS;

 
 

+    if ((m_windowStyle & wxTR_NO_LINES) == 0)
+        wstyle |= TVS_HASLINES;

     if ( m_windowStyle & wxTR_HAS_BUTTONS )
         wstyle |= TVS_HASBUTTONS;
 
     if ( m_windowStyle & wxTR_HAS_BUTTONS )
         wstyle |= TVS_HASBUTTONS;
 


@@ -550,8 +565,23 @@ bool wxTreeCtrl::Create(wxWindow *parent,
     if ( !MSWCreateControl(WC_TREEVIEW, wstyle) )
         return FALSE;
 
     if ( !MSWCreateControl(WC_TREEVIEW, wstyle) )
         return FALSE;
 

+#if wxUSE_COMCTL32_SAFELY
+    wxWindow::SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    wxWindow::SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
+#elif 1

     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
     SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
     SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());

+#else
+    // This works around a bug in the Windows tree control whereby for some versions
+    // of comctrl32, setting any colour actually draws the background in black.
+    // This will initialise the background to the system colour.
+    // THIS FIX NOW REVERTED since it caused problems on _other_ systems.
+    // Assume the user has an updated comctl32.dll.
+    ::SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0,-1);
+    wxWindow::SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
+#endif
+

 
     // VZ: this is some experimental code which may be used to get the
     //     TVS_CHECKBOXES style functionality for comctl32.dll < 4.71.
 
     // VZ: this is some experimental code which may be used to get the
     //     TVS_CHECKBOXES style functionality for comctl32.dll < 4.71.


@@ -627,6 +657,9 @@ wxTreeCtrl::~wxTreeCtrl()
 
     // delete user data to prevent memory leaks
     DeleteAllItems();
 
     // delete user data to prevent memory leaks
     DeleteAllItems();

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

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


@@ -639,7 +672,7 @@ bool wxTreeCtrl::DoGetItem(wxTreeViewItem* tvItem) const
 {
     if ( !TreeView_GetItem(GetHwnd(), tvItem) )
     {
 {
     if ( !TreeView_GetItem(GetHwnd(), tvItem) )
     {

-        wxLogLastError("TreeView_GetItem");
+        wxLogLastError(wxT("TreeView_GetItem"));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -651,7 +684,7 @@ void wxTreeCtrl::DoSetItem(wxTreeViewItem* tvItem)
 {
     if ( TreeView_SetItem(GetHwnd(), tvItem) == -1 )
     {
 {
     if ( TreeView_SetItem(GetHwnd(), tvItem) == -1 )
     {

-        wxLogLastError("TreeView_SetItem");
+        wxLogLastError(wxT("TreeView_SetItem"));

     }
 }
 
     }
 }
 


@@ -690,12 +723,28 @@ void wxTreeCtrl::SetAnyImageList(wxImageList *imageList, int which)
 
 void wxTreeCtrl::SetImageList(wxImageList *imageList)
 {
 
 void wxTreeCtrl::SetImageList(wxImageList *imageList)
 {

+    if (m_ownsImageListNormal) delete m_imageListNormal;

     SetAnyImageList(m_imageListNormal = imageList, TVSIL_NORMAL);
     SetAnyImageList(m_imageListNormal = imageList, TVSIL_NORMAL);

+    m_ownsImageListNormal = FALSE;

 }
 
 void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
 {
 }
 
 void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
 {

+    if (m_ownsImageListState) delete m_imageListState;

     SetAnyImageList(m_imageListState = imageList, TVSIL_STATE);
     SetAnyImageList(m_imageListState = imageList, TVSIL_STATE);

+    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,
 }
 
 size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item,


@@ -712,20 +761,24 @@ size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item,
 
 bool wxTreeCtrl::SetBackgroundColour(const wxColour &colour)
 {
 
 bool wxTreeCtrl::SetBackgroundColour(const wxColour &colour)
 {

+#if !wxUSE_COMCTL32_SAFELY

     if ( !wxWindowBase::SetBackgroundColour(colour) )
         return FALSE;
 
     SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0, colour.GetPixel());
     if ( !wxWindowBase::SetBackgroundColour(colour) )
         return FALSE;
 
     SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0, colour.GetPixel());

+#endif

 
     return TRUE;
 }
 
 bool wxTreeCtrl::SetForegroundColour(const wxColour &colour)
 {
 
     return TRUE;
 }
 
 bool wxTreeCtrl::SetForegroundColour(const wxColour &colour)
 {

+#if !wxUSE_COMCTL32_SAFELY

     if ( !wxWindowBase::SetForegroundColour(colour) )
         return FALSE;
 
     SendMessage(GetHwnd(), TVM_SETTEXTCOLOR, 0, colour.GetPixel());
     if ( !wxWindowBase::SetForegroundColour(colour) )
         return FALSE;
 
     SendMessage(GetHwnd(), TVM_SETTEXTCOLOR, 0, colour.GetPixel());

+#endif

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -913,6 +966,12 @@ wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
 
 void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
 {
 
 void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
 {

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

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


@@ -1084,7 +1143,7 @@ wxTreeItemId wxTreeCtrl::GetRootItem() const
 
 wxTreeItemId wxTreeCtrl::GetSelection() const
 {
 
 wxTreeItemId wxTreeCtrl::GetSelection() const
 {

-    wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), (WXHTREEITEM)0,
+    wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), (long)(WXHTREEITEM)0,

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


@@ -1147,16 +1206,14 @@ wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
 
 wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 {
 
 wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 {

-    wxASSERT_MSG( IsVisible(item), wxT("The item you call GetNextVisible() "
-                                      "for must be visible itself!"));
+    wxASSERT_MSG( IsVisible(item), wxT("The item you call GetNextVisible() for must be visible itself!"));

 
     return wxTreeItemId((WXHTREEITEM) TreeView_GetNextVisible(GetHwnd(), HITEM(item)));
 }
 
 wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
 {
 
     return wxTreeItemId((WXHTREEITEM) TreeView_GetNextVisible(GetHwnd(), HITEM(item)));
 }
 
 wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
 {

-    wxASSERT_MSG( IsVisible(item), wxT("The item you call GetPrevVisible() "
-                                      "for must be visible itself!"));
+    wxASSERT_MSG( IsVisible(item), wxT("The item you call GetPrevVisible() for must be visible itself!"));

 
     return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevVisible(GetHwnd(), HITEM(item)));
 }
 
     return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevVisible(GetHwnd(), HITEM(item)));
 }


@@ -1203,6 +1260,10 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
                                       int image, int selectedImage,
                                       wxTreeItemData *data)
 {
                                       int image, int selectedImage,
                                       wxTreeItemData *data)
 {

+    wxCHECK_MSG( parent.IsOk() || !TreeView_GetRoot(GetHwnd()),
+                 wxTreeItemId(),
+                 _T("can't have more than one root in the tree") );
+

     TV_INSERTSTRUCT tvIns;
     tvIns.hParent = HITEM(parent);
     tvIns.hInsertAfter = HITEM(hInsertAfter);
     TV_INSERTSTRUCT tvIns;
     tvIns.hParent = HITEM(parent);
     tvIns.hInsertAfter = HITEM(hInsertAfter);


@@ -1220,6 +1281,11 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
         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
     }

+    else
+    {
+        tvIns.item.pszText = NULL;
+        tvIns.item.cchTextMax = 0;
+    }

 
     if ( image != -1 )
     {
 
     if ( image != -1 )
     {


@@ -1250,7 +1316,7 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
     HTREEITEM id = (HTREEITEM) TreeView_InsertItem(GetHwnd(), &tvIns);
     if ( id == 0 )
     {
     HTREEITEM id = (HTREEITEM) TreeView_InsertItem(GetHwnd(), &tvIns);
     if ( id == 0 )
     {

-        wxLogLastError("TreeView_InsertItem");
+        wxLogLastError(wxT("TreeView_InsertItem"));

     }
 
     if ( data != NULL )
     }
 
     if ( data != NULL )


@@ -1276,7 +1342,7 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
                                  int image, int selectedImage,
                                  wxTreeItemData *data)
 {
                                  int image, int selectedImage,
                                  wxTreeItemData *data)
 {

-    return DoInsertItem(wxTreeItemId((WXHTREEITEM) 0), (WXHTREEITEM) 0,
+    return DoInsertItem(wxTreeItemId((long) (WXHTREEITEM) 0), (long)(WXHTREEITEM) 0,

                         text, image, selectedImage, data);
 }
 
                         text, image, selectedImage, data);
 }
 


@@ -1335,7 +1401,7 @@ void wxTreeCtrl::Delete(const wxTreeItemId& item)
 {
     if ( !TreeView_DeleteItem(GetHwnd(), HITEM(item)) )
     {
 {
     if ( !TreeView_DeleteItem(GetHwnd(), HITEM(item)) )
     {

-        wxLogLastError("TreeView_DeleteItem");
+        wxLogLastError(wxT("TreeView_DeleteItem"));

     }
 }
 
     }
 }
 


@@ -1358,7 +1424,7 @@ void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item)
     {
         if ( !TreeView_DeleteItem(GetHwnd(), (HTREEITEM)children[n]) )
         {
     {
         if ( !TreeView_DeleteItem(GetHwnd(), (HTREEITEM)children[n]) )
         {

-            wxLogLastError("TreeView_DeleteItem");
+            wxLogLastError(wxT("TreeView_DeleteItem"));

         }
     }
 }
         }
     }
 }


@@ -1367,7 +1433,7 @@ void wxTreeCtrl::DeleteAllItems()
 {
     if ( !TreeView_DeleteAllItems(GetHwnd()) )
     {
 {
     if ( !TreeView_DeleteAllItems(GetHwnd()) )
     {

-        wxLogLastError("TreeView_DeleteAllItems");
+        wxLogLastError(wxT("TreeView_DeleteAllItems"));

     }
 }
 
     }
 }
 


@@ -1441,7 +1507,7 @@ void wxTreeCtrl::Unselect()
                   wxT("doesn't make sense, may be you want UnselectAll()?") );
 
     // just remove the selection
                   wxT("doesn't make sense, may be you want UnselectAll()?") );
 
     // just remove the selection

-    SelectItem(wxTreeItemId((WXHTREEITEM) 0));
+    SelectItem(wxTreeItemId((long) (WXHTREEITEM) 0));

 }
 
 void wxTreeCtrl::UnselectAll()
 }
 
 void wxTreeCtrl::UnselectAll()


@@ -1492,7 +1558,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item)
         {
             if ( !TreeView_SelectItem(GetHwnd(), HITEM(item)) )
             {
         {
             if ( !TreeView_SelectItem(GetHwnd(), HITEM(item)) )
             {

-                wxLogLastError("TreeView_SelectItem");
+                wxLogLastError(wxT("TreeView_SelectItem"));

             }
             else
             {
             }
             else
             {


@@ -1514,7 +1580,7 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId& item)
 {
     if ( !TreeView_SelectSetFirstVisible(GetHwnd(), HITEM(item)) )
     {
 {
     if ( !TreeView_SelectSetFirstVisible(GetHwnd(), HITEM(item)) )
     {

-        wxLogLastError("TreeView_SelectSetFirstVisible");
+        wxLogLastError(wxT("TreeView_SelectSetFirstVisible"));

     }
 }
 
     }
 }
 


@@ -1545,6 +1611,14 @@ void wxTreeCtrl::DeleteTextCtrl()
 {
     if ( m_textCtrl )
     {
 {
     if ( m_textCtrl )
     {

+        // the HWND corresponding to this control is deleted by the tree
+        // control itself and we don't know when exactly this happens, so check
+        // if the window still exists before calling UnsubclassWin()
+        if ( !::IsWindow(GetHwndOf(m_textCtrl)) )
+        {
+            m_textCtrl->SetHWND(0);
+        }
+

         m_textCtrl->UnsubclassWin();
         m_textCtrl->SetHWND(0);
         delete m_textCtrl;
         m_textCtrl->UnsubclassWin();
         m_textCtrl->SetHWND(0);
         delete m_textCtrl;


@@ -1569,6 +1643,7 @@ wxTextCtrl* wxTreeCtrl::EditLabel(const wxTreeItemId& item,
     }
 
     m_textCtrl = (wxTextCtrl *)textControlClass->CreateObject();
     }
 
     m_textCtrl = (wxTextCtrl *)textControlClass->CreateObject();

+    m_textCtrl->SetParent(this);

     m_textCtrl->SetHWND((WXHWND)hWnd);
     m_textCtrl->SubclassWin((WXHWND)hWnd);
 
     m_textCtrl->SetHWND((WXHWND)hWnd);
     m_textCtrl->SubclassWin((WXHWND)hWnd);
 


@@ -1576,7 +1651,7 @@ 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& item, bool discardChanges)
+void wxTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), bool discardChanges)

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


@@ -1778,14 +1853,14 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             case WM_MOUSEMOVE:
                 if ( m_dragImage )
                 {
             case WM_MOUSEMOVE:
                 if ( m_dragImage )
                 {

-                    m_dragImage->Move(wxPoint(x, y), this);
+                    m_dragImage->Move(wxPoint(x, y));

                     if ( htItem )
                     {
                         // highlight the item as target (hiding drag image is
                         // necessary - otherwise the display will be corrupted)
                     if ( htItem )
                     {
                         // highlight the item as target (hiding drag image is
                         // necessary - otherwise the display will be corrupted)

-                        m_dragImage->Hide(this);
+                        m_dragImage->Hide();

                         TreeView_SelectDropTarget(GetHwnd(), htItem);
                         TreeView_SelectDropTarget(GetHwnd(), htItem);

-                        m_dragImage->Show(this);
+                        m_dragImage->Show();

                     }
                 }
                 break;
                     }
                 }
                 break;


@@ -1794,7 +1869,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             case WM_RBUTTONUP:
                 if ( m_dragImage )
                 {
             case WM_RBUTTONUP:
                 if ( m_dragImage )
                 {

-                    m_dragImage->EndDrag(this);
+                    m_dragImage->EndDrag();

                     delete m_dragImage;
                     m_dragImage = NULL;
 
                     delete m_dragImage;
                     m_dragImage = NULL;
 


@@ -1842,7 +1917,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
         // we handle.arrows and space, but not page up/down and home/end: the
         // latter should be easy, but not the former
 
         // we handle.arrows and space, but not page up/down and home/end: the
         // latter should be easy, but not the former
 

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

         if ( !m_htSelStart )
         {
             m_htSelStart = (WXHTREEITEM)htSel;
         if ( !m_htSelStart )
         {
             m_htSelStart = (WXHTREEITEM)htSel;


@@ -1875,9 +1950,9 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             {
                 (void)wxControl::MSWWindowProc(nMsg, wParam, lParam);
 
             {
                 (void)wxControl::MSWWindowProc(nMsg, wParam, lParam);
 

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

 
                 if ( !htNext )
                 {
 
                 if ( !htNext )
                 {


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

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

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


@@ -2030,8 +2086,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                         break;
 
                     default:
                         break;
 
                     default:

-                        wxLogDebug(wxT("unexpected code %d in TVN_ITEMEXPAND "
-                                      "message"), tv->action);
+                        wxLogDebug(wxT("unexpected code %d in TVN_ITEMEXPAND message"), tv->action);

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


@@ -2083,7 +2138,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             }
             break;
 
             }
             break;
 

-#if defined(_WIN32_IE) && _WIN32_IE >= 0x300
+#if defined(_WIN32_IE) && _WIN32_IE >= 0x300 && !wxUSE_COMCTL32_SAFELY && !defined(__GNUWIN32__)

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


@@ -2177,9 +2232,33 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                         return TRUE;
                 }
             }
                         return TRUE;
                 }
             }

-            break;
+//            break;  // can never be reached

 #endif // _WIN32_IE >= 0x300
 
 #endif // _WIN32_IE >= 0x300
 

+        case NM_DBLCLK:
+        case NM_RCLICK:
+            {
+                TV_HITTESTINFO tvhti;
+                ::GetCursorPos(&tvhti.pt);
+                ::ScreenToClient(GetHwnd(), &tvhti.pt);
+                if ( TreeView_HitTest(GetHwnd(), &tvhti) )
+                {
+                    if ( tvhti.flags & TVHT_ONITEM )
+                    {
+                        event.m_item = (WXHTREEITEM) tvhti.hItem;
+                        eventType = (int)hdr->code == NM_DBLCLK
+                                    ? wxEVT_COMMAND_TREE_ITEM_ACTIVATED
+                                    : wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
+
+                        event.m_pointDrag.x = tvhti.pt.x;
+                        event.m_pointDrag.y = tvhti.pt.y;
+                    }
+
+                    break;
+                }
+            }
+            // fall through
+

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


@@ -2192,6 +2271,14 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     // post processing
     switch ( hdr->code )
     {
     // post processing
     switch ( hdr->code )
     {

+        case NM_DBLCLK:
+            // we translate NM_DBLCLK into ACTIVATED event, so don't interpret
+            // the return code of this event handler as the return value for
+            // NM_DBLCLK - otherwise, double clicking the item to toggle its
+            // expanded status would never work
+            *result = FALSE;
+            break;
+

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


@@ -2202,7 +2289,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
                 m_dragImage = new wxDragImage(*this, event.m_item);
                 m_dragImage->BeginDrag(wxPoint(0, 0), this);
 
                 m_dragImage = new wxDragImage(*this, event.m_item);
                 m_dragImage->BeginDrag(wxPoint(0, 0), this);

-                m_dragImage->Show(this);
+                m_dragImage->Show();

             }
             break;
 
             }
             break;
 


@@ -2222,6 +2309,11 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     delete data; // can't be NULL here
 
                     m_itemsWithIndirectData.Remove(item);
                     delete data; // can't be NULL here
 
                     m_itemsWithIndirectData.Remove(item);

+#if 0
+                    int iIndex = m_itemsWithIndirectData.Index(item);
+                    wxASSERT( iIndex != wxNOT_FOUND) ;
+                    m_itemsWithIndirectData.wxBaseArray::RemoveAt((size_t)iIndex);
+#endif

                 }
                 else
                 {
                 }
                 else
                 {


@@ -2239,8 +2331,12 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             break;
 
         case TVN_ENDLABELEDIT:
             break;
 
         case TVN_ENDLABELEDIT:

-            // return TRUE to set the label to the new string
+            // return TRUE to set the label to the new string: note that we
+            // also must pretend that we did process the message or it is going
+            // to be passed to DefWindowProc() which will happily return FALSE
+            // cancelling the label change

             *result = event.IsAllowed();
             *result = event.IsAllowed();

+            processed = TRUE;

 
             // ensure that we don't have the text ctrl which is going to be
             // deleted any more
 
             // ensure that we don't have the text ctrl which is going to be
             // deleted any more


@@ -2256,7 +2352,7 @@ 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 && */ 1 )

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


@@ -2280,7 +2376,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                                           : wxTreeItemIcon_Selected
                         );
                 }
                                           : wxTreeItemIcon_Selected
                         );
                 }

-            }
+                       }

             break;
 
         //default:
             break;
 
         //default:


@@ -2291,18 +2387,6 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     return processed;
 }
 
     return processed;
 }
 

-// ----------------------------------------------------------------------------
-// Tree event
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)
-
-wxTreeEvent::wxTreeEvent(wxEventType commandType, int id)
-           : wxNotifyEvent(commandType, id)
-{
-    m_code = 0;
-    m_itemOld = 0;
-}
-

 #endif // __WIN95__
 
 #endif // __WIN95__
 

+#endif // wxUSE_TREECTRL