reSWIGged

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

diff --git a/wxPython/src/_treectrl.i b/wxPython/src/_treectrl.i
index d71dc7bb890ed67cd4efa228d25099a838cb8686..4248e589e7909e3c936cc7e07102ae580778adbd 100644 (file)
--- a/wxPython/src/_treectrl.i
+++ b/wxPython/src/_treectrl.i
@@ -46,10 +46,13 @@ enum {
     wxTR_DEFAULT_STYLE,
 
     wxTR_TWIST_BUTTONS,
     wxTR_DEFAULT_STYLE,
 
     wxTR_TWIST_BUTTONS,

-    wxTR_MAC_BUTTONS,
-    wxTR_AQUA_BUTTONS,

 };
 
 };
 

+%pythoncode {
+    %# obsolete
+    TR_MAC_BUTTONS = 0
+    wxTR_AQUA_BUTTONS = 0
+}

 
 enum wxTreeItemIcon
 {
 
 enum wxTreeItemIcon
 {


@@ -121,13 +124,15 @@ public:
 class wxPyTreeItemData {
 public:
     wxPyTreeItemData(PyObject* obj = NULL);
 class wxPyTreeItemData {
 public:
     wxPyTreeItemData(PyObject* obj = NULL);

-
+    ~wxPyTreeItemData();
+    

     PyObject* GetData();
     void      SetData(PyObject* obj);
 
     const wxTreeItemId& GetId();
     void                SetId(const wxTreeItemId& id);
 
     PyObject* GetData();
     void      SetData(PyObject* obj);
 
     const wxTreeItemId& GetId();
     void                SetId(const wxTreeItemId& id);
 

+    %pythonAppend Destroy "args[0].thisown = 0"

     %extend { void Destroy() { delete self; } }
 };
 
     %extend { void Destroy() { delete self; } }
 };
 


@@ -144,7 +149,8 @@ public:
     wxTreeItemAttr(const wxColour& colText = wxNullColour,
                    const wxColour& colBack = wxNullColour,
                    const wxFont& font = wxNullFont);
     wxTreeItemAttr(const wxColour& colText = wxNullColour,
                    const wxColour& colBack = wxNullColour,
                    const wxFont& font = wxNullFont);

-
+    ~wxTreeItemAttr();
+    

     // setters
     void SetTextColour(const wxColour& colText);
     void SetBackgroundColour(const wxColour& colBack);
     // setters
     void SetTextColour(const wxColour& colText);
     void SetBackgroundColour(const wxColour& colBack);


@@ -159,6 +165,7 @@ public:
     wxColour GetBackgroundColour();
     wxFont GetFont();
 
     wxColour GetBackgroundColour();
     wxFont GetFont();
 

+    %pythonAppend Destroy "args[0].thisown = 0"

     %extend { void Destroy() { delete self; } }
 };
 
     %extend { void Destroy() { delete self; } }
 };
 


@@ -192,7 +199,6 @@ public:
 %constant wxEventType wxEVT_COMMAND_TREE_ITEM_MENU;
 
 %pythoncode {
 %constant wxEventType wxEVT_COMMAND_TREE_ITEM_MENU;
 
 %pythoncode {

-

 EVT_TREE_BEGIN_DRAG        = wx.PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_DRAG       , 1)
 EVT_TREE_BEGIN_RDRAG       = wx.PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_RDRAG      , 1)
 EVT_TREE_BEGIN_LABEL_EDIT  = wx.PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT , 1)
 EVT_TREE_BEGIN_DRAG        = wx.PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_DRAG       , 1)
 EVT_TREE_BEGIN_RDRAG       = wx.PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_RDRAG      , 1)
 EVT_TREE_BEGIN_LABEL_EDIT  = wx.PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT , 1)


@@ -213,10 +219,15 @@ EVT_TREE_ITEM_MIDDLE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLI
 EVT_TREE_END_DRAG          = wx.PyEventBinder(wxEVT_COMMAND_TREE_END_DRAG         , 1)
 EVT_TREE_STATE_IMAGE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 1)
 EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP,   1)
 EVT_TREE_END_DRAG          = wx.PyEventBinder(wxEVT_COMMAND_TREE_END_DRAG         , 1)
 EVT_TREE_STATE_IMAGE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 1)
 EVT_TREE_ITEM_GETTOOLTIP   = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP,   1)

-EVT_COMMAND_TREE_ITEM_MENU = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MENU,         1)    
+EVT_TREE_ITEM_MENU         = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MENU,         1)

 }
 
 
 }
 
 

+%{
+    static wxTreeItemId wxNullTreeItemId;
+%}
+wxTreeItemId wxNullTreeItemId;
+

 
 // wxTreeEvent is a special class for all events associated with tree controls
 //
 
 // wxTreeEvent is a special class for all events associated with tree controls
 //


@@ -224,7 +235,11 @@ EVT_COMMAND_TREE_ITEM_MENU = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MENU,
 //     descriptions below
 class wxTreeEvent : public wxNotifyEvent {
 public:
 //     descriptions below
 class wxTreeEvent : public wxNotifyEvent {
 public:

+    %nokwargs wxTreeEvent;

     wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
     wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);

+    wxTreeEvent(wxEventType   commandType,
+                wxPyTreeCtrl* tree,
+                wxTreeItemId& item = wxNullTreeItemId);

 
         // get the item on which the operation was performed or the newly
         // selected item for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events
 
         // get the item on which the operation was performed or the newly
         // selected item for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events


@@ -264,7 +279,7 @@ public:
 
 %{ // C++ version of Python aware wxTreeCtrl
 class wxPyTreeCtrl : public wxTreeCtrl {
 
 %{ // C++ version of Python aware wxTreeCtrl
 class wxPyTreeCtrl : public wxTreeCtrl {

-    DECLARE_ABSTRACT_CLASS(wxPyTreeCtrl);
+    DECLARE_ABSTRACT_CLASS(wxPyTreeCtrl)

 public:
     wxPyTreeCtrl() : wxTreeCtrl() {}
     wxPyTreeCtrl(wxWindow *parent, wxWindowID id,
 public:
     wxPyTreeCtrl() : wxTreeCtrl() {}
     wxPyTreeCtrl(wxWindow *parent, wxWindowID id,


@@ -343,7 +358,7 @@ public:
 
     
     // get the total number of items in the control
 
     
     // get the total number of items in the control

-    size_t GetCount() const;
+    unsigned int GetCount() const;

 
     // indent is the number of pixels the children are indented relative to
     // the parents position. SetIndent() also redraws the control
 
     // indent is the number of pixels the children are indented relative to
     // the parents position. SetIndent() also redraws the control


@@ -373,10 +388,10 @@ public:
     void SetImageList(wxImageList *imageList);
     void SetStateImageList(wxImageList *imageList);
 
     void SetImageList(wxImageList *imageList);
     void SetStateImageList(wxImageList *imageList);
 

-    %apply SWIGTYPE *DISOWN { wxImageList *imageList };
+    %disownarg( wxImageList *imageList );

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

-    %clear wxImageList *imageList;
+    %cleardisown( wxImageList *imageList );

     
 
     // retrieve items label
     
 
     // retrieve items label


@@ -431,10 +446,12 @@ public:
 
     %extend {
         // associate a wxPyTreeItemData with the tree item
 
     %extend {
         // associate a wxPyTreeItemData with the tree item

+        %disownarg( wxPyTreeItemData* data );

         void SetItemData(const wxTreeItemId& item, wxPyTreeItemData* data) {
             data->SetId(item); // set the id
             self->SetItemData(item, data);
         }
         void SetItemData(const wxTreeItemId& item, wxPyTreeItemData* data) {
             data->SetId(item); // set the id
             self->SetItemData(item, data);
         }

+        %cleardisown( wxPyTreeItemData* data );

 
         // associate a Python object with the tree item
         void SetItemPyData(const wxTreeItemId& item, PyObject* obj) {
 
         // associate a Python object with the tree item
         void SetItemPyData(const wxTreeItemId& item, PyObject* obj) {


@@ -583,6 +600,7 @@ public:
     wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const;
 
     
     wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const;
 
     

+    %disownarg( wxPyTreeItemData* data );

     
     // add the root node to the tree
     wxTreeItemId AddRoot(const wxString& text,
     
     // add the root node to the tree
     wxTreeItemId AddRoot(const wxString& text,


@@ -617,7 +635,8 @@ public:
                             wxPyTreeItemData *data = NULL);
 
 
                             wxPyTreeItemData *data = NULL);
 
 

-
+    %cleardisown( wxPyTreeItemData* data );
+    

     // delete this item and associated data if any
     void Delete(const wxTreeItemId& item);
 
     // delete this item and associated data if any
     void Delete(const wxTreeItemId& item);
 


@@ -633,6 +652,12 @@ public:
     // expand this item
     void Expand(const wxTreeItemId& item);
 
     // expand this item
     void Expand(const wxTreeItemId& item);
 

+    // expand the item and all its childs and thats childs
+    void ExpandAllChildren(const wxTreeItemId& item);
+
+    // expand all items
+    void ExpandAll();
+   

     // collapse the item without removing its children
     void Collapse(const wxTreeItemId& item);
 
     // collapse the item without removing its children
     void Collapse(const wxTreeItemId& item);
 


@@ -726,6 +751,10 @@ value is set to a bitmask of wxTREE_HITTEST_xxx constants.
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

+
+    void SetQuickBestSize(bool q);
+    bool GetQuickBestSize() const;
+

 };
 
 
 };