small change to avoid floating point exception in wxScrolledWindow::Scroll

[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 0a611f55af057b38ce34edd9d00df8d68648bef4..a8669d0550448c75d658c82e9d0b836c0dfd5104 100644 (file)
--- a/utils/wxPython/src/msw/controls2.py
+++ b/utils/wxPython/src/msw/controls2.py
@@ -7,76 +7,78 @@ from windows import *
 
 from gdi import *
 
 
 from gdi import *
 

+from clip_dnd import *
+

 from events import *
 
 from controls import *
 from events import *
 
 from controls import *

-import wxp
+import wx

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

-    def __del__(self):
+    def __del__(self,controls2c=controls2c):

         if self.thisown == 1 :
         if self.thisown == 1 :

-            controls2c.delete_wxListItem(self.this)
+            controls2c.delete_wxListItem(self)

     def __setattr__(self,name,value):
         if name == "m_mask" :
     def __setattr__(self,name,value):
         if name == "m_mask" :

-            controls2c.wxListItem_m_mask_set(self.this,value)
+            controls2c.wxListItem_m_mask_set(self,value)

             return
         if name == "m_itemId" :
             return
         if name == "m_itemId" :

-            controls2c.wxListItem_m_itemId_set(self.this,value)
+            controls2c.wxListItem_m_itemId_set(self,value)

             return
         if name == "m_col" :
             return
         if name == "m_col" :

-            controls2c.wxListItem_m_col_set(self.this,value)
+            controls2c.wxListItem_m_col_set(self,value)

             return
         if name == "m_state" :
             return
         if name == "m_state" :

-            controls2c.wxListItem_m_state_set(self.this,value)
+            controls2c.wxListItem_m_state_set(self,value)

             return
         if name == "m_stateMask" :
             return
         if name == "m_stateMask" :

-            controls2c.wxListItem_m_stateMask_set(self.this,value)
+            controls2c.wxListItem_m_stateMask_set(self,value)

             return
         if name == "m_text" :
             return
         if name == "m_text" :

-            controls2c.wxListItem_m_text_set(self.this,value)
+            controls2c.wxListItem_m_text_set(self,value)

             return
         if name == "m_image" :
             return
         if name == "m_image" :

-            controls2c.wxListItem_m_image_set(self.this,value)
+            controls2c.wxListItem_m_image_set(self,value)

             return
         if name == "m_data" :
             return
         if name == "m_data" :

-            controls2c.wxListItem_m_data_set(self.this,value)
+            controls2c.wxListItem_m_data_set(self,value)

             return
         if name == "m_format" :
             return
         if name == "m_format" :

-            controls2c.wxListItem_m_format_set(self.this,value)
+            controls2c.wxListItem_m_format_set(self,value)

             return
         if name == "m_width" :
             return
         if name == "m_width" :

-            controls2c.wxListItem_m_width_set(self.this,value)
+            controls2c.wxListItem_m_width_set(self,value)

             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "m_mask" : 
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "m_mask" : 

-            return controls2c.wxListItem_m_mask_get(self.this)
+            return controls2c.wxListItem_m_mask_get(self)

         if name == "m_itemId" : 
         if name == "m_itemId" : 

-            return controls2c.wxListItem_m_itemId_get(self.this)
+            return controls2c.wxListItem_m_itemId_get(self)

         if name == "m_col" : 
         if name == "m_col" : 

-            return controls2c.wxListItem_m_col_get(self.this)
+            return controls2c.wxListItem_m_col_get(self)

         if name == "m_state" : 
         if name == "m_state" : 

-            return controls2c.wxListItem_m_state_get(self.this)
+            return controls2c.wxListItem_m_state_get(self)

         if name == "m_stateMask" : 
         if name == "m_stateMask" : 

-            return controls2c.wxListItem_m_stateMask_get(self.this)
+            return controls2c.wxListItem_m_stateMask_get(self)

         if name == "m_text" : 
         if name == "m_text" : 

-            return controls2c.wxListItem_m_text_get(self.this)
+            return controls2c.wxListItem_m_text_get(self)

         if name == "m_image" : 
         if name == "m_image" : 

-            return controls2c.wxListItem_m_image_get(self.this)
+            return controls2c.wxListItem_m_image_get(self)

         if name == "m_data" : 
         if name == "m_data" : 

-            return controls2c.wxListItem_m_data_get(self.this)
+            return controls2c.wxListItem_m_data_get(self)

         if name == "m_format" : 
         if name == "m_format" : 

-            return controls2c.wxListItem_m_format_get(self.this)
+            return controls2c.wxListItem_m_format_get(self)

         if name == "m_width" : 
         if name == "m_width" : 

-            return controls2c.wxListItem_m_width_get(self.this)
+            return controls2c.wxListItem_m_width_get(self)

         raise AttributeError,name
     def __repr__(self):
         raise AttributeError,name
     def __repr__(self):

-        return "<C wxListItem instance>"
+        return "<C wxListItem instance at %s>" % (self.this,)

 class wxListItem(wxListItemPtr):
 class wxListItem(wxListItemPtr):

-    def __init__(self) :
-        self.this = controls2c.new_wxListItem()
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controls2c.new_wxListItem,_args,_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -88,45 +90,45 @@ class wxListEventPtr(wxCommandEventPtr):
         self.thisown = 0
     def __setattr__(self,name,value):
         if name == "m_code" :
         self.thisown = 0
     def __setattr__(self,name,value):
         if name == "m_code" :

-            controls2c.wxListEvent_m_code_set(self.this,value)
+            controls2c.wxListEvent_m_code_set(self,value)

             return
         if name == "m_itemIndex" :
             return
         if name == "m_itemIndex" :

-            controls2c.wxListEvent_m_itemIndex_set(self.this,value)
+            controls2c.wxListEvent_m_itemIndex_set(self,value)

             return
         if name == "m_oldItemIndex" :
             return
         if name == "m_oldItemIndex" :

-            controls2c.wxListEvent_m_oldItemIndex_set(self.this,value)
+            controls2c.wxListEvent_m_oldItemIndex_set(self,value)

             return
         if name == "m_col" :
             return
         if name == "m_col" :

-            controls2c.wxListEvent_m_col_set(self.this,value)
+            controls2c.wxListEvent_m_col_set(self,value)

             return
         if name == "m_cancelled" :
             return
         if name == "m_cancelled" :

-            controls2c.wxListEvent_m_cancelled_set(self.this,value)
+            controls2c.wxListEvent_m_cancelled_set(self,value)

             return
         if name == "m_pointDrag" :
             return
         if name == "m_pointDrag" :

-            controls2c.wxListEvent_m_pointDrag_set(self.this,value.this)
+            controls2c.wxListEvent_m_pointDrag_set(self,value.this)

             return
         if name == "m_item" :
             return
         if name == "m_item" :

-            controls2c.wxListEvent_m_item_set(self.this,value.this)
+            controls2c.wxListEvent_m_item_set(self,value.this)

             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "m_code" : 
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "m_code" : 

-            return controls2c.wxListEvent_m_code_get(self.this)
+            return controls2c.wxListEvent_m_code_get(self)

         if name == "m_itemIndex" : 
         if name == "m_itemIndex" : 

-            return controls2c.wxListEvent_m_itemIndex_get(self.this)
+            return controls2c.wxListEvent_m_itemIndex_get(self)

         if name == "m_oldItemIndex" : 
         if name == "m_oldItemIndex" : 

-            return controls2c.wxListEvent_m_oldItemIndex_get(self.this)
+            return controls2c.wxListEvent_m_oldItemIndex_get(self)

         if name == "m_col" : 
         if name == "m_col" : 

-            return controls2c.wxListEvent_m_col_get(self.this)
+            return controls2c.wxListEvent_m_col_get(self)

         if name == "m_cancelled" : 
         if name == "m_cancelled" : 

-            return controls2c.wxListEvent_m_cancelled_get(self.this)
+            return controls2c.wxListEvent_m_cancelled_get(self)

         if name == "m_pointDrag" : 
         if name == "m_pointDrag" : 

-            return wxPointPtr(controls2c.wxListEvent_m_pointDrag_get(self.this))
+            return wxPointPtr(controls2c.wxListEvent_m_pointDrag_get(self))

         if name == "m_item" : 
         if name == "m_item" : 

-            return wxListItemPtr(controls2c.wxListEvent_m_item_get(self.this))
+            return wxListItemPtr(controls2c.wxListEvent_m_item_get(self))

         raise AttributeError,name
     def __repr__(self):
         raise AttributeError,name
     def __repr__(self):

-        return "<C wxListEvent instance>"
+        return "<C wxListEvent instance at %s>" % (self.this,)

 class wxListEvent(wxListEventPtr):
     def __init__(self,this):
         self.this = this
 class wxListEvent(wxListEventPtr):
     def __init__(self,this):
         self.this = this


@@ -138,282 +140,251 @@ class wxListCtrlPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Arrange(self,*args):
-        val = apply(controls2c.wxListCtrl_Arrange,(self.this,)+args)
+    def Arrange(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_Arrange,(self,) + _args, _kwargs)
+        return val
+    def DeleteItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_DeleteItem,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteItem(self,arg0):
-        val = controls2c.wxListCtrl_DeleteItem(self.this,arg0)
+    def DeleteAllItems(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_DeleteAllItems,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteAllItems(self):
-        val = controls2c.wxListCtrl_DeleteAllItems(self.this)
+    def DeleteColumn(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_DeleteColumn,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteColumn(self,arg0):
-        val = controls2c.wxListCtrl_DeleteColumn(self.this,arg0)
+    def DeleteAllColumns(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_DeleteAllColumns,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteAllColumns(self):
-        val = controls2c.wxListCtrl_DeleteAllColumns(self.this)
+    def ClearAll(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_ClearAll,(self,) + _args, _kwargs)

         return val
         return val

-    def ClearAll(self):
-        val = controls2c.wxListCtrl_ClearAll(self.this)
+    def EditLabel(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_EditLabel,(self,) + _args, _kwargs)
+        if val: val = wxTextCtrlPtr(val) 

         return val
         return val

-    def EditLabel(self,arg0):
-        val = controls2c.wxListCtrl_EditLabel(self.this,arg0)
-        val = wxTextCtrlPtr(val)
+    def EndEditLabel(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_EndEditLabel,(self,) + _args, _kwargs)

         return val
         return val

-    def EndEditLabel(self,arg0):
-        val = controls2c.wxListCtrl_EndEditLabel(self.this,arg0)
+    def GetEditControl(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetEditControl,(self,) + _args, _kwargs)
+        if val: val = wxTextCtrlPtr(val) 

         return val
         return val

-    def EnsureVisible(self,arg0):
-        val = controls2c.wxListCtrl_EnsureVisible(self.this,arg0)
+    def EnsureVisible(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_EnsureVisible,(self,) + _args, _kwargs)

         return val
         return val

-    def FindItem(self,arg0,arg1,*args):
-        val = apply(controls2c.wxListCtrl_FindItem,(self.this,arg0,arg1,)+args)
+    def FindItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_FindItem,(self,) + _args, _kwargs)

         return val
         return val

-    def FindItemData(self,arg0,arg1):
-        val = controls2c.wxListCtrl_FindItemData(self.this,arg0,arg1)
+    def FindItemData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_FindItemData,(self,) + _args, _kwargs)

         return val
         return val

-    def FindItemAtPos(self,arg0,arg1,arg2):
-        val = controls2c.wxListCtrl_FindItemAtPos(self.this,arg0,arg1.this,arg2)
+    def FindItemAtPos(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_FindItemAtPos,(self,) + _args, _kwargs)

         return val
         return val

-    def GetColumn(self,arg0,arg1):
-        val = controls2c.wxListCtrl_GetColumn(self.this,arg0,arg1.this)
+    def GetColumn(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetColumn,(self,) + _args, _kwargs)

         return val
         return val

-    def GetColumnWidth(self,arg0):
-        val = controls2c.wxListCtrl_GetColumnWidth(self.this,arg0)
+    def GetColumnWidth(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetColumnWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCountPerPage(self):
-        val = controls2c.wxListCtrl_GetCountPerPage(self.this)
+    def GetCountPerPage(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetCountPerPage,(self,) + _args, _kwargs)

         return val
         return val

-    def GetEditControl(self):
-        val = controls2c.wxListCtrl_GetEditControl(self.this)
-        val = wxTextCtrlPtr(val)
+    def GetImageList(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetImageList,(self,) + _args, _kwargs)
+        if val: val = wxImageListPtr(val) 

         return val
         return val

-    def GetImageList(self,arg0):
-        val = controls2c.wxListCtrl_GetImageList(self.this,arg0)
+    def GetItemData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemData,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemData(self,arg0):
-        val = controls2c.wxListCtrl_GetItemData(self.this,arg0)
+    def GetItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItem,(self,) + _args, _kwargs)
+        if val: val = wxListItemPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetItem(self):
-        val = controls2c.wxListCtrl_GetItem(self.this)
-        val = wxListItemPtr(val)
-        val.thisown = 1
+    def GetItemPosition(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemPosition,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetItemPosition(self,arg0):
-        val = controls2c.wxListCtrl_GetItemPosition(self.this,arg0)
-        val = wxPointPtr(val)
-        val.thisown = 1
+    def GetItemRect(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemRect,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetItemRect(self,arg0,*args):
-        val = apply(controls2c.wxListCtrl_GetItemRect,(self.this,arg0,)+args)
-        val = wxRectPtr(val)
-        val.thisown = 1
+    def GetItemState(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemState,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemState(self,arg0,arg1):
-        val = controls2c.wxListCtrl_GetItemState(self.this,arg0,arg1)
+    def GetItemCount(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemCount,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemCount(self):
-        val = controls2c.wxListCtrl_GetItemCount(self.this)
+    def GetItemSpacing(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemSpacing,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemSpacing(self,arg0):
-        val = controls2c.wxListCtrl_GetItemSpacing(self.this,arg0)
+    def GetItemText(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemText,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemText(self,arg0):
-        val = controls2c.wxListCtrl_GetItemText(self.this,arg0)
+    def GetNextItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetNextItem,(self,) + _args, _kwargs)

         return val
         return val

-    def GetNextItem(self,arg0,*args):
-        val = apply(controls2c.wxListCtrl_GetNextItem,(self.this,arg0,)+args)
+    def GetSelectedItemCount(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetSelectedItemCount,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelectedItemCount(self):
-        val = controls2c.wxListCtrl_GetSelectedItemCount(self.this)
+    def GetTextColour(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetTextColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetTextColour(self):
-        val = controls2c.wxListCtrl_GetTextColour(self.this)
-        val = wxColourPtr(val)
-        val.thisown = 1
+    def SetTextColour(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetTextColour,(self,) + _args, _kwargs)

         return val
         return val

-    def GetTopItem(self):
-        val = controls2c.wxListCtrl_GetTopItem(self.this)
+    def GetTopItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetTopItem,(self,) + _args, _kwargs)

         return val
         return val

-    def HitTest(self,arg0):
-        val = controls2c.wxListCtrl_HitTest(self.this,arg0.this)
+    def HitTest(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_HitTest,(self,) + _args, _kwargs)

         return val
         return val

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

         return val
         return val

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

         return val
         return val

-    def InsertItem(self,arg0):
-        val = controls2c.wxListCtrl_InsertItem(self.this,arg0.this)
+    def InsertItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_InsertItem,(self,) + _args, _kwargs)

         return val
         return val

-    def InsertStringItem(self,arg0,arg1):
-        val = controls2c.wxListCtrl_InsertStringItem(self.this,arg0,arg1)
+    def InsertStringItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_InsertStringItem,(self,) + _args, _kwargs)

         return val
         return val

-    def InsertImageItem(self,arg0,arg1):
-        val = controls2c.wxListCtrl_InsertImageItem(self.this,arg0,arg1)
+    def InsertImageItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_InsertImageItem,(self,) + _args, _kwargs)

         return val
         return val

-    def InsertImageStringItem(self,arg0,arg1,arg2):
-        val = controls2c.wxListCtrl_InsertImageStringItem(self.this,arg0,arg1,arg2)
+    def InsertImageStringItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_InsertImageStringItem,(self,) + _args, _kwargs)

         return val
         return val

-    def ScrollList(self,arg0,arg1):
-        val = controls2c.wxListCtrl_ScrollList(self.this,arg0,arg1)
+    def ScrollList(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_ScrollList,(self,) + _args, _kwargs)

         return val
         return val

-    def SetBackgroundColour(self,arg0):
-        val = controls2c.wxListCtrl_SetBackgroundColour(self.this,arg0.this)
+    def SetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetBackgroundColour,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColumn(self,arg0,arg1):
-        val = controls2c.wxListCtrl_SetColumn(self.this,arg0,arg1.this)
+    def SetColumn(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetColumn,(self,) + _args, _kwargs)

         return val
         return val

-    def SetColumnWidth(self,arg0,arg1):
-        val = controls2c.wxListCtrl_SetColumnWidth(self.this,arg0,arg1)
+    def SetColumnWidth(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetColumnWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetImageList(self,arg0,arg1):
-        val = controls2c.wxListCtrl_SetImageList(self.this,arg0,arg1)
+    def SetImageList(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetImageList,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItem(self,arg0):
-        val = controls2c.wxListCtrl_SetItem(self.this,arg0.this)
+    def SetItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetItem,(self,) + _args, _kwargs)

         return val
         return val

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

         return val
         return val

-    def SetItemData(self,arg0,arg1):
-        val = controls2c.wxListCtrl_SetItemData(self.this,arg0,arg1)
+    def SetItemData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetItemData,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItemImage(self,arg0,arg1,arg2):
-        val = controls2c.wxListCtrl_SetItemImage(self.this,arg0,arg1,arg2)
+    def SetItemImage(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetItemImage,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItemPosition(self,arg0,arg1):
-        val = controls2c.wxListCtrl_SetItemPosition(self.this,arg0,arg1.this)
+    def SetItemPosition(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetItemPosition,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItemState(self,arg0,arg1,arg2):
-        val = controls2c.wxListCtrl_SetItemState(self.this,arg0,arg1,arg2)
+    def SetItemState(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetItemState,(self,) + _args, _kwargs)

         return val
         return val

-    def SetItemText(self,arg0,arg1):
-        val = controls2c.wxListCtrl_SetItemText(self.this,arg0,arg1)
+    def SetItemText(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetItemText,(self,) + _args, _kwargs)

         return val
         return val

-    def SetSingleStyle(self,arg0,*args):
-        val = apply(controls2c.wxListCtrl_SetSingleStyle,(self.this,arg0,)+args)
+    def SetSingleStyle(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetSingleStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def SetTextColour(self,arg0):
-        val = controls2c.wxListCtrl_SetTextColour(self.this,arg0.this)
+    def SetWindowStyleFlag(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetWindowStyleFlag,(self,) + _args, _kwargs)

         return val
         return val

-    def SetWindowStyleFlag(self,arg0):
-        val = controls2c.wxListCtrl_SetWindowStyleFlag(self.this,arg0)
+    def SortItems(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SortItems,(self,) + _args, _kwargs)

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

-        return "<C wxListCtrl instance>"
+        return "<C wxListCtrl instance at %s>" % (self.this,)

 class wxListCtrl(wxListCtrlPtr):
 class wxListCtrl(wxListCtrlPtr):

-    def __init__(self,arg0,arg1,*args) :
-        argl = map(None,args)
-        try: argl[0] = argl[0].this
-        except: pass
-        try: argl[1] = argl[1].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controls2c.new_wxListCtrl,(arg0.this,arg1,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controls2c.new_wxListCtrl,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 
 
 

-class wxTreeItemPtr :
+class wxTreeItemIdPtr :

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

-    def __del__(self):
+    def __del__(self,controls2c=controls2c):

         if self.thisown == 1 :
         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)
+    def IsOk(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeItemId_IsOk,(self,) + _args, _kwargs)
+        return val

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

-        return "<C wxTreeItem instance>"
-class wxTreeItem(wxTreeItemPtr):
-    def __init__(self) :
-        self.this = controls2c.new_wxTreeItem()
+        return "<C wxTreeItemId instance at %s>" % (self.this,)
+class wxTreeItemId(wxTreeItemIdPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controls2c.new_wxTreeItemId,_args,_kwargs)

         self.thisown = 1
 
 
 
 
         self.thisown = 1
 
 
 
 

-class wxTreeEventPtr(wxCommandEventPtr):
+class wxTreeItemDataPtr :

     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 GetData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeItemData_GetData,(self,) + _args, _kwargs)
+        return val
+    def SetData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeItemData_SetData,(self,) + _args, _kwargs)
+        return val
+    def GetId(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeItemData_GetId,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) 
+        return val
+    def SetId(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeItemData_SetId,(self,) + _args, _kwargs)
+        return val

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

-        return "<C wxTreeEvent instance>"
+        return "<C wxTreeItemData instance at %s>" % (self.this,)
+class wxTreeItemData(wxTreeItemDataPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controls2c.new_wxTreeItemData,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxTreeEventPtr(wxNotifyEventPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeEvent_GetItem,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
+        return val
+    def GetOldItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeEvent_GetOldItem,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
+        return val
+    def GetPoint(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeEvent_GetPoint,(self,) + _args, _kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
+        return val
+    def GetCode(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeEvent_GetCode,(self,) + _args, _kwargs)
+        return val
+    def GetLabel(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeEvent_GetLabel,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxTreeEvent instance at %s>" % (self.this,)

 class wxTreeEvent(wxTreeEventPtr):
     def __init__(self,this):
         self.this = this
 class wxTreeEvent(wxTreeEventPtr):
     def __init__(self,this):
         self.this = this


@@ -425,130 +396,239 @@ 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)
+    def GetCount(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetCount,(self,) + _args, _kwargs)
+        return val
+    def GetIndent(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetIndent,(self,) + _args, _kwargs)
+        return val
+    def SetIndent(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetIndent,(self,) + _args, _kwargs)
+        return val
+    def GetImageList(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetImageList,(self,) + _args, _kwargs)
+        if val: val = wxImageListPtr(val) 
+        return val
+    def GetStateImageList(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetStateImageList,(self,) + _args, _kwargs)
+        if val: val = wxImageListPtr(val) 
+        return val
+    def SetImageList(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetImageList,(self,) + _args, _kwargs)
+        return val
+    def SetStateImageList(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetStateImageList,(self,) + _args, _kwargs)
+        return val
+    def GetSpacing(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetSpacing,(self,) + _args, _kwargs)
+        return val
+    def SetSpacing(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetSpacing,(self,) + _args, _kwargs)

         return val
         return val

-    def DeleteItem(self,arg0):
-        val = controls2c.wxTreeCtrl_DeleteItem(self.this,arg0)
+    def GetItemText(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetItemText,(self,) + _args, _kwargs)

         return val
         return val

-    def EditLabel(self,arg0):
-        val = controls2c.wxTreeCtrl_EditLabel(self.this,arg0)
-        val = wxTextCtrlPtr(val)
+    def GetItemImage(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetItemImage,(self,) + _args, _kwargs)

         return val
         return val

-    def EnsureVisible(self,arg0):
-        val = controls2c.wxTreeCtrl_EnsureVisible(self.this,arg0)
+    def GetItemSelectedImage(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetItemSelectedImage,(self,) + _args, _kwargs)

         return val
         return val

-    def ExpandItem(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_ExpandItem(self.this,arg0,arg1)
+    def SetItemText(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemText,(self,) + _args, _kwargs)

         return val
         return val

-    def GetChild(self,arg0):
-        val = controls2c.wxTreeCtrl_GetChild(self.this,arg0)
+    def SetItemImage(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemImage,(self,) + _args, _kwargs)

         return val
         return val

-    def GetCount(self):
-        val = controls2c.wxTreeCtrl_GetCount(self.this)
+    def SetItemSelectedImage(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemSelectedImage,(self,) + _args, _kwargs)

         return val
         return val

-    def GetEditControl(self):
-        val = controls2c.wxTreeCtrl_GetEditControl(self.this)
-        val = wxTextCtrlPtr(val)
+    def SetItemHasChildren(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemHasChildren,(self,) + _args, _kwargs)

         return val
         return val

-    def GetFirstVisibleItem(self):
-        val = controls2c.wxTreeCtrl_GetFirstVisibleItem(self.this)
+    def GetItemData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetItemData,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemDataPtr(val) 

         return val
         return val

-    def GetImageList(self,*args):
-        val = apply(controls2c.wxTreeCtrl_GetImageList,(self.this,)+args)
+    def SetItemData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemData,(self,) + _args, _kwargs)

         return val
         return val

-    def GetIndent(self):
-        val = controls2c.wxTreeCtrl_GetIndent(self.this)
+    def GetPyData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetPyData,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemData(self,arg0):
-        val = controls2c.wxTreeCtrl_GetItemData(self.this,arg0)
+    def SetPyData(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetPyData,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItem(self):
-        val = controls2c.wxTreeCtrl_GetItem(self.this)
-        val = wxTreeItemPtr(val)
-        val.thisown = 1
+    def IsVisible(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_IsVisible,(self,) + _args, _kwargs)

         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 ItemHasChildren(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_ItemHasChildren,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemState(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_GetItemState(self.this,arg0,arg1)
+    def IsExpanded(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_IsExpanded,(self,) + _args, _kwargs)

         return val
         return val

-    def GetItemText(self,arg0):
-        val = controls2c.wxTreeCtrl_GetItemText(self.this,arg0)
+    def IsSelected(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_IsSelected,(self,) + _args, _kwargs)

         return val
         return val

-    def GetNextItem(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_GetNextItem(self.this,arg0,arg1)
+    def GetRootItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetRootItem,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetNextVisibleItem(self,arg0):
-        val = controls2c.wxTreeCtrl_GetNextVisibleItem(self.this,arg0)
+    def GetSelection(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetSelection,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetParent(self,arg0):
-        val = controls2c.wxTreeCtrl_GetParent(self.this,arg0)
+    def GetItemParent(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetItemParent,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def GetRootItem(self):
-        val = controls2c.wxTreeCtrl_GetRootItem(self.this)
+    def GetSelections(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetSelections,(self,) + _args, _kwargs)

         return val
         return val

-    def GetSelection(self):
-        val = controls2c.wxTreeCtrl_GetSelection(self.this)
+    def GetChildrenCount(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetChildrenCount,(self,) + _args, _kwargs)

         return val
         return val

-    def HitTest(self,arg0):
-        val = controls2c.wxTreeCtrl_HitTest(self.this,arg0.this)
+    def GetFirstChild(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetFirstChild,(self,) + _args, _kwargs)

         return val
         return val

-    def InsertItem(self,arg0,arg1,*args):
-        val = apply(controls2c.wxTreeCtrl_InsertItem,(self.this,arg0,arg1.this,)+args)
+    def GetNextChild(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetNextChild,(self,) + _args, _kwargs)

         return val
         return val

-    def InsertItemString(self,arg0,arg1,*args):
-        val = apply(controls2c.wxTreeCtrl_InsertItemString,(self.this,arg0,arg1,)+args)
+    def GetNextSibling(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetNextSibling,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def ItemHasChildren(self,arg0):
-        val = controls2c.wxTreeCtrl_ItemHasChildren(self.this,arg0)
+    def GetPrevSibling(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetPrevSibling,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def ScrollTo(self,arg0):
-        val = controls2c.wxTreeCtrl_ScrollTo(self.this,arg0)
+    def GetFirstVisibleItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetFirstVisibleItem,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def SelectItem(self,arg0):
-        val = controls2c.wxTreeCtrl_SelectItem(self.this,arg0)
+    def GetNextVisible(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetNextVisible,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def SetIndent(self,arg0):
-        val = controls2c.wxTreeCtrl_SetIndent(self.this,arg0)
+    def GetPrevVisible(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetPrevVisible,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def SetImageList(self,arg0,*args):
-        val = apply(controls2c.wxTreeCtrl_SetImageList,(self.this,arg0,)+args)
+    def GetLastChild(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetLastChild,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def SetItem(self,arg0):
-        val = controls2c.wxTreeCtrl_SetItem(self.this,arg0.this)
+    def AddRoot(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_AddRoot,(self,) + _args, _kwargs)
+        if val: 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 PrependItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_PrependItem,(self,) + _args, _kwargs)
+        if val: 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 InsertItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_InsertItem,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def SetItemText(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_SetItemText(self.this,arg0,arg1)
+    def AppendItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_AppendItem,(self,) + _args, _kwargs)
+        if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1

         return val
         return val

-    def SetItemData(self,arg0,arg1):
-        val = controls2c.wxTreeCtrl_SetItemData(self.this,arg0,arg1)
+    def Delete(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_Delete,(self,) + _args, _kwargs)

         return val
         return val

-    def SortChildren(self,arg0):
-        val = controls2c.wxTreeCtrl_SortChildren(self.this,arg0)
+    def DeleteChildren(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_DeleteChildren,(self,) + _args, _kwargs)
+        return val
+    def DeleteAllItems(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_DeleteAllItems,(self,) + _args, _kwargs)
+        return val
+    def Expand(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_Expand,(self,) + _args, _kwargs)
+        return val
+    def Collapse(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_Collapse,(self,) + _args, _kwargs)
+        return val
+    def CollapseAndReset(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_CollapseAndReset,(self,) + _args, _kwargs)
+        return val
+    def Toggle(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_Toggle,(self,) + _args, _kwargs)
+        return val
+    def Unselect(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_Unselect,(self,) + _args, _kwargs)
+        return val
+    def UnselectAll(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_UnselectAll,(self,) + _args, _kwargs)
+        return val
+    def SelectItem(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SelectItem,(self,) + _args, _kwargs)
+        return val
+    def EnsureVisible(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_EnsureVisible,(self,) + _args, _kwargs)
+        return val
+    def ScrollTo(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_ScrollTo,(self,) + _args, _kwargs)
+        return val
+    def EditLabel(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_EditLabel,(self,) + _args, _kwargs)
+        if val: val = wxTextCtrlPtr(val) 
+        return val
+    def GetEditControl(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetEditControl,(self,) + _args, _kwargs)
+        if val: val = wxTextCtrlPtr(val) 
+        return val
+    def EndEditLabel(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_EndEditLabel,(self,) + _args, _kwargs)
+        return val
+    def SortChildren(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SortChildren,(self,) + _args, _kwargs)
+        return val
+    def SetItemBold(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemBold,(self,) + _args, _kwargs)
+        return val
+    def IsBold(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_IsBold,(self,) + _args, _kwargs)
+        return val
+    def HitTest(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_HitTest,(self,) + _args, _kwargs)
+        return val
+    def SetItemTextColour(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemTextColour,(self,) + _args, _kwargs)
+        return val
+    def SetItemBackgroundColour(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemBackgroundColour,(self,) + _args, _kwargs)
+        return val
+    def SetItemFont(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemFont,(self,) + _args, _kwargs)
+        return val
+    def SetItemDropHighlight(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemDropHighlight,(self,) + _args, _kwargs)
+        return val
+    def GetBoundingRect(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetBoundingRect,(self,) + _args, _kwargs)

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

-        return "<C wxTreeCtrl instance>"
+        return "<C wxTreeCtrl instance at %s>" % (self.this,)
+    
+    # Redefine a couple methods that SWIG gets a bit confused on...
+    def GetFirstChild(self,arg0,arg1):
+        val1, val2 = controls2c.wxTreeCtrl_GetFirstChild(self.this,arg0.this,arg1)
+        val1 = wxTreeItemIdPtr(val1)
+        val1.thisown = 1
+        return (val1,val2)
+    def GetNextChild(self,arg0,arg1):
+        val1, val2 = controls2c.wxTreeCtrl_GetNextChild(self.this,arg0.this,arg1)
+        val1 = wxTreeItemIdPtr(val1)
+        val1.thisown = 1
+        return (val1,val2)
+

 class wxTreeCtrl(wxTreeCtrlPtr):
 class wxTreeCtrl(wxTreeCtrlPtr):

-    def __init__(self,arg0,*args) :
-        argl = map(None,args)
-        try: argl[1] = argl[1].this
-        except: pass
-        try: argl[2] = argl[2].this
-        except: pass
-        args = tuple(argl)
-        self.this = apply(controls2c.new_wxTreeCtrl,(arg0.this,)+args)
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controls2c.new_wxTreeCtrl,_args,_kwargs)

         self.thisown = 1
         self.thisown = 1

-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)

 
 
 
 
 
 


@@ -561,20 +641,54 @@ class wxTreeCtrl(wxTreeCtrlPtr):
 
 #-------------- 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
+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_MASK_STATE = controls2c.wxLIST_MASK_STATE
+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
+wxTreeItemIcon_Normal = controls2c.wxTreeItemIcon_Normal
+wxTreeItemIcon_Selected = controls2c.wxTreeItemIcon_Selected
+wxTreeItemIcon_Expanded = controls2c.wxTreeItemIcon_Expanded
+wxTreeItemIcon_SelectedExpanded = controls2c.wxTreeItemIcon_SelectedExpanded
+wxTreeItemIcon_Max = controls2c.wxTreeItemIcon_Max

 wxTREE_HITTEST_ABOVE = controls2c.wxTREE_HITTEST_ABOVE
 wxTREE_HITTEST_BELOW = controls2c.wxTREE_HITTEST_BELOW
 wxTREE_HITTEST_NOWHERE = controls2c.wxTREE_HITTEST_NOWHERE
 wxTREE_HITTEST_ABOVE = controls2c.wxTREE_HITTEST_ABOVE
 wxTREE_HITTEST_BELOW = controls2c.wxTREE_HITTEST_BELOW
 wxTREE_HITTEST_NOWHERE = controls2c.wxTREE_HITTEST_NOWHERE


@@ -586,21 +700,6 @@ 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_ONITEMSTATEICON = controls2c.wxTREE_HITTEST_ONITEMSTATEICON
 wxTREE_HITTEST_TOLEFT = controls2c.wxTREE_HITTEST_TOLEFT
 wxTREE_HITTEST_TORIGHT = controls2c.wxTREE_HITTEST_TORIGHT

+wxTREE_HITTEST_ONITEMUPPERPART = controls2c.wxTREE_HITTEST_ONITEMUPPERPART
+wxTREE_HITTEST_ONITEMLOWERPART = controls2c.wxTREE_HITTEST_ONITEMLOWERPART

 wxTREE_HITTEST_ONITEM = controls2c.wxTREE_HITTEST_ONITEM
 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