fixed false alert in wxRegKey::DeleteSelf

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

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index e9a1973d8b2acb80ffd0f2702a73890b9b279fe0..01072caca3c3c063db6b535915f1014d6a950aa7 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -178,10 +178,10 @@ public:
 
     // status inquiries
     bool HasChildren() const { return !m_children.IsEmpty(); }
 
     // status inquiries
     bool HasChildren() const { return !m_children.IsEmpty(); }

-    bool IsSelected()  const { return m_hasHilight; }
+    bool IsSelected()  const { return m_hasHilight != 0; }

     bool IsExpanded()  const { return !m_isCollapsed; }
     bool HasPlus()     const { return m_hasPlus || HasChildren(); }
     bool IsExpanded()  const { return !m_isCollapsed; }
     bool HasPlus()     const { return m_hasPlus || HasChildren(); }

-    bool IsBold()      const { return m_isBold; }
+    bool IsBold()      const { return m_isBold != 0; }

 
     // attributes
         // get them - may be NULL
 
     // attributes
         // get them - may be NULL


@@ -615,6 +615,8 @@ void wxGenericTreeCtrl::Init()
 
     m_imageListNormal =
     m_imageListState = (wxImageList *) NULL;
 
     m_imageListNormal =
     m_imageListState = (wxImageList *) NULL;

+    m_ownsImageListNormal = 
+    m_ownsImageListState = FALSE;

 
     m_dragCount = 0;
     m_isDragging = FALSE;
 
     m_dragCount = 0;
     m_isDragging = FALSE;


@@ -658,6 +660,8 @@ wxGenericTreeCtrl::~wxGenericTreeCtrl()
     DeleteAllItems();
 
     delete m_renameTimer;
     DeleteAllItems();
 
     delete m_renameTimer;

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

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


@@ -1629,7 +1633,10 @@ wxImageList *wxGenericTreeCtrl::GetStateImageList() const
 
 void wxGenericTreeCtrl::SetImageList(wxImageList *imageList)
 {
 
 void wxGenericTreeCtrl::SetImageList(wxImageList *imageList)
 {

+    if (m_ownsImageListNormal) delete m_imageListNormal;
+

     m_imageListNormal = imageList;
     m_imageListNormal = imageList;

+    m_ownsImageListNormal = FALSE;

 
     if ( !m_imageListNormal )
         return;
 
     if ( !m_imageListNormal )
         return;


@@ -1656,7 +1663,21 @@ void wxGenericTreeCtrl::SetImageList(wxImageList *imageList)
 
 void wxGenericTreeCtrl::SetStateImageList(wxImageList *imageList)
 {
 
 void wxGenericTreeCtrl::SetStateImageList(wxImageList *imageList)
 {

+    if (m_ownsImageListState) delete m_imageListState;

     m_imageListState = imageList;
     m_imageListState = imageList;

+    m_ownsImageListState = FALSE;
+}
+
+void wxGenericTreeCtrl::AssignImageList(wxImageList *imageList)
+{
+    SetImageList(imageList);
+    m_ownsImageListNormal = TRUE;
+}
+
+void wxGenericTreeCtrl::AssignStateImageList(wxImageList *imageList)
+{
+    SetStateImageList(imageList);
+    m_ownsImageListState = TRUE;

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