Merge recent wxPython changes from 2.8 branch to HEAD

[wxWidgets.git] / wxPython / src / _treectrl.i

diff --git a/wxPython/src/_treectrl.i b/wxPython/src/_treectrl.i
index adcac9458b84e02c7edd4a2c1f41209c75359c54..d992e451b68f5fabbb771a2a7483d7ce3032698c 100644 (file)
--- a/wxPython/src/_treectrl.i
+++ b/wxPython/src/_treectrl.i
@@ -344,7 +344,7 @@ MustHaveApp(wxPyTreeCtrl);
 %rename(TreeCtrl) wxPyTreeCtrl;
 class wxPyTreeCtrl : public wxControl {
 public:
 %rename(TreeCtrl) wxPyTreeCtrl;
 class wxPyTreeCtrl : public wxControl {
 public:

-    %pythonAppend wxPyTreeCtrl         "self._setOORInfo(self);self._setCallbackInfo(self, TreeCtrl)"
+    %pythonAppend wxPyTreeCtrl         "self._setOORInfo(self);" setCallbackInfo(TreeCtrl)

     %pythonAppend wxPyTreeCtrl()       ""
     %typemap(out) wxPyTreeCtrl*;    // turn off this typemap
    
     %pythonAppend wxPyTreeCtrl()       ""
     %typemap(out) wxPyTreeCtrl*;    // turn off this typemap
    


@@ -516,6 +516,9 @@ public:
     // is item text in bold font?
     bool IsBold(const wxTreeItemId& item) const;
 
     // is item text in bold font?
     bool IsBold(const wxTreeItemId& item) const;
 

+    // is the control empty?
+    bool IsEmpty() const;
+    

 
     // if 'recursively' is False, only immediate children count, otherwise
     // the returned number is the number of all items in this branch
 
     // if 'recursively' is False, only immediate children count, otherwise
     // the returned number is the number of all items in this branch


@@ -673,6 +676,12 @@ public:
     // collapse the item without removing its children
     void Collapse(const wxTreeItemId& item);
 
     // collapse the item without removing its children
     void Collapse(const wxTreeItemId& item);
 

+    // collapse the item and all its childs and thats childs
+    void CollapseAllChildren(const wxTreeItemId& item);
+
+    // collapse all items
+    void CollapseAll();
+    

     // collapse the item and remove all children
     void CollapseAndReset(const wxTreeItemId& item);
 
     // collapse the item and remove all children
     void CollapseAndReset(const wxTreeItemId& item);