X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53aa7709e08bb3cdaa8ec5c4977f32e817aff7d6..46ae103b9f08fc4e447d16a6a92b03cf55ee3189:/wxPython/src/mac/_controls.py?ds=sidebyside diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py index 0263983d14..a467583ac9 100644 --- a/wxPython/src/mac/_controls.py +++ b/wxPython/src/mac/_controls.py @@ -481,7 +481,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,7 +495,7 @@ 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 @@ -573,7 +573,7 @@ class ComboBox(_core.Control,_core.ItemContainer): """ __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 +588,7 @@ class ComboBox(_core.Control,_core.ItemContainer): """ 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 @@ -1537,9 +1537,12 @@ TE_PASSWORD = _controls_.TE_PASSWORD TE_AUTO_URL = _controls_.TE_AUTO_URL TE_NOHIDESEL = _controls_.TE_NOHIDESEL TE_DONTWRAP = _controls_.TE_DONTWRAP -TE_LINEWRAP = _controls_.TE_LINEWRAP +TE_CHARWRAP = _controls_.TE_CHARWRAP TE_WORDWRAP = _controls_.TE_WORDWRAP +TE_BESTWRAP = _controls_.TE_BESTWRAP +TE_LINEWRAP = _controls_.TE_LINEWRAP TE_RICH2 = _controls_.TE_RICH2 +TE_CAPITALIZE = _controls_.TE_CAPITALIZE TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE @@ -2101,8 +2104,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) @@ -2631,6 +2632,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 @@ -3048,7 +3050,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): @@ -3217,7 +3224,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 @@ -3351,6 +3358,10 @@ class Choicebook(BookCtrlBase): """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""" return _controls_.Choicebook_DeleteAllPages(*args, **kwargs) @@ -4747,10 +4758,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, @@ -4809,7 +4821,7 @@ class ListCtrl(_core.Control): def IsSelected(self, idx): '''return True if the item is selected''' - return self.GetItemState(idx, wx.LIST_STATE_SELECTED) != 0 + return (self.GetItemState(idx, wx.LIST_STATE_SELECTED) & wx.LIST_STATE_SELECTED) != 0 def SetColumnImage(self, col, image): item = self.GetColumn(col) @@ -5132,7 +5144,7 @@ EVT_TREE_ITEM_MIDDLE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLI EVT_TREE_END_DRAG = wx.PyEventBinder(wxEVT_COMMAND_TREE_END_DRAG , 1) EVT_TREE_STATE_IMAGE_CLICK = wx.PyEventBinder(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 1) EVT_TREE_ITEM_GETTOOLTIP = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, 1) -EVT_COMMAND_TREE_ITEM_MENU = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MENU, 1) +EVT_TREE_ITEM_MENU = wx.PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MENU, 1) class TreeEvent(_core.NotifyEvent): """Proxy of C++ TreeEvent class""" @@ -5200,6 +5212,10 @@ class TreeEvent(_core.NotifyEvent): """SetToolTip(self, String toolTip)""" return _controls_.TreeEvent_SetToolTip(*args, **kwargs) + def GetToolTip(*args, **kwargs): + """GetToolTip(self) -> String""" + return _controls_.TreeEvent_GetToolTip(*args, **kwargs) + class TreeEventPtr(TreeEvent): def __init__(self, this): @@ -5788,6 +5804,10 @@ class PyControl(_core.Control): """SetBestSize(self, Size size)""" return _controls_.PyControl_SetBestSize(*args, **kwargs) + def DoEraseBackground(*args, **kwargs): + """DoEraseBackground(self, DC dc) -> bool""" + return _controls_.PyControl_DoEraseBackground(*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) @@ -5864,14 +5884,14 @@ class PyControl(_core.Control): """base_ShouldInheritColours(self) -> bool""" return _controls_.PyControl_base_ShouldInheritColours(*args, **kwargs) - def base_ApplyParentThemeBackground(*args, **kwargs): - """base_ApplyParentThemeBackground(self, Colour c)""" - return _controls_.PyControl_base_ApplyParentThemeBackground(*args, **kwargs) - def base_GetDefaultAttributes(*args, **kwargs): """base_GetDefaultAttributes(self) -> VisualAttributes""" return _controls_.PyControl_base_GetDefaultAttributes(*args, **kwargs) + def base_OnInternalIdle(*args, **kwargs): + """base_OnInternalIdle(self)""" + return _controls_.PyControl_base_OnInternalIdle(*args, **kwargs) + class PyControlPtr(PyControl): def __init__(self, this):