X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..0e980f91092ded629a7b014ff0d2238b1c8940c5:/wxPython/src/msw/controls2.py diff --git a/wxPython/src/msw/controls2.py b/wxPython/src/msw/controls2.py index cc494e055b..c7490103de 100644 --- a/wxPython/src/msw/controls2.py +++ b/wxPython/src/msw/controls2.py @@ -57,7 +57,7 @@ class wxListItemAttr(wxListItemAttrPtr): -class wxListItemPtr : +class wxListItemPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -219,7 +219,7 @@ class wxListItem(wxListItemPtr): -class wxListEventPtr(wxCommandEventPtr): +class wxListEventPtr(wxNotifyEventPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -262,7 +262,6 @@ class wxListEventPtr(wxCommandEventPtr): 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" : @@ -319,6 +318,10 @@ class wxListCtrlPtr(wxControlPtr): def Arrange(self, *_args, **_kwargs): val = apply(controls2c.wxListCtrl_Arrange,(self,) + _args, _kwargs) 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) return val @@ -336,14 +339,12 @@ class wxListCtrlPtr(wxControlPtr): return val def EditLabel(self, *_args, **_kwargs): val = apply(controls2c.wxListCtrl_EditLabel,(self,) + _args, _kwargs) - if val: val = wxTextCtrlPtr(val) return val def EndEditLabel(self, *_args, **_kwargs): val = apply(controls2c.wxListCtrl_EndEditLabel,(self,) + _args, _kwargs) return val def GetEditControl(self, *_args, **_kwargs): val = apply(controls2c.wxListCtrl_GetEditControl,(self,) + _args, _kwargs) - if val: val = wxTextCtrlPtr(val) return val def EnsureVisible(self, *_args, **_kwargs): val = apply(controls2c.wxListCtrl_EnsureVisible,(self,) + _args, _kwargs) @@ -368,14 +369,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) @@ -416,8 +415,8 @@ class wxListCtrlPtr(wxControlPtr): def HitTest(self, *_args, **_kwargs): val = apply(controls2c.wxListCtrl_HitTest,(self,) + _args, _kwargs) return val - def InsertColumnWith(self, *_args, **_kwargs): - val = apply(controls2c.wxListCtrl_InsertColumnWith,(self,) + _args, _kwargs) + def InsertColumnInfo(self, *_args, **_kwargs): + val = apply(controls2c.wxListCtrl_InsertColumnInfo,(self,) + _args, _kwargs) return val def InsertColumn(self, *_args, **_kwargs): val = apply(controls2c.wxListCtrl_InsertColumn,(self,) + _args, _kwargs) @@ -513,7 +512,7 @@ class wxTreeItemId(wxTreeItemIdPtr): -class wxTreeItemDataPtr : +class wxTreeItemDataPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -578,6 +577,10 @@ class wxTreeCtrlPtr(wxControlPtr): def _setSelf(self, *_args, **_kwargs): val = apply(controls2c.wxTreeCtrl__setSelf,(self,) + _args, _kwargs) 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) return val @@ -589,11 +592,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) @@ -759,11 +760,9 @@ class wxTreeCtrlPtr(wxControlPtr): 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) @@ -876,6 +875,42 @@ 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 +wxEVT_COMMAND_LIST_BEGIN_DRAG = controls2c.wxEVT_COMMAND_LIST_BEGIN_DRAG +wxEVT_COMMAND_LIST_BEGIN_RDRAG = controls2c.wxEVT_COMMAND_LIST_BEGIN_RDRAG +wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = controls2c.wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT +wxEVT_COMMAND_LIST_END_LABEL_EDIT = controls2c.wxEVT_COMMAND_LIST_END_LABEL_EDIT +wxEVT_COMMAND_LIST_DELETE_ITEM = controls2c.wxEVT_COMMAND_LIST_DELETE_ITEM +wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = controls2c.wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS +wxEVT_COMMAND_LIST_GET_INFO = controls2c.wxEVT_COMMAND_LIST_GET_INFO +wxEVT_COMMAND_LIST_SET_INFO = controls2c.wxEVT_COMMAND_LIST_SET_INFO +wxEVT_COMMAND_LIST_ITEM_SELECTED = controls2c.wxEVT_COMMAND_LIST_ITEM_SELECTED +wxEVT_COMMAND_LIST_ITEM_DESELECTED = controls2c.wxEVT_COMMAND_LIST_ITEM_DESELECTED +wxEVT_COMMAND_LIST_KEY_DOWN = controls2c.wxEVT_COMMAND_LIST_KEY_DOWN +wxEVT_COMMAND_LIST_INSERT_ITEM = controls2c.wxEVT_COMMAND_LIST_INSERT_ITEM +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 @@ -895,3 +930,21 @@ 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 +wxEVT_COMMAND_TREE_BEGIN_DRAG = controls2c.wxEVT_COMMAND_TREE_BEGIN_DRAG +wxEVT_COMMAND_TREE_BEGIN_RDRAG = controls2c.wxEVT_COMMAND_TREE_BEGIN_RDRAG +wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = controls2c.wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT +wxEVT_COMMAND_TREE_END_LABEL_EDIT = controls2c.wxEVT_COMMAND_TREE_END_LABEL_EDIT +wxEVT_COMMAND_TREE_DELETE_ITEM = controls2c.wxEVT_COMMAND_TREE_DELETE_ITEM +wxEVT_COMMAND_TREE_GET_INFO = controls2c.wxEVT_COMMAND_TREE_GET_INFO +wxEVT_COMMAND_TREE_SET_INFO = controls2c.wxEVT_COMMAND_TREE_SET_INFO +wxEVT_COMMAND_TREE_ITEM_EXPANDED = controls2c.wxEVT_COMMAND_TREE_ITEM_EXPANDED +wxEVT_COMMAND_TREE_ITEM_EXPANDING = controls2c.wxEVT_COMMAND_TREE_ITEM_EXPANDING +wxEVT_COMMAND_TREE_ITEM_COLLAPSED = controls2c.wxEVT_COMMAND_TREE_ITEM_COLLAPSED +wxEVT_COMMAND_TREE_ITEM_COLLAPSING = controls2c.wxEVT_COMMAND_TREE_ITEM_COLLAPSING +wxEVT_COMMAND_TREE_SEL_CHANGED = controls2c.wxEVT_COMMAND_TREE_SEL_CHANGED +wxEVT_COMMAND_TREE_SEL_CHANGING = controls2c.wxEVT_COMMAND_TREE_SEL_CHANGING +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