OS/2 updates for statusbar processing

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

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 80a45175271bb7e603719e052f1b3594eee6768b..84ec966ceaabf2a26368268c011a037a96367c38 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -497,6 +497,7 @@ 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;


@@ -641,6 +642,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;

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


@@ -704,12 +708,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,