wxGetUserHome() returns "const wxMB2WXbuf" for Unix in Unicode build.

[wxWidgets.git] / utils / wxPython / src / msw / controls2.py

diff --git a/utils/wxPython/src/msw/controls2.py b/utils/wxPython/src/msw/controls2.py
index 10d0a29cc490abf023d2f4bfaca9fc7451e7ad04..d8fea80238f25bb6081ddbb8d6f1d27f7cb5c2ac 100644 (file)
--- a/utils/wxPython/src/msw/controls2.py
+++ b/utils/wxPython/src/msw/controls2.py
@@ -10,6 +10,7 @@ from gdi import *
 from events import *
 
 from controls import *
 from events import *
 
 from controls import *

+import wx

 class wxListItemPtr :
     def __init__(self,this):
         self.this = this
 class wxListItemPtr :
     def __init__(self,this):
         self.this = this


@@ -162,6 +163,10 @@ class wxListCtrlPtr(wxControlPtr):
     def EndEditLabel(self,arg0):
         val = controls2c.wxListCtrl_EndEditLabel(self.this,arg0)
         return val
     def EndEditLabel(self,arg0):
         val = controls2c.wxListCtrl_EndEditLabel(self.this,arg0)
         return val

+    def GetEditControl(self):
+        val = controls2c.wxListCtrl_GetEditControl(self.this)
+        val = wxTextCtrlPtr(val)
+        return val

     def EnsureVisible(self,arg0):
         val = controls2c.wxListCtrl_EnsureVisible(self.this,arg0)
         return val
     def EnsureVisible(self,arg0):
         val = controls2c.wxListCtrl_EnsureVisible(self.this,arg0)
         return val


@@ -185,12 +190,13 @@ class wxListCtrlPtr(wxControlPtr):
         return val
     def GetImageList(self,arg0):
         val = controls2c.wxListCtrl_GetImageList(self.this,arg0)
         return val
     def GetImageList(self,arg0):
         val = controls2c.wxListCtrl_GetImageList(self.this,arg0)

+        val = wxImageListPtr(val)

         return val
     def GetItemData(self,arg0):
         val = controls2c.wxListCtrl_GetItemData(self.this,arg0)
         return val
         return val
     def GetItemData(self,arg0):
         val = controls2c.wxListCtrl_GetItemData(self.this,arg0)
         return val

-    def GetItem(self):
-        val = controls2c.wxListCtrl_GetItem(self.this)
+    def GetItem(self,arg0):
+        val = controls2c.wxListCtrl_GetItem(self.this,arg0)

         val = wxListItemPtr(val)
         val.thisown = 1
         return val
         val = wxListItemPtr(val)
         val.thisown = 1
         return val


@@ -227,14 +233,17 @@ class wxListCtrlPtr(wxControlPtr):
         val = wxColourPtr(val)
         val.thisown = 1
         return val
         val = wxColourPtr(val)
         val.thisown = 1
         return val

+    def SetTextColour(self,arg0):
+        val = controls2c.wxListCtrl_SetTextColour(self.this,arg0.this)
+        return val

     def GetTopItem(self):
         val = controls2c.wxListCtrl_GetTopItem(self.this)
         return val
     def HitTest(self,arg0):
         val = controls2c.wxListCtrl_HitTest(self.this,arg0.this)
         return val
     def GetTopItem(self):
         val = controls2c.wxListCtrl_GetTopItem(self.this)
         return val
     def HitTest(self,arg0):
         val = controls2c.wxListCtrl_HitTest(self.this,arg0.this)
         return val

-    def InsertColumnWithInfo(self,arg0,arg1):
-        val = controls2c.wxListCtrl_InsertColumnWithInfo(self.this,arg0,arg1.this)
+    def InsertColumnWith(self,arg0,arg1):
+        val = controls2c.wxListCtrl_InsertColumnWith(self.this,arg0,arg1.this)

         return val
     def InsertColumn(self,arg0,arg1,*args):
         val = apply(controls2c.wxListCtrl_InsertColumn,(self.this,arg0,arg1,)+args)
         return val
     def InsertColumn(self,arg0,arg1,*args):
         val = apply(controls2c.wxListCtrl_InsertColumn,(self.this,arg0,arg1,)+args)


@@ -264,13 +273,13 @@ class wxListCtrlPtr(wxControlPtr):
         val = controls2c.wxListCtrl_SetColumnWidth(self.this,arg0,arg1)
         return val
     def SetImageList(self,arg0,arg1):
         val = controls2c.wxListCtrl_SetColumnWidth(self.this,arg0,arg1)
         return val
     def SetImageList(self,arg0,arg1):

-        val = controls2c.wxListCtrl_SetImageList(self.this,arg0,arg1)
+        val = controls2c.wxListCtrl_SetImageList(self.this,arg0.this,arg1)

         return val
     def SetItem(self,arg0):
         val = controls2c.wxListCtrl_SetItem(self.this,arg0.this)
         return val
         return val
     def SetItem(self,arg0):
         val = controls2c.wxListCtrl_SetItem(self.this,arg0.this)
         return val

-    def SetItemString(self,arg0,arg1,arg2,*args):
-        val = apply(controls2c.wxListCtrl_SetItemString,(self.this,arg0,arg1,arg2,)+args)
+    def SetStringItem(self,arg0,arg1,arg2,*args):
+        val = apply(controls2c.wxListCtrl_SetStringItem,(self.this,arg0,arg1,arg2,)+args)

         return val
     def SetItemData(self,arg0,arg1):
         val = controls2c.wxListCtrl_SetItemData(self.this,arg0,arg1)
         return val
     def SetItemData(self,arg0,arg1):
         val = controls2c.wxListCtrl_SetItemData(self.this,arg0,arg1)


@@ -290,9 +299,6 @@ class wxListCtrlPtr(wxControlPtr):
     def SetSingleStyle(self,arg0,*args):
         val = apply(controls2c.wxListCtrl_SetSingleStyle,(self.this,arg0,)+args)
         return val
     def SetSingleStyle(self,arg0,*args):
         val = apply(controls2c.wxListCtrl_SetSingleStyle,(self.this,arg0,)+args)
         return val

-    def SetTextColour(self,arg0):
-        val = controls2c.wxListCtrl_SetTextColour(self.this,arg0.this)
-        return val

     def SetWindowStyleFlag(self,arg0):
         val = controls2c.wxListCtrl_SetWindowStyleFlag(self.this,arg0)
         return val
     def SetWindowStyleFlag(self,arg0):
         val = controls2c.wxListCtrl_SetWindowStyleFlag(self.this,arg0)
         return val


@@ -308,71 +314,50 @@ class wxListCtrl(wxListCtrlPtr):
         args = tuple(argl)
         self.this = apply(controls2c.new_wxListCtrl,(arg0.this,arg1,)+args)
         self.thisown = 1
         args = tuple(argl)
         self.this = apply(controls2c.new_wxListCtrl,(arg0.this,arg1,)+args)
         self.thisown = 1

+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 
 
 

-class wxTreeItemPtr :
+class wxTreeItemIdPtr :

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __del__(self):
         if self.thisown == 1 :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __del__(self):
         if self.thisown == 1 :

-            controls2c.delete_wxTreeItem(self.this)
-    def __setattr__(self,name,value):
-        if name == "m_mask" :
-            controls2c.wxTreeItem_m_mask_set(self.this,value)
-            return
-        if name == "m_itemId" :
-            controls2c.wxTreeItem_m_itemId_set(self.this,value)
-            return
-        if name == "m_state" :
-            controls2c.wxTreeItem_m_state_set(self.this,value)
-            return
-        if name == "m_stateMask" :
-            controls2c.wxTreeItem_m_stateMask_set(self.this,value)
-            return
-        if name == "m_text" :
-            controls2c.wxTreeItem_m_text_set(self.this,value)
-            return
-        if name == "m_image" :
-            controls2c.wxTreeItem_m_image_set(self.this,value)
-            return
-        if name == "m_selectedImage" :
-            controls2c.wxTreeItem_m_selectedImage_set(self.this,value)
-            return
-        if name == "m_children" :
-            controls2c.wxTreeItem_m_children_set(self.this,value)
-            return
-        if name == "m_data" :
-            controls2c.wxTreeItem_m_data_set(self.this,value)
-            return
-        self.__dict__[name] = value
-    def __getattr__(self,name):
-        if name == "m_mask" : 
-            return controls2c.wxTreeItem_m_mask_get(self.this)
-        if name == "m_itemId" : 
-            return controls2c.wxTreeItem_m_itemId_get(self.this)
-        if name == "m_state" : 
-            return controls2c.wxTreeItem_m_state_get(self.this)
-        if name == "m_stateMask" : 
-            return controls2c.wxTreeItem_m_stateMask_get(self.this)
-        if name == "m_text" : 
-            return controls2c.wxTreeItem_m_text_get(self.this)
-        if name == "m_image" : 
-            return controls2c.wxTreeItem_m_image_get(self.this)
-        if name == "m_selectedImage" : 
-            return controls2c.wxTreeItem_m_selectedImage_get(self.this)
-        if name == "m_children" : 
-            return controls2c.wxTreeItem_m_children_get(self.this)
-        if name == "m_data" : 
-            return controls2c.wxTreeItem_m_data_get(self.this)
-        raise AttributeError,name
+            controls2c.delete_wxTreeItemId(self.this)
+    def IsOk(self):
+        val = controls2c.wxTreeItemId_IsOk(self.this)
+        return val

     def __repr__(self):
     def __repr__(self):

-        return "<C wxTreeItem instance>"
-class wxTreeItem(wxTreeItemPtr):
+        return "<C wxTreeItemId instance>"
+class wxTreeItemId(wxTreeItemIdPtr):

     def __init__(self) :
     def __init__(self) :

-        self.this = controls2c.new_wxTreeItem()
+        self.this = controls2c.new_wxTreeItemId()
+        self.thisown = 1
+
+
+
+
+class wxTreeItemDataPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self):
+        if self.thisown == 1 :
+            controls2c.delete_wxTreeItemData(self.this)
+    def GetId(self):
+        val = controls2c.wxTreeItemData_GetId(self.this)
+        val = wxTreeItemIdPtr(val)
+        return val
+    def SetId(self,arg0):
+        val = controls2c.wxTreeItemData_SetId(self.this,arg0.this)
+        return val
+    def __repr__(self):
+        return "<C wxTreeItemData instance>"
+class wxTreeItemData(wxTreeItemDataPtr):
+    def __init__(self) :
+        self.this = controls2c.new_wxTreeItemData()

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -382,30 +367,27 @@ class wxTreeEventPtr(wxCommandEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __setattr__(self,name,value):
-        if name == "m_code" :
-            controls2c.wxTreeEvent_m_code_set(self.this,value)
-            return
-        if name == "m_item" :
-            controls2c.wxTreeEvent_m_item_set(self.this,value.this)
-            return
-        if name == "m_oldItem" :
-            controls2c.wxTreeEvent_m_oldItem_set(self.this,value)
-            return
-        if name == "m_pointDrag" :
-            controls2c.wxTreeEvent_m_pointDrag_set(self.this,value.this)
-            return
-        self.__dict__[name] = value
-    def __getattr__(self,name):
-        if name == "m_code" : 
-            return controls2c.wxTreeEvent_m_code_get(self.this)
-        if name == "m_item" : 
-            return wxTreeItemPtr(controls2c.wxTreeEvent_m_item_get(self.this))
-        if name == "m_oldItem" : 
-            return controls2c.wxTreeEvent_m_oldItem_get(self.this)
-        if name == "m_pointDrag" : 
-            return wxPointPtr(controls2c.wxTreeEvent_m_pointDrag_get(self.this))
-        raise AttributeError,name
+    def GetItem(self):
+        val = controls2c.wxTreeEvent_GetItem(self.this)
+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1
+        return val
+    def GetOldItem(self):
+        val = controls2c.wxTreeEvent_GetOldItem(self.this)
+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1
+        return val
+    def GetPoint(self):
+        val = controls2c.wxTreeEvent_GetPoint(self.this)
+        val = wxPointPtr(val)
+        val.thisown = 1
+        return val
+    def GetCode(self):
+        val = controls2c.wxTreeEvent_GetCode(self.this)
+        return val
+    def Veto(self):
+        val = controls2c.wxTreeEvent_Veto(self.this)
+        return val

     def __repr__(self):
         return "<C wxTreeEvent instance>"
 class wxTreeEvent(wxTreeEventPtr):
     def __repr__(self):
         return "<C wxTreeEvent instance>"
 class wxTreeEvent(wxTreeEventPtr):


@@ -419,215 +401,219 @@ class wxTreeCtrlPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def DeleteAllItems(self):
-        val = controls2c.wxTreeCtrl_DeleteAllItems(self.this)
-        return val
-    def DeleteItem(self,arg0):
-        val = controls2c.wxTreeCtrl_DeleteItem(self.this,arg0)
+    def GetCount(self):
+        val = controls2c.wxTreeCtrl_GetCount(self.this)

         return val
         return val

-    def EditLabel(self,arg0):
-        val = controls2c.wxTreeCtrl_EditLabel(self.this,arg0)
-        val = wxTextCtrlPtr(val)
+    def GetIndent(self):
+        val = controls2c.wxTreeCtrl_GetIndent(self.this)

         return val
         return val

-    def EnsureVisible(self,arg0):
-        val = controls2c.wxTreeCtrl_EnsureVisible(self.this,arg0)
+    def SetIndent(self,arg0):
+        val = controls2c.wxTreeCtrl_SetIndent(self.this,arg0)

         return val
         return val

-    def ExpandItem(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_ExpandItem(self.this,arg0,arg1)
+    def GetImageList(self):
+        val = controls2c.wxTreeCtrl_GetImageList(self.this)
+        val = wxImageListPtr(val)

         return val
         return val

-    def GetChild(self,arg0):
-        val = controls2c.wxTreeCtrl_GetChild(self.this,arg0)
+    def GetStateImageList(self):
+        val = controls2c.wxTreeCtrl_GetStateImageList(self.this)
+        val = wxImageListPtr(val)

         return val
         return val

-    def GetCount(self):
-        val = controls2c.wxTreeCtrl_GetCount(self.this)
+    def SetImageList(self,arg0):
+        val = controls2c.wxTreeCtrl_SetImageList(self.this,arg0.this)

         return val
         return val

-    def GetEditControl(self):
-        val = controls2c.wxTreeCtrl_GetEditControl(self.this)
-        val = wxTextCtrlPtr(val)
+    def SetStateImageList(self,arg0):
+        val = controls2c.wxTreeCtrl_SetStateImageList(self.this,arg0.this)

         return val
         return val

-    def GetFirstVisibleItem(self):
-        val = controls2c.wxTreeCtrl_GetFirstVisibleItem(self.this)
+    def GetItemText(self,arg0):
+        val = controls2c.wxTreeCtrl_GetItemText(self.this,arg0.this)

         return val
         return val

-    def GetImageList(self,*args):
-        val = apply(controls2c.wxTreeCtrl_GetImageList,(self.this,)+args)
+    def GetItemImage(self,arg0):
+        val = controls2c.wxTreeCtrl_GetItemImage(self.this,arg0.this)

         return val
         return val

-    def GetIndent(self):
-        val = controls2c.wxTreeCtrl_GetIndent(self.this)
+    def GetItemSelectedImage(self,arg0):
+        val = controls2c.wxTreeCtrl_GetItemSelectedImage(self.this,arg0.this)

         return val
     def GetItemData(self,arg0):
         return val
     def GetItemData(self,arg0):

-        val = controls2c.wxTreeCtrl_GetItemData(self.this,arg0)
+        val = controls2c.wxTreeCtrl_GetItemData(self.this,arg0.this)
+        val = wxTreeItemDataPtr(val)

         return val
         return val

-    def GetItem(self):
-        val = controls2c.wxTreeCtrl_GetItem(self.this)
-        val = wxTreeItemPtr(val)
-        val.thisown = 1
+    def SetItemText(self,arg0,arg1):
+        val = controls2c.wxTreeCtrl_SetItemText(self.this,arg0.this,arg1)

         return val
         return val

-    def GetItemRect(self,arg0,*args):
-        val = apply(controls2c.wxTreeCtrl_GetItemRect,(self.this,arg0,)+args)
-        val = wxRectPtr(val)
-        val.thisown = 1
+    def SetItemImage(self,arg0,arg1):
+        val = controls2c.wxTreeCtrl_SetItemImage(self.this,arg0.this,arg1)

         return val
         return val

-    def GetItemState(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_GetItemState(self.this,arg0,arg1)
+    def SetItemSelectedImage(self,arg0,arg1):
+        val = controls2c.wxTreeCtrl_SetItemSelectedImage(self.this,arg0.this,arg1)

         return val
         return val

-    def GetItemText(self,arg0):
-        val = controls2c.wxTreeCtrl_GetItemText(self.this,arg0)
+    def SetItemData(self,arg0,arg1):
+        val = controls2c.wxTreeCtrl_SetItemData(self.this,arg0.this,arg1.this)

         return val
         return val

-    def GetNextItem(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_GetNextItem(self.this,arg0,arg1)
+    def SetItemHasChildren(self,arg0,*args):
+        val = apply(controls2c.wxTreeCtrl_SetItemHasChildren,(self.this,arg0.this,)+args)

         return val
         return val

-    def GetNextVisibleItem(self,arg0):
-        val = controls2c.wxTreeCtrl_GetNextVisibleItem(self.this,arg0)
+    def IsVisible(self,arg0):
+        val = controls2c.wxTreeCtrl_IsVisible(self.this,arg0.this)

         return val
         return val

-    def GetParent(self,arg0):
-        val = controls2c.wxTreeCtrl_GetParent(self.this,arg0)
+    def ItemHasChildren(self,arg0):
+        val = controls2c.wxTreeCtrl_ItemHasChildren(self.this,arg0.this)
+        return val
+    def IsExpanded(self,arg0):
+        val = controls2c.wxTreeCtrl_IsExpanded(self.this,arg0.this)
+        return val
+    def IsSelected(self,arg0):
+        val = controls2c.wxTreeCtrl_IsSelected(self.this,arg0.this)

         return val
     def GetRootItem(self):
         val = controls2c.wxTreeCtrl_GetRootItem(self.this)
         return val
     def GetRootItem(self):
         val = controls2c.wxTreeCtrl_GetRootItem(self.this)

+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1

         return val
     def GetSelection(self):
         val = controls2c.wxTreeCtrl_GetSelection(self.this)
         return val
     def GetSelection(self):
         val = controls2c.wxTreeCtrl_GetSelection(self.this)

+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1

         return val
         return val

-    def HitTest(self,arg0):
-        val = controls2c.wxTreeCtrl_HitTest(self.this,arg0.this)
-        return val
-    def InsertItem(self,arg0,arg1,*args):
-        val = apply(controls2c.wxTreeCtrl_InsertItem,(self.this,arg0,arg1.this,)+args)
-        return val
-    def InsertItemString(self,arg0,arg1,*args):
-        val = apply(controls2c.wxTreeCtrl_InsertItemString,(self.this,arg0,arg1,)+args)
-        return val
-    def ItemHasChildren(self,arg0):
-        val = controls2c.wxTreeCtrl_ItemHasChildren(self.this,arg0)
-        return val
-    def ScrollTo(self,arg0):
-        val = controls2c.wxTreeCtrl_ScrollTo(self.this,arg0)
+    def GetParent(self,arg0):
+        val = controls2c.wxTreeCtrl_GetParent(self.this,arg0.this)
+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1

         return val
         return val

-    def SelectItem(self,arg0):
-        val = controls2c.wxTreeCtrl_SelectItem(self.this,arg0)
+    def GetFirstChild(self,arg0,arg1):
+        val = controls2c.wxTreeCtrl_GetFirstChild(self.this,arg0.this,arg1)

         return val
         return val

-    def SetIndent(self,arg0):
-        val = controls2c.wxTreeCtrl_SetIndent(self.this,arg0)
+    def GetNextChild(self,arg0,arg1):
+        val = controls2c.wxTreeCtrl_GetNextChild(self.this,arg0.this,arg1)

         return val
         return val

-    def SetImageList(self,arg0,*args):
-        val = apply(controls2c.wxTreeCtrl_SetImageList,(self.this,arg0,)+args)
+    def GetNextSibling(self,arg0):
+        val = controls2c.wxTreeCtrl_GetNextSibling(self.this,arg0.this)
+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1

         return val
         return val

-    def SetItem(self,arg0):
-        val = controls2c.wxTreeCtrl_SetItem(self.this,arg0.this)
+    def GetPrevSibling(self,arg0):
+        val = controls2c.wxTreeCtrl_GetPrevSibling(self.this,arg0.this)
+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1

         return val
         return val

-    def SetItemImage(self,arg0,arg1,arg2):
-        val = controls2c.wxTreeCtrl_SetItemImage(self.this,arg0,arg1,arg2)
+    def GetFirstVisibleItem(self):
+        val = controls2c.wxTreeCtrl_GetFirstVisibleItem(self.this)
+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1

         return val
         return val

-    def SetItemState(self,arg0,arg1,arg2):
-        val = controls2c.wxTreeCtrl_SetItemState(self.this,arg0,arg1,arg2)
+    def GetNextVisible(self,arg0):
+        val = controls2c.wxTreeCtrl_GetNextVisible(self.this,arg0.this)
+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1

         return val
         return val

-    def SetItemText(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_SetItemText(self.this,arg0,arg1)
+    def GetPrevVisible(self,arg0):
+        val = controls2c.wxTreeCtrl_GetPrevVisible(self.this,arg0.this)
+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1

         return val
         return val

-    def SetItemData(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_SetItemData(self.this,arg0,arg1)
+    def AddRoot(self,arg0,*args):
+        argl = map(None,args)
+        try: argl[2] = argl[2].this
+        except: pass
+        args = tuple(argl)
+        val = apply(controls2c.wxTreeCtrl_AddRoot,(self.this,arg0,)+args)
+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1

         return val
         return val

-    def SortChildren(self,arg0):
-        val = controls2c.wxTreeCtrl_SortChildren(self.this,arg0)
+    def PrependItem(self,arg0,arg1,*args):
+        argl = map(None,args)
+        try: argl[2] = argl[2].this
+        except: pass
+        args = tuple(argl)
+        val = apply(controls2c.wxTreeCtrl_PrependItem,(self.this,arg0.this,arg1,)+args)
+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1

         return val
         return val

-    def __repr__(self):
-        return "<C wxTreeCtrl instance>"
-class wxTreeCtrl(wxTreeCtrlPtr):
-    def __init__(self,arg0,*args) :
+    def InsertItem(self,arg0,arg1,arg2,*args):

         argl = map(None,args)
         argl = map(None,args)

-        try: argl[1] = argl[1].this
+        try: argl[2] = argl[2].this

         except: pass
         except: pass

+        args = tuple(argl)
+        val = apply(controls2c.wxTreeCtrl_InsertItem,(self.this,arg0.this,arg1.this,arg2,)+args)
+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1
+        return val
+    def AppendItem(self,arg0,arg1,*args):
+        argl = map(None,args)

         try: argl[2] = argl[2].this
         except: pass
         args = tuple(argl)
         try: argl[2] = argl[2].this
         except: pass
         args = tuple(argl)

-        self.this = apply(controls2c.new_wxTreeCtrl,(arg0.this,)+args)
-        self.thisown = 1
-
-
-
-
-class wxTabEventPtr(wxCommandEventPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __repr__(self):
-        return "<C wxTabEvent instance>"
-class wxTabEvent(wxTabEventPtr):
-    def __init__(self,this):
-        self.this = this
-
-
-
-
-class wxTabCtrlPtr(wxControlPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def DeleteAllItems(self):
-        val = controls2c.wxTabCtrl_DeleteAllItems(self.this)
+        val = apply(controls2c.wxTreeCtrl_AppendItem,(self.this,arg0.this,arg1,)+args)
+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1

         return val
         return val

-    def DeleteItem(self,arg0):
-        val = controls2c.wxTabCtrl_DeleteItem(self.this,arg0)
+    def Delete(self,arg0):
+        val = controls2c.wxTreeCtrl_Delete(self.this,arg0.this)

         return val
         return val

-    def GetImageList(self):
-        val = controls2c.wxTabCtrl_GetImageList(self.this)
+    def DeleteChildren(self,arg0):
+        val = controls2c.wxTreeCtrl_DeleteChildren(self.this,arg0.this)

         return val
         return val

-    def GetItemCount(self):
-        val = controls2c.wxTabCtrl_GetItemCount(self.this)
+    def DeleteAllItems(self):
+        val = controls2c.wxTreeCtrl_DeleteAllItems(self.this)

         return val
         return val

-    def GetItemImage(self,arg0):
-        val = controls2c.wxTabCtrl_GetItemImage(self.this,arg0)
+    def Expand(self,arg0):
+        val = controls2c.wxTreeCtrl_Expand(self.this,arg0.this)

         return val
         return val

-    def GetItemRect(self,arg0):
-        val = controls2c.wxTabCtrl_GetItemRect(self.this,arg0)
-        val = wxRectPtr(val)
-        val.thisown = 1
+    def Collapse(self,arg0):
+        val = controls2c.wxTreeCtrl_Collapse(self.this,arg0.this)

         return val
         return val

-    def GetItemText(self,arg0):
-        val = controls2c.wxTabCtrl_GetItemText(self.this,arg0)
+    def CollapseAndReset(self,arg0):
+        val = controls2c.wxTreeCtrl_CollapseAndReset(self.this,arg0.this)

         return val
         return val

-    def GetRowCount(self):
-        val = controls2c.wxTabCtrl_GetRowCount(self.this)
+    def Toggle(self,arg0):
+        val = controls2c.wxTreeCtrl_Toggle(self.this,arg0.this)

         return val
         return val

-    def GetSelection(self):
-        val = controls2c.wxTabCtrl_GetSelection(self.this)
+    def Unselect(self):
+        val = controls2c.wxTreeCtrl_Unselect(self.this)

         return val
         return val

-    def HitTest(self,arg0):
-        val = controls2c.wxTabCtrl_HitTest(self.this,arg0.this)
+    def SelectItem(self,arg0):
+        val = controls2c.wxTreeCtrl_SelectItem(self.this,arg0.this)

         return val
         return val

-    def InsertItem(self,arg0,arg1,*args):
-        val = apply(controls2c.wxTabCtrl_InsertItem,(self.this,arg0,arg1,)+args)
+    def EnsureVisible(self,arg0):
+        val = controls2c.wxTreeCtrl_EnsureVisible(self.this,arg0.this)

         return val
         return val

-    def SetItemImage(self,arg0,arg1):
-        val = controls2c.wxTabCtrl_SetItemImage(self.this,arg0,arg1)
+    def ScrollTo(self,arg0):
+        val = controls2c.wxTreeCtrl_ScrollTo(self.this,arg0.this)

         return val
         return val

-    def SetImageList(self,arg0):
-        val = controls2c.wxTabCtrl_SetImageList(self.this,arg0)
+    def EditLabel(self,arg0):
+        val = controls2c.wxTreeCtrl_EditLabel(self.this,arg0.this)
+        val = wxTextCtrlPtr(val)

         return val
         return val

-    def SetItemSize(self,arg0):
-        val = controls2c.wxTabCtrl_SetItemSize(self.this,arg0.this)
+    def GetEditControl(self):
+        val = controls2c.wxTreeCtrl_GetEditControl(self.this)
+        val = wxTextCtrlPtr(val)

         return val
         return val

-    def SetItemText(self,arg0,arg1):
-        val = controls2c.wxTabCtrl_SetItemText(self.this,arg0,arg1)
+    def EndEditLabel(self,arg0,*args):
+        val = apply(controls2c.wxTreeCtrl_EndEditLabel,(self.this,arg0.this,)+args)

         return val
         return val

-    def SetPadding(self,arg0):
-        val = controls2c.wxTabCtrl_SetPadding(self.this,arg0.this)
+    def SetItemBold(self,arg0,*args):
+        val = apply(controls2c.wxTreeCtrl_SetItemBold,(self.this,arg0.this,)+args)

         return val
         return val

-    def SetSelection(self,arg0):
-        val = controls2c.wxTabCtrl_SetSelection(self.this,arg0)
+    def IsBold(self,arg0):
+        val = controls2c.wxTreeCtrl_IsBold(self.this,arg0.this)
+        return val
+    def HitTest(self,arg0):
+        val = controls2c.wxTreeCtrl_HitTest(self.this,arg0.this)
+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxTabCtrl instance>"
-class wxTabCtrl(wxTabCtrlPtr):
-    def __init__(self,arg0,arg1,*args) :
+        return "<C wxTreeCtrl instance>"
+class wxTreeCtrl(wxTreeCtrlPtr):
+    def __init__(self,arg0,*args) :

         argl = map(None,args)
         argl = map(None,args)

-        try: argl[0] = argl[0].this
-        except: pass

         try: argl[1] = argl[1].this
         except: pass
         try: argl[1] = argl[1].this
         except: pass

+        try: argl[2] = argl[2].this
+        except: pass

         args = tuple(argl)
         args = tuple(argl)

-        self.this = apply(controls2c.new_wxTabCtrl,(arg0.this,arg1,)+args)
+        self.this = apply(controls2c.new_wxTreeCtrl,(arg0.this,)+args)

         self.thisown = 1
         self.thisown = 1

+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -640,46 +626,45 @@ class wxTabCtrl(wxTabCtrlPtr):
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 

-wxTREE_MASK_HANDLE = controls2c.wxTREE_MASK_HANDLE
-wxTREE_MASK_STATE = controls2c.wxTREE_MASK_STATE
-wxTREE_MASK_TEXT = controls2c.wxTREE_MASK_TEXT
-wxTREE_MASK_IMAGE = controls2c.wxTREE_MASK_IMAGE
-wxTREE_MASK_SELECTED_IMAGE = controls2c.wxTREE_MASK_SELECTED_IMAGE
-wxTREE_MASK_CHILDREN = controls2c.wxTREE_MASK_CHILDREN
-wxTREE_MASK_DATA = controls2c.wxTREE_MASK_DATA
-wxTREE_STATE_BOLD = controls2c.wxTREE_STATE_BOLD
-wxTREE_STATE_DROPHILITED = controls2c.wxTREE_STATE_DROPHILITED
-wxTREE_STATE_EXPANDED = controls2c.wxTREE_STATE_EXPANDED
-wxTREE_STATE_EXPANDEDONCE = controls2c.wxTREE_STATE_EXPANDEDONCE
-wxTREE_STATE_FOCUSED = controls2c.wxTREE_STATE_FOCUSED
-wxTREE_STATE_SELECTED = controls2c.wxTREE_STATE_SELECTED
-wxTREE_STATE_CUT = controls2c.wxTREE_STATE_CUT
-wxTREE_HITTEST_ABOVE = controls2c.wxTREE_HITTEST_ABOVE
-wxTREE_HITTEST_BELOW = controls2c.wxTREE_HITTEST_BELOW
-wxTREE_HITTEST_NOWHERE = controls2c.wxTREE_HITTEST_NOWHERE
-wxTREE_HITTEST_ONITEMBUTTON = controls2c.wxTREE_HITTEST_ONITEMBUTTON
-wxTREE_HITTEST_ONITEMICON = controls2c.wxTREE_HITTEST_ONITEMICON
-wxTREE_HITTEST_ONITEMINDENT = controls2c.wxTREE_HITTEST_ONITEMINDENT
-wxTREE_HITTEST_ONITEMLABEL = controls2c.wxTREE_HITTEST_ONITEMLABEL
-wxTREE_HITTEST_ONITEMRIGHT = controls2c.wxTREE_HITTEST_ONITEMRIGHT
-wxTREE_HITTEST_ONITEMSTATEICON = controls2c.wxTREE_HITTEST_ONITEMSTATEICON
-wxTREE_HITTEST_TOLEFT = controls2c.wxTREE_HITTEST_TOLEFT
-wxTREE_HITTEST_TORIGHT = controls2c.wxTREE_HITTEST_TORIGHT
-wxTREE_HITTEST_ONITEM = controls2c.wxTREE_HITTEST_ONITEM
-wxTREE_NEXT_CARET = controls2c.wxTREE_NEXT_CARET
-wxTREE_NEXT_CHILD = controls2c.wxTREE_NEXT_CHILD
-wxTREE_NEXT_DROPHILITE = controls2c.wxTREE_NEXT_DROPHILITE
-wxTREE_NEXT_FIRSTVISIBLE = controls2c.wxTREE_NEXT_FIRSTVISIBLE
-wxTREE_NEXT_NEXT = controls2c.wxTREE_NEXT_NEXT
-wxTREE_NEXT_NEXTVISIBLE = controls2c.wxTREE_NEXT_NEXTVISIBLE
-wxTREE_NEXT_PARENT = controls2c.wxTREE_NEXT_PARENT
-wxTREE_NEXT_PREVIOUS = controls2c.wxTREE_NEXT_PREVIOUS
-wxTREE_NEXT_PREVIOUSVISIBLE = controls2c.wxTREE_NEXT_PREVIOUSVISIBLE
-wxTREE_NEXT_ROOT = controls2c.wxTREE_NEXT_ROOT
-wxTREE_EXPAND_EXPAND = controls2c.wxTREE_EXPAND_EXPAND
-wxTREE_EXPAND_COLLAPSE = controls2c.wxTREE_EXPAND_COLLAPSE
-wxTREE_EXPAND_COLLAPSE_RESET = controls2c.wxTREE_EXPAND_COLLAPSE_RESET
-wxTREE_EXPAND_TOGGLE = controls2c.wxTREE_EXPAND_TOGGLE
-wxTREE_INSERT_LAST = controls2c.wxTREE_INSERT_LAST
-wxTREE_INSERT_FIRST = controls2c.wxTREE_INSERT_FIRST
-wxTREE_INSERT_SORT = controls2c.wxTREE_INSERT_SORT
+wxLIST_MASK_TEXT = controls2c.wxLIST_MASK_TEXT
+wxLIST_MASK_IMAGE = controls2c.wxLIST_MASK_IMAGE
+wxLIST_MASK_DATA = controls2c.wxLIST_MASK_DATA
+wxLIST_MASK_WIDTH = controls2c.wxLIST_MASK_WIDTH
+wxLIST_MASK_FORMAT = controls2c.wxLIST_MASK_FORMAT
+wxLIST_STATE_DONTCARE = controls2c.wxLIST_STATE_DONTCARE
+wxLIST_STATE_DROPHILITED = controls2c.wxLIST_STATE_DROPHILITED
+wxLIST_STATE_FOCUSED = controls2c.wxLIST_STATE_FOCUSED
+wxLIST_STATE_SELECTED = controls2c.wxLIST_STATE_SELECTED
+wxLIST_STATE_CUT = controls2c.wxLIST_STATE_CUT
+wxLIST_HITTEST_ABOVE = controls2c.wxLIST_HITTEST_ABOVE
+wxLIST_HITTEST_BELOW = controls2c.wxLIST_HITTEST_BELOW
+wxLIST_HITTEST_NOWHERE = controls2c.wxLIST_HITTEST_NOWHERE
+wxLIST_HITTEST_ONITEMICON = controls2c.wxLIST_HITTEST_ONITEMICON
+wxLIST_HITTEST_ONITEMLABEL = controls2c.wxLIST_HITTEST_ONITEMLABEL
+wxLIST_HITTEST_ONITEMRIGHT = controls2c.wxLIST_HITTEST_ONITEMRIGHT
+wxLIST_HITTEST_ONITEMSTATEICON = controls2c.wxLIST_HITTEST_ONITEMSTATEICON
+wxLIST_HITTEST_TOLEFT = controls2c.wxLIST_HITTEST_TOLEFT
+wxLIST_HITTEST_TORIGHT = controls2c.wxLIST_HITTEST_TORIGHT
+wxLIST_HITTEST_ONITEM = controls2c.wxLIST_HITTEST_ONITEM
+wxLIST_NEXT_ABOVE = controls2c.wxLIST_NEXT_ABOVE
+wxLIST_NEXT_ALL = controls2c.wxLIST_NEXT_ALL
+wxLIST_NEXT_BELOW = controls2c.wxLIST_NEXT_BELOW
+wxLIST_NEXT_LEFT = controls2c.wxLIST_NEXT_LEFT
+wxLIST_NEXT_RIGHT = controls2c.wxLIST_NEXT_RIGHT
+wxLIST_ALIGN_DEFAULT = controls2c.wxLIST_ALIGN_DEFAULT
+wxLIST_ALIGN_LEFT = controls2c.wxLIST_ALIGN_LEFT
+wxLIST_ALIGN_TOP = controls2c.wxLIST_ALIGN_TOP
+wxLIST_ALIGN_SNAP_TO_GRID = controls2c.wxLIST_ALIGN_SNAP_TO_GRID
+wxLIST_FORMAT_LEFT = controls2c.wxLIST_FORMAT_LEFT
+wxLIST_FORMAT_RIGHT = controls2c.wxLIST_FORMAT_RIGHT
+wxLIST_FORMAT_CENTRE = controls2c.wxLIST_FORMAT_CENTRE
+wxLIST_FORMAT_CENTER = controls2c.wxLIST_FORMAT_CENTER
+wxLIST_AUTOSIZE = controls2c.wxLIST_AUTOSIZE
+wxLIST_AUTOSIZE_USEHEADER = controls2c.wxLIST_AUTOSIZE_USEHEADER
+wxLIST_RECT_BOUNDS = controls2c.wxLIST_RECT_BOUNDS
+wxLIST_RECT_ICON = controls2c.wxLIST_RECT_ICON
+wxLIST_RECT_LABEL = controls2c.wxLIST_RECT_LABEL
+wxLIST_FIND_UP = controls2c.wxLIST_FIND_UP
+wxLIST_FIND_DOWN = controls2c.wxLIST_FIND_DOWN
+wxLIST_FIND_LEFT = controls2c.wxLIST_FIND_LEFT
+wxLIST_FIND_RIGHT = controls2c.wxLIST_FIND_RIGHT