Fixed Windows DLL link problems with wxHtmlProcessor

[wxWidgets.git] / include / wx / generic / treectlg.h

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index 1bc9bd11032d2edd01d2a2fefc276b6f76efb332..2165e9c18ed30e2915ec780c9e948f12547747be 100644 (file)
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -87,9 +87,11 @@ public:
     void SetSpacing(unsigned int spacing);
 
         // image list: these functions allow to associate an image list with
     void SetSpacing(unsigned int spacing);
 
         // image list: these functions allow to associate an image list with

-        // the control and retrieve it. Note that the control does _not_ delete
+        // the control and retrieve it. Note that when assigned with 
+        // SetImageList, the control does _not_ delete

         // the associated image list when it's deleted in order to allow image
         // the associated image list when it's deleted in order to allow image

-        // lists to be shared between different controls.
+        // lists to be shared between different controls. If you use 
+        // AssignImageList, the control _does_ delete the image list.

         //
         // The normal image list is for the icons which correspond to the
         // normal tree item state (whether it is selected or not).
         //
         // The normal image list is for the icons which correspond to the
         // normal tree item state (whether it is selected or not).


@@ -101,6 +103,8 @@ public:
 
     void SetImageList(wxImageList *imageList);
     void SetStateImageList(wxImageList *imageList);
 
     void SetImageList(wxImageList *imageList);
     void SetStateImageList(wxImageList *imageList);

+    void AssignImageList(wxImageList *imageList);
+    void AssignStateImageList(wxImageList *imageList);

 
     // Functions to work with tree ctrl items.
 
 
     // Functions to work with tree ctrl items.
 


@@ -144,6 +148,9 @@ public:
         // set the items font (should be of the same height for all items)
     void SetItemFont(const wxTreeItemId& item, const wxFont& font);
 
         // set the items font (should be of the same height for all items)
     void SetItemFont(const wxTreeItemId& item, const wxFont& font);
 

+        // set the window font
+    virtual bool SetFont( const wxFont &font );
+

     // item status inquiries
     // ---------------------
 
     // item status inquiries
     // ---------------------
 


@@ -353,6 +360,8 @@ protected:
     wxBrush             *m_hilightBrush;
     wxImageList         *m_imageListNormal,
                         *m_imageListState;
     wxBrush             *m_hilightBrush;
     wxImageList         *m_imageListNormal,
                         *m_imageListState;

+    bool                 m_ownsImageListNormal, 
+                         m_ownsImageListState;

 
     int                  m_dragCount;
     wxPoint              m_dragStart;
 
     int                  m_dragCount;
     wxPoint              m_dragStart;