MSW fixes; added wxUSE_XPM to wxUniv's setup.h so now widgets sample works

[wxWidgets.git] / include / wx / msw / treectrl.h

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index 78c77e07146650eb05d2999d04b83482115ba2ae..f995392953c90f1093051964095db058f7f1c92a 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -20,6 +20,8 @@
     #pragma interface "treectrl.h"
 #endif
 
+#if wxUSE_TREECTRL
+
 #include "wx/textctrl.h"
 #include "wx/dynarray.h"
 #include "wx/treebase.h"
@@ -120,6 +122,8 @@ public:
 
     void SetImageList(wxImageList *imageList);
     void SetStateImageList(wxImageList *imageList);
+    void AssignImageList(wxImageList *imageList);
+    void AssignStateImageList(wxImageList *imageList);
 
     // Functions to work with tree ctrl items. Unfortunately, they can _not_ be
     // member functions of wxTreeItem because they must know the tree the item
@@ -399,6 +403,7 @@ protected:
     wxTextCtrl  *m_textCtrl;        // used while editing the item label
     wxImageList *m_imageListNormal, // images for tree elements
                 *m_imageListState;  // special images for app defined states
+    bool         m_ownsImageListNormal, m_ownsImageListState;
 
 private:
     // the common part of all ctors
@@ -449,5 +454,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
 };
 
+#endif // wxUSE_TREECTRL
+
 #endif
     // _WX_TREECTRL_H_