correction for Mac OS compilation

[wxWidgets.git] / wxPython / src / gtk / controls2.py

diff --git a/wxPython/src/gtk/controls2.py b/wxPython/src/gtk/controls2.py
index 57faae2dbcd642577a9bc47373816b4d08a4755f..db98bc29b5617e3bfd0785b575dafbed555d65a1 100644 (file)
--- a/wxPython/src/gtk/controls2.py
+++ b/wxPython/src/gtk/controls2.py
@@ -57,7 +57,7 @@ class wxListItemAttr(wxListItemAttrPtr):
 
 
 
-class wxListItemPtr :
+class wxListItemPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -262,7 +262,6 @@ class wxListEventPtr(wxNotifyEventPtr):
         return val
     def GetItem(self, *_args, **_kwargs):
         val = apply(controls2c.wxListEvent_GetItem,(self,) + _args, _kwargs)
-        if val: val = wxListItemPtr(val) 
         return val
     def __setattr__(self,name,value):
         if name == "m_code" :
@@ -321,6 +320,7 @@ class wxListCtrlPtr(wxControlPtr):
         return val
     def AssignImageList(self, *_args, **_kwargs):
         val = apply(controls2c.wxListCtrl_AssignImageList,(self,) + _args, _kwargs)
+        _args[0].thisown = 0
         return val
     def DeleteItem(self, *_args, **_kwargs):
         val = apply(controls2c.wxListCtrl_DeleteItem,(self,) + _args, _kwargs)
@@ -363,14 +363,12 @@ class wxListCtrlPtr(wxControlPtr):
         return val
     def GetImageList(self, *_args, **_kwargs):
         val = apply(controls2c.wxListCtrl_GetImageList,(self,) + _args, _kwargs)
-        if val: val = wxImageListPtr(val) 
         return val
     def GetItemData(self, *_args, **_kwargs):
         val = apply(controls2c.wxListCtrl_GetItemData,(self,) + _args, _kwargs)
         return val
     def GetItem(self, *_args, **_kwargs):
         val = apply(controls2c.wxListCtrl_GetItem,(self,) + _args, _kwargs)
-        if val: val = wxListItemPtr(val) ; val.thisown = 1
         return val
     def GetItemPosition(self, *_args, **_kwargs):
         val = apply(controls2c.wxListCtrl_GetItemPosition,(self,) + _args, _kwargs)
@@ -501,7 +499,7 @@ class wxTreeItemId(wxTreeItemIdPtr):
 
 
 
-class wxTreeItemDataPtr :
+class wxTreeItemDataPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -568,6 +566,7 @@ class wxTreeCtrlPtr(wxControlPtr):
         return val
     def AssignImageList(self, *_args, **_kwargs):
         val = apply(controls2c.wxTreeCtrl_AssignImageList,(self,) + _args, _kwargs)
+        _args[0].thisown = 0
         return val
     def GetCount(self, *_args, **_kwargs):
         val = apply(controls2c.wxTreeCtrl_GetCount,(self,) + _args, _kwargs)
@@ -580,11 +579,9 @@ class wxTreeCtrlPtr(wxControlPtr):
         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)
@@ -869,6 +866,26 @@ wxEVT_COMMAND_LIST_COL_CLICK = controls2c.wxEVT_COMMAND_LIST_COL_CLICK
 wxEVT_COMMAND_LIST_ITEM_ACTIVATED = controls2c.wxEVT_COMMAND_LIST_ITEM_ACTIVATED
 wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK = controls2c.wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK
 wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK = controls2c.wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK
+wxLC_ICON = controls2c.wxLC_ICON
+wxLC_SMALL_ICON = controls2c.wxLC_SMALL_ICON
+wxLC_LIST = controls2c.wxLC_LIST
+wxLC_REPORT = controls2c.wxLC_REPORT
+wxLC_ALIGN_TOP = controls2c.wxLC_ALIGN_TOP
+wxLC_ALIGN_LEFT = controls2c.wxLC_ALIGN_LEFT
+wxLC_AUTOARRANGE = controls2c.wxLC_AUTOARRANGE
+wxLC_USER_TEXT = controls2c.wxLC_USER_TEXT
+wxLC_EDIT_LABELS = controls2c.wxLC_EDIT_LABELS
+wxLC_NO_HEADER = controls2c.wxLC_NO_HEADER
+wxLC_NO_SORT_HEADER = controls2c.wxLC_NO_SORT_HEADER
+wxLC_SINGLE_SEL = controls2c.wxLC_SINGLE_SEL
+wxLC_SORT_ASCENDING = controls2c.wxLC_SORT_ASCENDING
+wxLC_SORT_DESCENDING = controls2c.wxLC_SORT_DESCENDING
+wxLC_MASK_TYPE = controls2c.wxLC_MASK_TYPE
+wxLC_MASK_ALIGN = controls2c.wxLC_MASK_ALIGN
+wxLC_MASK_SORT = controls2c.wxLC_MASK_SORT
+wxLC_HRULES = controls2c.wxLC_HRULES
+wxLC_VRULES = controls2c.wxLC_VRULES
+wxLC_VIRTUAL = controls2c.wxLC_VIRTUAL
 wxTreeItemIcon_Normal = controls2c.wxTreeItemIcon_Normal
 wxTreeItemIcon_Selected = controls2c.wxTreeItemIcon_Selected
 wxTreeItemIcon_Expanded = controls2c.wxTreeItemIcon_Expanded
@@ -905,3 +922,4 @@ wxEVT_COMMAND_TREE_KEY_DOWN = controls2c.wxEVT_COMMAND_TREE_KEY_DOWN
 wxEVT_COMMAND_TREE_ITEM_ACTIVATED = controls2c.wxEVT_COMMAND_TREE_ITEM_ACTIVATED
 wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = controls2c.wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK
 wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = controls2c.wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK
+wxEVT_COMMAND_TREE_END_DRAG = controls2c.wxEVT_COMMAND_TREE_END_DRAG