update for bakefile 0.2.6

[wxWidgets.git] / interface / wx / treebase.h

diff --git a/interface/wx/treebase.h b/interface/wx/treebase.h
index 84ffd78598027b862e1c26260ffd45f82475f588..e9eaf7da5d6bef9d45db4980749828dcb576f79f 100644 (file)
--- a/interface/wx/treebase.h
+++ b/interface/wx/treebase.h
@@ -8,12 +8,11 @@
 
 /**
     @class wxTreeItemId
 
 /**
     @class wxTreeItemId

-    @wxheader{treebase.h}

 
     An opaque reference to a tree item.
 
     @library{wxcore}
 
     An opaque reference to a tree item.
 
     @library{wxcore}

-    @category{misc}
+    @category{data}

 
     @see wxTreeCtrl, wxTreeItemData, @ref overview_treectrl
 */
 
     @see wxTreeCtrl, wxTreeItemData, @ref overview_treectrl
 */


@@ -48,7 +47,6 @@ public:
 
 /**
     @class wxTreeItemData
 
 /**
     @class wxTreeItemData

-    @wxheader{treebase.h}

 
     wxTreeItemData is some (arbitrary) user class associated with some item. The
     main advantage of having this class is that wxTreeItemData objects are
 
     wxTreeItemData is some (arbitrary) user class associated with some item. The
     main advantage of having this class is that wxTreeItemData objects are


@@ -85,22 +83,28 @@ public:
     /**
         Virtual destructor.
     */
     /**
         Virtual destructor.
     */

-    ~wxTreeItemData();
+    virtual ~wxTreeItemData();

 
     /**
         Returns the item associated with this node.
     */
 
     /**
         Returns the item associated with this node.
     */

-    const wxTreeItemId GetId();
+    const wxTreeItemId& GetId() const;

 
     /**
         Sets the item associated with this node.
 
     /**
         Sets the item associated with this node.

+
+        Notice that this function is automatically called by wxTreeCtrl methods
+        associating an object of this class with a tree control item such as
+        wxTreeCtrl::AppendItem(), wxTreeCtrl::InsertItem() and
+        wxTreeCtrl::SetItemData() so there is usually no need to call it
+        yourself.

     */
     void SetId(const wxTreeItemId& id);
 };
 
 /**
     Indicates which type to associate an image with a wxTreeCtrl item.
     */
     void SetId(const wxTreeItemId& id);
 };
 
 /**
     Indicates which type to associate an image with a wxTreeCtrl item.

-    
+

     @see wxTreeCtrl::GetItemImage(), wxTreeCtrl::SetItemImage()
 */
 enum wxTreeItemIcon
     @see wxTreeCtrl::GetItemImage(), wxTreeCtrl::SetItemImage()
 */
 enum wxTreeItemIcon