X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3215336ed098573ced5295dea1e7efe5405d89b7..bc50a2ae95f2ab36b16ceedc7902a9cbfb2f70ea:/wxPython/src/msw/_controls.py diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py index 98c7a4ae63..142315c014 100644 --- a/wxPython/src/msw/_controls.py +++ b/wxPython/src/msw/_controls.py @@ -1,4 +1,4 @@ -# This file was created automatically by SWIG. +# This file was created automatically by SWIG 1.3.27. # Don't modify this file, modify the SWIG interface instead. import _controls_ @@ -240,6 +240,14 @@ class BitmapButton(Button): """ return _controls_.BitmapButton_GetBitmapSelected(*args, **kwargs) + def GetBitmapHover(*args, **kwargs): + """ + GetBitmapHover(self) -> Bitmap + + Returns the bitmap used when the mouse is over the button, may be invalid. + """ + return _controls_.BitmapButton_GetBitmapHover(*args, **kwargs) + def SetBitmapDisabled(*args, **kwargs): """ SetBitmapDisabled(self, Bitmap bitmap) @@ -273,6 +281,16 @@ class BitmapButton(Button): """ return _controls_.BitmapButton_SetBitmapLabel(*args, **kwargs) + def SetBitmapHover(*args, **kwargs): + """ + SetBitmapHover(self, Bitmap hover) + + Sets the bitmap to be shown when the mouse is over the button. This function + is new since wxWidgets version 2.7.0 and the hover bitmap is currently only + supported in wxMSW. + """ + return _controls_.BitmapButton_SetBitmapHover(*args, **kwargs) + def SetMargins(*args, **kwargs): """SetMargins(self, int x, int y)""" return _controls_.BitmapButton_SetMargins(*args, **kwargs) @@ -481,7 +499,7 @@ class Choice(_core.ControlWithItems): def __init__(self, *args, **kwargs): """ __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - List choices=[], long style=0, Validator validator=DefaultValidator, + List choices=EmptyList, long style=0, Validator validator=DefaultValidator, String name=ChoiceNameStr) -> Choice Create and show a Choice control @@ -495,13 +513,26 @@ class Choice(_core.ControlWithItems): def Create(*args, **kwargs): """ Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, - List choices=[], long style=0, Validator validator=DefaultValidator, + List choices=EmptyList, long style=0, Validator validator=DefaultValidator, String name=ChoiceNameStr) -> bool Actually create the GUI Choice control for 2-phase creation """ return _controls_.Choice_Create(*args, **kwargs) + def GetCurrentSelection(*args, **kwargs): + """ + GetCurrentSelection(self) -> int + + Unlike `GetSelection` which only returns the accepted selection value, + i.e. the selection in the control once the user closes the dropdown + list, this function returns the current selection. That is, while the + dropdown list is shown, it returns the currently selected item in + it. When it is not shown, its result is the same as for the other + function. + """ + return _controls_.Choice_GetCurrentSelection(*args, **kwargs) + def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -573,7 +604,7 @@ class ComboBox(Choice): """ __init__(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, Size size=DefaultSize, - List choices=[], long style=0, Validator validator=DefaultValidator, + List choices=EmptyList, long style=0, Validator validator=DefaultValidator, String name=ComboBoxNameStr) -> ComboBox Constructor, creates and shows a ComboBox control. @@ -588,7 +619,7 @@ class ComboBox(Choice): """ Create(Window parent, int id, String value=EmptyString, Point pos=DefaultPosition, Size size=DefaultSize, - List choices=[], long style=0, Validator validator=DefaultValidator, + List choices=EmptyList, long style=0, Validator validator=DefaultValidator, String name=ChoiceNameStr) -> bool Actually create the GUI wxComboBox control for 2-phase creation @@ -689,6 +720,19 @@ class ComboBox(Choice): """ return _controls_.ComboBox_GetMark(*args, **kwargs) + def GetCurrentSelection(*args, **kwargs): + """ + GetCurrentSelection(self) -> int + + Unlike `GetSelection` which only returns the accepted selection value, + i.e. the selection in the control once the user closes the dropdown + list, this function returns the current selection. That is, while the + dropdown list is shown, it returns the currently selected item in + it. When it is not shown, its result is the same as for the other + function. + """ + return _controls_.ComboBox_GetCurrentSelection(*args, **kwargs) + def SetStringSelection(*args, **kwargs): """ SetStringSelection(self, String string) -> bool @@ -1167,6 +1211,17 @@ class StaticText(_core.Control): """ return _controls_.StaticText_Create(*args, **kwargs) + def Wrap(*args, **kwargs): + """ + Wrap(self, int width) + + This functions wraps the control's label so that each of its lines + becomes at most ``width`` pixels wide if possible (the lines are + broken at words boundaries so it might not be the case if words are + too long). If ``width`` is negative, no wrapping is done. + """ + return _controls_.StaticText_Wrap(*args, **kwargs) + def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -2125,8 +2180,6 @@ class ScrollBar(_core.Control): """ SetScrollbar(self, int position, int thumbSize, int range, int pageSize, bool refresh=True) - - Sets the scrollbar properties of a built-in scrollbar. """ return _controls_.ScrollBar_SetScrollbar(*args, **kwargs) @@ -2655,6 +2708,7 @@ def RadioButton_GetClassDefaultAttributes(*args, **kwargs): SL_HORIZONTAL = _controls_.SL_HORIZONTAL SL_VERTICAL = _controls_.SL_VERTICAL +SL_TICKS = _controls_.SL_TICKS SL_AUTOTICKS = _controls_.SL_AUTOTICKS SL_LABELS = _controls_.SL_LABELS SL_LEFT = _controls_.SL_LEFT @@ -2926,6 +2980,12 @@ def ToggleButton_GetClassDefaultAttributes(*args, **kwargs): #--------------------------------------------------------------------------- +BK_DEFAULT = _controls_.BK_DEFAULT +BK_TOP = _controls_.BK_TOP +BK_BOTTOM = _controls_.BK_BOTTOM +BK_LEFT = _controls_.BK_LEFT +BK_RIGHT = _controls_.BK_RIGHT +BK_ALIGN_MASK = _controls_.BK_ALIGN_MASK class BookCtrlBase(_core.Control): """Proxy of C++ BookCtrlBase class""" def __init__(self): raise RuntimeError, "No constructor defined" @@ -2983,6 +3043,26 @@ class BookCtrlBase(_core.Control): """CalcSizeFromPage(self, Size sizePage) -> Size""" return _controls_.BookCtrlBase_CalcSizeFromPage(*args, **kwargs) + def GetInternalBorder(*args, **kwargs): + """GetInternalBorder(self) -> unsigned int""" + return _controls_.BookCtrlBase_GetInternalBorder(*args, **kwargs) + + def SetInternalBorder(*args, **kwargs): + """SetInternalBorder(self, unsigned int internalBorder)""" + return _controls_.BookCtrlBase_SetInternalBorder(*args, **kwargs) + + def IsVertical(*args, **kwargs): + """IsVertical(self) -> bool""" + return _controls_.BookCtrlBase_IsVertical(*args, **kwargs) + + def SetFitToCurrentPage(*args, **kwargs): + """SetFitToCurrentPage(self, bool fit)""" + return _controls_.BookCtrlBase_SetFitToCurrentPage(*args, **kwargs) + + def GetFitToCurrentPage(*args, **kwargs): + """GetFitToCurrentPage(self) -> bool""" + return _controls_.BookCtrlBase_GetFitToCurrentPage(*args, **kwargs) + def DeletePage(*args, **kwargs): """DeletePage(self, size_t n) -> bool""" return _controls_.BookCtrlBase_DeletePage(*args, **kwargs) @@ -3072,7 +3152,12 @@ class BookCtrlBaseEvent(_core.NotifyEvent): self.thisown = 1 del newobj.thisown def GetSelection(*args, **kwargs): - """GetSelection(self) -> int""" + """ + GetSelection(self) -> int + + Returns item index for a listbox or choice selection event (not valid + for a deselection). + """ return _controls_.BookCtrlBaseEvent_GetSelection(*args, **kwargs) def SetSelection(*args, **kwargs): @@ -3241,7 +3326,7 @@ class NotebookPage(wx.Panel): """ There is an old (and apparently unsolvable) bug when placing a window with a nonstandard background colour in a wx.Notebook on - wxGTK, as the notbooks's background colour would always be used + wxGTK1, as the notbooks's background colour would always be used when the window is refreshed. The solution is to place a panel in the notbook and the coloured window on the panel, sized to cover the panel. This simple class does that for you, just put an @@ -3295,10 +3380,6 @@ class Listbook(BookCtrlBase): """ return _controls_.Listbook_Create(*args, **kwargs) - def IsVertical(*args, **kwargs): - """IsVertical(self) -> bool""" - return _controls_.Listbook_IsVertical(*args, **kwargs) - def GetListView(*args, **kwargs): """GetListView(self) -> ListView""" return _controls_.Listbook_GetListView(*args, **kwargs) @@ -3371,9 +3452,9 @@ class Choicebook(BookCtrlBase): """ return _controls_.Choicebook_Create(*args, **kwargs) - def IsVertical(*args, **kwargs): - """IsVertical(self) -> bool""" - return _controls_.Choicebook_IsVertical(*args, **kwargs) + def GetChoiceCtrl(*args, **kwargs): + """GetChoiceCtrl(self) -> Choice""" + return _controls_.Choicebook_GetChoiceCtrl(*args, **kwargs) def DeleteAllPages(*args, **kwargs): """DeleteAllPages(self) -> bool""" @@ -3421,96 +3502,193 @@ EVT_CHOICEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_CHOICEBOOK_PAGE_C #--------------------------------------------------------------------------- -class BookCtrlSizer(_core.Sizer): - """Proxy of C++ BookCtrlSizer class""" +class Treebook(BookCtrlBase): + """Proxy of C++ Treebook class""" def __repr__(self): - return "<%s.%s; proxy of C++ wxBookCtrlSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + return "<%s.%s; proxy of C++ wxTreebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(self, BookCtrlBase nb) -> BookCtrlSizer""" - newobj = _controls_.new_BookCtrlSizer(*args, **kwargs) + """ + __init__(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=BK_DEFAULT, + String name=EmptyString) -> Treebook + """ + newobj = _controls_.new_Treebook(*args, **kwargs) self.this = newobj.this self.thisown = 1 del newobj.thisown self._setOORInfo(self) - def RecalcSizes(*args, **kwargs): + def Create(*args, **kwargs): """ - RecalcSizes(self) - - Using the sizes calculated by `CalcMin` reposition and resize all the - items managed by this sizer. You should not need to call this directly as - it is called by `Layout`. + Create(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=BK_DEFAULT, + String name=EmptyString) -> bool """ - return _controls_.BookCtrlSizer_RecalcSizes(*args, **kwargs) + return _controls_.Treebook_Create(*args, **kwargs) - def CalcMin(*args, **kwargs): + def InsertPage(*args, **kwargs): + """ + InsertPage(self, size_t pos, Window page, String text, bool select=False, + int imageId=NOT_FOUND) -> bool """ - CalcMin(self) -> Size + return _controls_.Treebook_InsertPage(*args, **kwargs) - This method is where the sizer will do the actual calculation of its - children's minimal sizes. You should not need to call this directly as - it is called by `Layout`. + def InsertSubPage(*args, **kwargs): + """ + InsertSubPage(self, size_t pos, Window page, String text, bool select=False, + int imageId=NOT_FOUND) -> bool """ - return _controls_.BookCtrlSizer_CalcMin(*args, **kwargs) + return _controls_.Treebook_InsertSubPage(*args, **kwargs) - def GetControl(*args, **kwargs): - """GetControl(self) -> BookCtrlBase""" - return _controls_.BookCtrlSizer_GetControl(*args, **kwargs) + def AddPage(*args, **kwargs): + """AddPage(self, Window page, String text, bool select=False, int imageId=NOT_FOUND) -> bool""" + return _controls_.Treebook_AddPage(*args, **kwargs) + + def AddSubPage(*args, **kwargs): + """AddSubPage(self, Window page, String text, bool select=False, int imageId=NOT_FOUND) -> bool""" + return _controls_.Treebook_AddSubPage(*args, **kwargs) + + def DeletePage(*args, **kwargs): + """DeletePage(self, size_t pos) -> bool""" + return _controls_.Treebook_DeletePage(*args, **kwargs) + + def IsNodeExpanded(*args, **kwargs): + """IsNodeExpanded(self, size_t pos) -> bool""" + return _controls_.Treebook_IsNodeExpanded(*args, **kwargs) + + def ExpandNode(*args, **kwargs): + """ExpandNode(self, size_t pos, bool expand=True) -> bool""" + return _controls_.Treebook_ExpandNode(*args, **kwargs) + + def CollapseNode(*args, **kwargs): + """CollapseNode(self, size_t pos) -> bool""" + return _controls_.Treebook_CollapseNode(*args, **kwargs) + def GetPageParent(*args, **kwargs): + """GetPageParent(self, size_t pos) -> int""" + return _controls_.Treebook_GetPageParent(*args, **kwargs) -class BookCtrlSizerPtr(BookCtrlSizer): + def GetTreeCtrl(*args, **kwargs): + """GetTreeCtrl(self) -> wxTreeCtrl""" + return _controls_.Treebook_GetTreeCtrl(*args, **kwargs) + + +class TreebookPtr(Treebook): def __init__(self, this): self.this = this if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = BookCtrlSizer -_controls_.BookCtrlSizer_swigregister(BookCtrlSizerPtr) + self.__class__ = Treebook +_controls_.Treebook_swigregister(TreebookPtr) + +def PreTreebook(*args, **kwargs): + """PreTreebook() -> Treebook""" + val = _controls_.new_PreTreebook(*args, **kwargs) + val.thisown = 1 + return val -class NotebookSizer(_core.Sizer): - """Proxy of C++ NotebookSizer class""" +class TreebookEvent(BookCtrlBaseEvent): + """Proxy of C++ TreebookEvent class""" def __repr__(self): - return "<%s.%s; proxy of C++ wxNotebookSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + return "<%s.%s; proxy of C++ wxTreebookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(self, Notebook nb) -> NotebookSizer""" - newobj = _controls_.new_NotebookSizer(*args, **kwargs) + """ + __init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND, + int nOldSel=NOT_FOUND) -> TreebookEvent + """ + newobj = _controls_.new_TreebookEvent(*args, **kwargs) self.this = newobj.this self.thisown = 1 del newobj.thisown - self._setOORInfo(self) - def RecalcSizes(*args, **kwargs): - """ - RecalcSizes(self) +class TreebookEventPtr(TreebookEvent): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = TreebookEvent +_controls_.TreebookEvent_swigregister(TreebookEventPtr) + +wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED +wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING +wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED = _controls_.wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED +wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED = _controls_.wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED +EVT_TREEBOOK_PAGE_CHANGED= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, 1 ) +EVT_TREEBOOK_PAGE_CHANGING= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, 1) +EVT_TREEBOOK_NODE_COLLAPSED= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, 1 ) +EVT_TREEBOOK_NODE_EXPANDED= wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED, 1 ) - Using the sizes calculated by `CalcMin` reposition and resize all the - items managed by this sizer. You should not need to call this directly as - it is called by `Layout`. - """ - return _controls_.NotebookSizer_RecalcSizes(*args, **kwargs) +#--------------------------------------------------------------------------- - def CalcMin(*args, **kwargs): +class Toolbook(BookCtrlBase): + """Proxy of C++ Toolbook class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxToolbook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=BK_DEFAULT, + String name=EmptyString) -> Toolbook """ - CalcMin(self) -> Size + newobj = _controls_.new_Toolbook(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + self._setOORInfo(self) - This method is where the sizer will do the actual calculation of its - children's minimal sizes. You should not need to call this directly as - it is called by `Layout`. + def Create(*args, **kwargs): + """ + Create(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, + long style=0, String name=wxEmptyString) -> bool """ - return _controls_.NotebookSizer_CalcMin(*args, **kwargs) + return _controls_.Toolbook_Create(*args, **kwargs) - def GetNotebook(*args, **kwargs): - """GetNotebook(self) -> Notebook""" - return _controls_.NotebookSizer_GetNotebook(*args, **kwargs) + def GetToolBar(*args, **kwargs): + """GetToolBar(self) -> ToolBarBase""" + return _controls_.Toolbook_GetToolBar(*args, **kwargs) + def Realize(*args, **kwargs): + """Realize(self)""" + return _controls_.Toolbook_Realize(*args, **kwargs) -class NotebookSizerPtr(NotebookSizer): + +class ToolbookPtr(Toolbook): def __init__(self, this): self.this = this if not hasattr(self,"thisown"): self.thisown = 0 - self.__class__ = NotebookSizer -_controls_.NotebookSizer_swigregister(NotebookSizerPtr) + self.__class__ = Toolbook +_controls_.Toolbook_swigregister(ToolbookPtr) + +def PreToolbook(*args, **kwargs): + """PreToolbook() -> Toolbook""" + val = _controls_.new_PreToolbook(*args, **kwargs) + val.thisown = 1 + return val + +class ToolbookEvent(BookCtrlBaseEvent): + """Proxy of C++ ToolbookEvent class""" + def __repr__(self): + return "<%s.%s; proxy of C++ wxToolbookEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """ + __init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND, + int nOldSel=NOT_FOUND) -> ToolbookEvent + """ + newobj = _controls_.new_ToolbookEvent(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + +class ToolbookEventPtr(ToolbookEvent): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = ToolbookEvent +_controls_.ToolbookEvent_swigregister(ToolbookEventPtr) + +wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = _controls_.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED +wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = _controls_.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING +EVT_TOOLBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED, 1) +EVT_TOOLBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, 1) -NotebookSizer.__init__ = wx._deprecated(NotebookSizer.__init__, "NotebookSizer is no longer needed.") -BookCtrlSizer.__init__ = wx._deprecated(BookCtrlSizer.__init__, "BookCtrlSizer is no longer needed.") #--------------------------------------------------------------------------- TOOL_STYLE_BUTTON = _controls_.TOOL_STYLE_BUTTON @@ -4146,6 +4324,12 @@ class ListItemAttr(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_controls_.delete_ListItemAttr): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def SetTextColour(*args, **kwargs): """SetTextColour(self, Colour colText)""" return _controls_.ListItemAttr_SetTextColour(*args, **kwargs) @@ -4182,9 +4366,15 @@ class ListItemAttr(object): """GetFont(self) -> Font""" return _controls_.ListItemAttr_GetFont(*args, **kwargs) + def AssignFrom(*args, **kwargs): + """AssignFrom(self, ListItemAttr source)""" + return _controls_.ListItemAttr_AssignFrom(*args, **kwargs) + def Destroy(*args, **kwargs): """Destroy(self)""" - return _controls_.ListItemAttr_Destroy(*args, **kwargs) + val = _controls_.ListItemAttr_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class ListItemAttrPtr(ListItemAttr): @@ -4451,16 +4641,16 @@ wxEVT_COMMAND_LIST_COL_BEGIN_DRAG = _controls_.wxEVT_COMMAND_LIST_COL_BEGIN_DRAG wxEVT_COMMAND_LIST_COL_DRAGGING = _controls_.wxEVT_COMMAND_LIST_COL_DRAGGING wxEVT_COMMAND_LIST_COL_END_DRAG = _controls_.wxEVT_COMMAND_LIST_COL_END_DRAG wxEVT_COMMAND_LIST_ITEM_FOCUSED = _controls_.wxEVT_COMMAND_LIST_ITEM_FOCUSED -wxEVT_COMMAND_LIST_GET_INFO = _controls_.wxEVT_COMMAND_LIST_GET_INFO -wxEVT_COMMAND_LIST_SET_INFO = _controls_.wxEVT_COMMAND_LIST_SET_INFO EVT_LIST_BEGIN_DRAG = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_DRAG , 1) EVT_LIST_BEGIN_RDRAG = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_RDRAG , 1) EVT_LIST_BEGIN_LABEL_EDIT = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT , 1) EVT_LIST_END_LABEL_EDIT = wx.PyEventBinder(wxEVT_COMMAND_LIST_END_LABEL_EDIT , 1) EVT_LIST_DELETE_ITEM = wx.PyEventBinder(wxEVT_COMMAND_LIST_DELETE_ITEM , 1) EVT_LIST_DELETE_ALL_ITEMS = wx.PyEventBinder(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS , 1) -EVT_LIST_GET_INFO = wx.PyEventBinder(wxEVT_COMMAND_LIST_GET_INFO , 1) -EVT_LIST_SET_INFO = wx.PyEventBinder(wxEVT_COMMAND_LIST_SET_INFO , 1) + + + + EVT_LIST_ITEM_SELECTED = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_SELECTED , 1) EVT_LIST_ITEM_DESELECTED = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_DESELECTED , 1) EVT_LIST_KEY_DOWN = wx.PyEventBinder(wxEVT_COMMAND_LIST_KEY_DOWN , 1) @@ -4476,8 +4666,9 @@ EVT_LIST_COL_DRAGGING = wx.PyEventBinder(wxEVT_COMMAND_LIST_COL_DRAGGING EVT_LIST_COL_END_DRAG = wx.PyEventBinder(wxEVT_COMMAND_LIST_COL_END_DRAG , 1) EVT_LIST_ITEM_FOCUSED = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED , 1) -EVT_LIST_GET_INFO = wx._deprecated(EVT_LIST_GET_INFO) -EVT_LIST_SET_INFO = wx._deprecated(EVT_LIST_SET_INFO) + + + #--------------------------------------------------------------------------- @@ -4764,7 +4955,7 @@ class ListCtrl(_core.Control): return _controls_.ListCtrl_InsertItem(*args, **kwargs) def InsertStringItem(*args, **kwargs): - """InsertStringItem(self, long index, String label) -> long""" + """InsertStringItem(self, long index, String label, int imageIndex=-1) -> long""" return _controls_.ListCtrl_InsertStringItem(*args, **kwargs) def InsertImageItem(*args, **kwargs): @@ -4775,10 +4966,11 @@ class ListCtrl(_core.Control): """InsertImageStringItem(self, long index, String label, int imageIndex) -> long""" return _controls_.ListCtrl_InsertImageStringItem(*args, **kwargs) - def InsertColumnInfo(*args, **kwargs): - """InsertColumnInfo(self, long col, ListItem info) -> long""" - return _controls_.ListCtrl_InsertColumnInfo(*args, **kwargs) + def InsertColumnItem(*args, **kwargs): + """InsertColumnItem(self, long col, ListItem info) -> long""" + return _controls_.ListCtrl_InsertColumnItem(*args, **kwargs) + InsertColumnInfo = InsertColumnItem def InsertColumn(*args, **kwargs): """ InsertColumn(self, long col, String heading, int format=LIST_FORMAT_LEFT, @@ -4810,6 +5002,14 @@ class ListCtrl(_core.Control): """GetItemBackgroundColour(self, long item) -> Colour""" return _controls_.ListCtrl_GetItemBackgroundColour(*args, **kwargs) + def SetItemFont(*args, **kwargs): + """SetItemFont(self, long item, Font f)""" + return _controls_.ListCtrl_SetItemFont(*args, **kwargs) + + def GetItemFont(*args, **kwargs): + """GetItemFont(self, long item) -> Font""" + return _controls_.ListCtrl_GetItemFont(*args, **kwargs) + # # Some helpers... def Select(self, idx, on=1): @@ -5089,6 +5289,12 @@ class TreeItemData(object): self.this = newobj.this self.thisown = 1 del newobj.thisown + def __del__(self, destroy=_controls_.delete_TreeItemData): + """__del__(self)""" + try: + if self.thisown: destroy(self) + except: pass + def GetData(*args, **kwargs): """GetData(self) -> PyObject""" return _controls_.TreeItemData_GetData(*args, **kwargs) @@ -5107,7 +5313,9 @@ class TreeItemData(object): def Destroy(*args, **kwargs): """Destroy(self)""" - return _controls_.TreeItemData_Destroy(*args, **kwargs) + val = _controls_.TreeItemData_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class TreeItemDataPtr(TreeItemData): @@ -5832,89 +6040,254 @@ class PyControl(_core.Control): """SetBestSize(self, Size size)""" return _controls_.PyControl_SetBestSize(*args, **kwargs) - def base_DoMoveWindow(*args, **kwargs): - """base_DoMoveWindow(self, int x, int y, int width, int height)""" - return _controls_.PyControl_base_DoMoveWindow(*args, **kwargs) + def DoEraseBackground(*args, **kwargs): + """DoEraseBackground(self, DC dc) -> bool""" + return _controls_.PyControl_DoEraseBackground(*args, **kwargs) + + def DoMoveWindow(*args, **kwargs): + """DoMoveWindow(self, int x, int y, int width, int height)""" + return _controls_.PyControl_DoMoveWindow(*args, **kwargs) + + def DoSetSize(*args, **kwargs): + """DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)""" + return _controls_.PyControl_DoSetSize(*args, **kwargs) + + def DoSetClientSize(*args, **kwargs): + """DoSetClientSize(self, int width, int height)""" + return _controls_.PyControl_DoSetClientSize(*args, **kwargs) - def base_DoSetSize(*args, **kwargs): - """base_DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)""" - return _controls_.PyControl_base_DoSetSize(*args, **kwargs) + def DoSetVirtualSize(*args, **kwargs): + """DoSetVirtualSize(self, int x, int y)""" + return _controls_.PyControl_DoSetVirtualSize(*args, **kwargs) - def base_DoSetClientSize(*args, **kwargs): - """base_DoSetClientSize(self, int width, int height)""" - return _controls_.PyControl_base_DoSetClientSize(*args, **kwargs) + def DoGetSize(*args, **kwargs): + """DoGetSize() -> (width, height)""" + return _controls_.PyControl_DoGetSize(*args, **kwargs) - def base_DoSetVirtualSize(*args, **kwargs): - """base_DoSetVirtualSize(self, int x, int y)""" - return _controls_.PyControl_base_DoSetVirtualSize(*args, **kwargs) + def DoGetClientSize(*args, **kwargs): + """DoGetClientSize() -> (width, height)""" + return _controls_.PyControl_DoGetClientSize(*args, **kwargs) - def base_DoGetSize(*args, **kwargs): - """base_DoGetSize() -> (width, height)""" - return _controls_.PyControl_base_DoGetSize(*args, **kwargs) + def DoGetPosition(*args, **kwargs): + """DoGetPosition() -> (x,y)""" + return _controls_.PyControl_DoGetPosition(*args, **kwargs) - def base_DoGetClientSize(*args, **kwargs): - """base_DoGetClientSize() -> (width, height)""" - return _controls_.PyControl_base_DoGetClientSize(*args, **kwargs) + def DoGetVirtualSize(*args, **kwargs): + """DoGetVirtualSize(self) -> Size""" + return _controls_.PyControl_DoGetVirtualSize(*args, **kwargs) - def base_DoGetPosition(*args, **kwargs): - """base_DoGetPosition() -> (x,y)""" - return _controls_.PyControl_base_DoGetPosition(*args, **kwargs) + def DoGetBestSize(*args, **kwargs): + """DoGetBestSize(self) -> Size""" + return _controls_.PyControl_DoGetBestSize(*args, **kwargs) - def base_DoGetVirtualSize(*args, **kwargs): - """base_DoGetVirtualSize(self) -> Size""" - return _controls_.PyControl_base_DoGetVirtualSize(*args, **kwargs) + def InitDialog(*args, **kwargs): + """ + InitDialog(self) + + Sends an EVT_INIT_DIALOG event, whose handler usually transfers data + to the dialog via validators. + """ + return _controls_.PyControl_InitDialog(*args, **kwargs) + + def TransferDataToWindow(*args, **kwargs): + """ + TransferDataToWindow(self) -> bool + + Transfers values to child controls from data areas specified by their + validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra + style flag set, the method will also call TransferDataToWindow() of + all child windows. + """ + return _controls_.PyControl_TransferDataToWindow(*args, **kwargs) + + def TransferDataFromWindow(*args, **kwargs): + """ + TransferDataFromWindow(self) -> bool + + Transfers values from child controls to data areas specified by their + validators. Returns false if a transfer failed. If the window has + wx.WS_EX_VALIDATE_RECURSIVELY extra style flag set, the method will + also call TransferDataFromWindow() of all child windows. + """ + return _controls_.PyControl_TransferDataFromWindow(*args, **kwargs) + + def Validate(*args, **kwargs): + """ + Validate(self) -> bool + + Validates the current values of the child controls using their + validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra + style flag set, the method will also call Validate() of all child + windows. Returns false if any of the validations failed. + """ + return _controls_.PyControl_Validate(*args, **kwargs) + + def AcceptsFocus(*args, **kwargs): + """ + AcceptsFocus(self) -> bool + + Can this window have focus? + """ + return _controls_.PyControl_AcceptsFocus(*args, **kwargs) + + def AcceptsFocusFromKeyboard(*args, **kwargs): + """ + AcceptsFocusFromKeyboard(self) -> bool - def base_DoGetBestSize(*args, **kwargs): - """base_DoGetBestSize(self) -> Size""" - return _controls_.PyControl_base_DoGetBestSize(*args, **kwargs) + Can this window be given focus by keyboard navigation? if not, the + only way to give it focus (provided it accepts it at all) is to click + it. + """ + return _controls_.PyControl_AcceptsFocusFromKeyboard(*args, **kwargs) + + def GetMaxSize(*args, **kwargs): + """GetMaxSize(self) -> Size""" + return _controls_.PyControl_GetMaxSize(*args, **kwargs) - def base_InitDialog(*args, **kwargs): - """base_InitDialog(self)""" - return _controls_.PyControl_base_InitDialog(*args, **kwargs) + def AddChild(*args, **kwargs): + """ + AddChild(self, Window child) - def base_TransferDataToWindow(*args, **kwargs): - """base_TransferDataToWindow(self) -> bool""" - return _controls_.PyControl_base_TransferDataToWindow(*args, **kwargs) + Adds a child window. This is called automatically by window creation + functions so should not be required by the application programmer. + """ + return _controls_.PyControl_AddChild(*args, **kwargs) - def base_TransferDataFromWindow(*args, **kwargs): - """base_TransferDataFromWindow(self) -> bool""" - return _controls_.PyControl_base_TransferDataFromWindow(*args, **kwargs) + def RemoveChild(*args, **kwargs): + """ + RemoveChild(self, Window child) - def base_Validate(*args, **kwargs): - """base_Validate(self) -> bool""" - return _controls_.PyControl_base_Validate(*args, **kwargs) + Removes a child window. This is called automatically by window + deletion functions so should not be required by the application + programmer. + """ + return _controls_.PyControl_RemoveChild(*args, **kwargs) + + def ShouldInheritColours(*args, **kwargs): + """ + ShouldInheritColours(self) -> bool + + Return true from here to allow the colours of this window to be + changed by InheritAttributes, returning false forbids inheriting them + from the parent window. + + The base class version returns false, but this method is overridden in + wxControl where it returns true. + """ + return _controls_.PyControl_ShouldInheritColours(*args, **kwargs) - def base_AcceptsFocus(*args, **kwargs): - """base_AcceptsFocus(self) -> bool""" - return _controls_.PyControl_base_AcceptsFocus(*args, **kwargs) + def GetDefaultAttributes(*args, **kwargs): + """GetDefaultAttributes(self) -> VisualAttributes""" + return _controls_.PyControl_GetDefaultAttributes(*args, **kwargs) - def base_AcceptsFocusFromKeyboard(*args, **kwargs): - """base_AcceptsFocusFromKeyboard(self) -> bool""" - return _controls_.PyControl_base_AcceptsFocusFromKeyboard(*args, **kwargs) + def OnInternalIdle(*args, **kwargs): + """OnInternalIdle(self)""" + return _controls_.PyControl_OnInternalIdle(*args, **kwargs) - def base_GetMaxSize(*args, **kwargs): - """base_GetMaxSize(self) -> Size""" - return _controls_.PyControl_base_GetMaxSize(*args, **kwargs) + def base_DoMoveWindow(*args, **kw): + return PyScrolledWindow.DoMoveWindow(*args, **kw) + base_DoMoveWindow = wx._deprecated(base_DoMoveWindow, + "Please use PyScrolledWindow.DoMoveWindow instead.") - def base_AddChild(*args, **kwargs): - """base_AddChild(self, Window child)""" - return _controls_.PyControl_base_AddChild(*args, **kwargs) + def base_DoSetSize(*args, **kw): + return PyScrolledWindow.DoSetSize(*args, **kw) + base_DoSetSize = wx._deprecated(base_DoSetSize, + "Please use PyScrolledWindow.DoSetSize instead.") - def base_RemoveChild(*args, **kwargs): - """base_RemoveChild(self, Window child)""" - return _controls_.PyControl_base_RemoveChild(*args, **kwargs) + def base_DoSetClientSize(*args, **kw): + return PyScrolledWindow.DoSetClientSize(*args, **kw) + base_DoSetClientSize = wx._deprecated(base_DoSetClientSize, + "Please use PyScrolledWindow.DoSetClientSize instead.") - def base_ShouldInheritColours(*args, **kwargs): - """base_ShouldInheritColours(self) -> bool""" - return _controls_.PyControl_base_ShouldInheritColours(*args, **kwargs) + def base_DoSetVirtualSize(*args, **kw): + return PyScrolledWindow.DoSetVirtualSize(*args, **kw) + base_DoSetVirtualSize = wx._deprecated(base_DoSetVirtualSize, + "Please use PyScrolledWindow.DoSetVirtualSize instead.") - def base_ApplyParentThemeBackground(*args, **kwargs): - """base_ApplyParentThemeBackground(self, Colour c)""" - return _controls_.PyControl_base_ApplyParentThemeBackground(*args, **kwargs) + def base_DoGetSize(*args, **kw): + return PyScrolledWindow.DoGetSize(*args, **kw) + base_DoGetSize = wx._deprecated(base_DoGetSize, + "Please use PyScrolledWindow.DoGetSize instead.") - def base_GetDefaultAttributes(*args, **kwargs): - """base_GetDefaultAttributes(self) -> VisualAttributes""" - return _controls_.PyControl_base_GetDefaultAttributes(*args, **kwargs) + def base_DoGetClientSize(*args, **kw): + return PyScrolledWindow.DoGetClientSize(*args, **kw) + base_DoGetClientSize = wx._deprecated(base_DoGetClientSize, + "Please use PyScrolledWindow.DoGetClientSize instead.") + + def base_DoGetPosition(*args, **kw): + return PyScrolledWindow.DoGetPosition(*args, **kw) + base_DoGetPosition = wx._deprecated(base_DoGetPosition, + "Please use PyScrolledWindow.DoGetPosition instead.") + + def base_DoGetVirtualSize(*args, **kw): + return PyScrolledWindow.DoGetVirtualSize(*args, **kw) + base_DoGetVirtualSize = wx._deprecated(base_DoGetVirtualSize, + "Please use PyScrolledWindow.DoGetVirtualSize instead.") + + def base_DoGetBestSize(*args, **kw): + return PyScrolledWindow.DoGetBestSize(*args, **kw) + base_DoGetBestSize = wx._deprecated(base_DoGetBestSize, + "Please use PyScrolledWindow.DoGetBestSize instead.") + + def base_InitDialog(*args, **kw): + return PyScrolledWindow.InitDialog(*args, **kw) + base_InitDialog = wx._deprecated(base_InitDialog, + "Please use PyScrolledWindow.InitDialog instead.") + + def base_TransferDataToWindow(*args, **kw): + return PyScrolledWindow.TransferDataToWindow(*args, **kw) + base_TransferDataToWindow = wx._deprecated(base_TransferDataToWindow, + "Please use PyScrolledWindow.TransferDataToWindow instead.") + + def base_TransferDataFromWindow(*args, **kw): + return PyScrolledWindow.TransferDataFromWindow(*args, **kw) + base_TransferDataFromWindow = wx._deprecated(base_TransferDataFromWindow, + "Please use PyScrolledWindow.TransferDataFromWindow instead.") + + def base_Validate(*args, **kw): + return PyScrolledWindow.Validate(*args, **kw) + base_Validate = wx._deprecated(base_Validate, + "Please use PyScrolledWindow.Validate instead.") + + def base_AcceptsFocus(*args, **kw): + return PyScrolledWindow.AcceptsFocus(*args, **kw) + base_AcceptsFocus = wx._deprecated(base_AcceptsFocus, + "Please use PyScrolledWindow.AcceptsFocus instead.") + + def base_AcceptsFocusFromKeyboard(*args, **kw): + return PyScrolledWindow.AcceptsFocusFromKeyboard(*args, **kw) + base_AcceptsFocusFromKeyboard = wx._deprecated(base_AcceptsFocusFromKeyboard, + "Please use PyScrolledWindow.AcceptsFocusFromKeyboard instead.") + + def base_GetMaxSize(*args, **kw): + return PyScrolledWindow.GetMaxSize(*args, **kw) + base_GetMaxSize = wx._deprecated(base_GetMaxSize, + "Please use PyScrolledWindow.GetMaxSize instead.") + + def base_AddChild(*args, **kw): + return PyScrolledWindow.AddChild(*args, **kw) + base_AddChild = wx._deprecated(base_AddChild, + "Please use PyScrolledWindow.AddChild instead.") + + def base_RemoveChild(*args, **kw): + return PyScrolledWindow.RemoveChild(*args, **kw) + base_RemoveChild = wx._deprecated(base_RemoveChild, + "Please use PyScrolledWindow.RemoveChild instead.") + + def base_ShouldInheritColours(*args, **kw): + return PyScrolledWindow.ShouldInheritColours(*args, **kw) + base_ShouldInheritColours = wx._deprecated(base_ShouldInheritColours, + "Please use PyScrolledWindow.ShouldInheritColours instead.") + + def base_GetDefaultAttributes(*args, **kw): + return PyScrolledWindow.GetDefaultAttributes(*args, **kw) + base_GetDefaultAttributes = wx._deprecated(base_GetDefaultAttributes, + "Please use PyScrolledWindow.GetDefaultAttributes instead.") + + def base_OnInternalIdle(*args, **kw): + return PyScrolledWindow.OnInternalIdle(*args, **kw) + base_OnInternalIdle = wx._deprecated(base_OnInternalIdle, + "Please use PyScrolledWindow.OnInternalIdle instead.") class PyControlPtr(PyControl): @@ -6222,7 +6595,9 @@ class HelpProvider(object): def Destroy(*args, **kwargs): """Destroy(self)""" - return _controls_.HelpProvider_Destroy(*args, **kwargs) + val = _controls_.HelpProvider_Destroy(*args, **kwargs) + args[0].thisown = 0 + return val class HelpProviderPtr(HelpProvider): @@ -6496,3 +6871,4 @@ def PreDatePickerCtrl(*args, **kwargs): return val +