X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5263701c22ed4dfff59a47b0d8a3f8ab1396688..8fb6915941f155741ab282eb8fcffb480407a982:/wxPython/src/mac/_controls.py?ds=sidebyside diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py index 6d08c33acd..eb81e91d6a 100644 --- a/wxPython/src/mac/_controls.py +++ b/wxPython/src/mac/_controls.py @@ -678,7 +678,7 @@ class ComboBox(_core.Control,_core.ItemContainer): return _controls_.ComboBox_SetMark(*args, **kwargs) def GetMark(self): - raise NotImplementedError + return (0,0) def GetCurrentSelection(*args, **kwargs): """ @@ -701,14 +701,6 @@ class ComboBox(_core.Control,_core.ItemContainer): """ return _controls_.ComboBox_SetStringSelection(*args, **kwargs) - def SetString(*args, **kwargs): - """ - SetString(self, int n, String string) - - Set the label for the n'th item (zero based) in the list. - """ - return _controls_.ComboBox_SetString(*args, **kwargs) - def SetEditable(*args, **kwargs): """SetEditable(self, bool editable)""" return _controls_.ComboBox_SetEditable(*args, **kwargs) @@ -1020,6 +1012,7 @@ _controls_.StaticBox_swigregister(StaticBox) StaticBitmapNameStr = cvar.StaticBitmapNameStr StaticBoxNameStr = cvar.StaticBoxNameStr StaticTextNameStr = cvar.StaticTextNameStr +StaticLineNameStr = cvar.StaticLineNameStr def PreStaticBox(*args, **kwargs): """PreStaticBox() -> StaticBox""" @@ -1053,7 +1046,7 @@ class StaticLine(_core.Control): """ __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, Size size=DefaultSize, long style=LI_HORIZONTAL, - String name=StaticTextNameStr) -> StaticLine + String name=StaticLineNameStr) -> StaticLine """ _controls_.StaticLine_swiginit(self,_controls_.new_StaticLine(*args, **kwargs)) self._setOORInfo(self) @@ -1062,7 +1055,7 @@ class StaticLine(_core.Control): """ Create(self, Window parent, int id=-1, Point pos=DefaultPosition, Size size=DefaultSize, long style=LI_HORIZONTAL, - String name=StaticTextNameStr) -> bool + String name=StaticLineNameStr) -> bool """ return _controls_.StaticLine_Create(*args, **kwargs) @@ -1707,6 +1700,14 @@ class TextCtrl(_core.Control): """SetValue(self, String value)""" return _controls_.TextCtrl_SetValue(*args, **kwargs) + def IsEmpty(*args, **kwargs): + """IsEmpty(self) -> bool""" + return _controls_.TextCtrl_IsEmpty(*args, **kwargs) + + def ChangeValue(*args, **kwargs): + """ChangeValue(self, String value)""" + return _controls_.TextCtrl_ChangeValue(*args, **kwargs) + def GetRange(*args, **kwargs): """GetRange(self, long from, long to) -> String""" return _controls_.TextCtrl_GetRange(*args, **kwargs) @@ -1915,6 +1916,14 @@ class TextCtrl(_core.Control): """SetEditable(self, bool editable)""" return _controls_.TextCtrl_SetEditable(*args, **kwargs) + def MacCheckSpelling(*args, **kwargs): + """MacCheckSpelling(self, bool check)""" + return _controls_.TextCtrl_MacCheckSpelling(*args, **kwargs) + + def SendTextUpdatedEvent(*args, **kwargs): + """SendTextUpdatedEvent(self)""" + return _controls_.TextCtrl_SendTextUpdatedEvent(*args, **kwargs) + def write(*args, **kwargs): """write(self, String text)""" return _controls_.TextCtrl_write(*args, **kwargs) @@ -2947,6 +2956,10 @@ class BookCtrlBase(_core.Control): """SetSelection(self, size_t n) -> int""" return _controls_.BookCtrlBase_SetSelection(*args, **kwargs) + def ChangeSelection(*args, **kwargs): + """ChangeSelection(self, size_t n) -> int""" + return _controls_.BookCtrlBase_ChangeSelection(*args, **kwargs) + def AdvanceSelection(*args, **kwargs): """AdvanceSelection(self, bool forward=True)""" return _controls_.BookCtrlBase_AdvanceSelection(*args, **kwargs) @@ -3111,6 +3124,14 @@ class Notebook(BookCtrlBase): return _controls_.Notebook_GetClassDefaultAttributes(*args, **kwargs) GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes) + def SendPageChangingEvent(*args, **kwargs): + """SendPageChangingEvent(self, int nPage) -> bool""" + return _controls_.Notebook_SendPageChangingEvent(*args, **kwargs) + + def SendPageChangedEvent(*args, **kwargs): + """SendPageChangedEvent(self, int nPageOld, int nPageNew=-1)""" + return _controls_.Notebook_SendPageChangedEvent(*args, **kwargs) + RowCount = property(GetRowCount,doc="See `GetRowCount`") ThemeBackgroundColour = property(GetThemeBackgroundColour,doc="See `GetThemeBackgroundColour`") _controls_.Notebook_swigregister(Notebook) @@ -3440,6 +3461,10 @@ TOOL_STYLE_SEPARATOR = _controls_.TOOL_STYLE_SEPARATOR TOOL_STYLE_CONTROL = _controls_.TOOL_STYLE_CONTROL TB_HORIZONTAL = _controls_.TB_HORIZONTAL TB_VERTICAL = _controls_.TB_VERTICAL +TB_TOP = _controls_.TB_TOP +TB_LEFT = _controls_.TB_LEFT +TB_BOTTOM = _controls_.TB_BOTTOM +TB_RIGHT = _controls_.TB_RIGHT TB_3DBUTTONS = _controls_.TB_3DBUTTONS TB_FLAT = _controls_.TB_FLAT TB_DOCKABLE = _controls_.TB_DOCKABLE @@ -3450,7 +3475,6 @@ TB_NOALIGN = _controls_.TB_NOALIGN TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS -TB_BOTTOM = _controls_.TB_BOTTOM class ToolBarToolBase(_core.Object): """Proxy of C++ ToolBarToolBase class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -4111,9 +4135,8 @@ class ListItemAttr(object): def Destroy(*args, **kwargs): """Destroy(self)""" - val = _controls_.ListItemAttr_Destroy(*args, **kwargs) - args[0].thisown = 0 - return val + args[0].this.own(False) + return _controls_.ListItemAttr_Destroy(*args, **kwargs) BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") @@ -4422,7 +4445,7 @@ class ListCtrl(_core.Control): Validator validator=DefaultValidator, String name=ListCtrlNameStr) -> ListCtrl """ _controls_.ListCtrl_swiginit(self,_controls_.new_ListCtrl(*args, **kwargs)) - self._setOORInfo(self);self._setCallbackInfo(self, ListCtrl) + self._setOORInfo(self);ListCtrl._setCallbackInfo(self, self, ListCtrl) def Create(*args, **kwargs): """ @@ -4999,9 +5022,8 @@ class TreeItemData(object): def Destroy(*args, **kwargs): """Destroy(self)""" - val = _controls_.TreeItemData_Destroy(*args, **kwargs) - args[0].thisown = 0 - return val + args[0].this.own(False) + return _controls_.TreeItemData_Destroy(*args, **kwargs) Data = property(GetData,SetData,doc="See `GetData` and `SetData`") Id = property(GetId,SetId,doc="See `GetId` and `SetId`") @@ -5146,7 +5168,7 @@ class TreeCtrl(_core.Control): String name=TreeCtrlNameStr) -> TreeCtrl """ _controls_.TreeCtrl_swiginit(self,_controls_.new_TreeCtrl(*args, **kwargs)) - self._setOORInfo(self);self._setCallbackInfo(self, TreeCtrl) + self._setOORInfo(self);TreeCtrl._setCallbackInfo(self, self, TreeCtrl) def Create(*args, **kwargs): """ @@ -5656,7 +5678,6 @@ class GenericDirCtrl(_core.Control): FilterListCtrl = property(GetFilterListCtrl,doc="See `GetFilterListCtrl`") Path = property(GetPath,SetPath,doc="See `GetPath` and `SetPath`") RootId = property(GetRootId,doc="See `GetRootId`") - ShowHidden = property(GetShowHidden,ShowHidden,doc="See `GetShowHidden` and `ShowHidden`") TreeCtrl = property(GetTreeCtrl,doc="See `GetTreeCtrl`") _controls_.GenericDirCtrl_swigregister(GenericDirCtrl) DirDialogDefaultFolderStr = cvar.DirDialogDefaultFolderStr @@ -5709,16 +5730,13 @@ class PyControl(_core.Control): String name=ControlNameStr) -> PyControl """ _controls_.PyControl_swiginit(self,_controls_.new_PyControl(*args, **kwargs)) - self._setOORInfo(self); self._setCallbackInfo(self, PyControl) + self._setOORInfo(self);PyControl._setCallbackInfo(self, self, PyControl) def _setCallbackInfo(*args, **kwargs): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _controls_.PyControl__setCallbackInfo(*args, **kwargs) - def SetBestSize(*args, **kwargs): - """SetBestSize(self, Size size)""" - return _controls_.PyControl_SetBestSize(*args, **kwargs) - + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _controls_.PyControl_DoEraseBackground(*args, **kwargs) @@ -6172,9 +6190,8 @@ class HelpProvider(object): def Destroy(*args, **kwargs): """Destroy(self)""" - val = _controls_.HelpProvider_Destroy(*args, **kwargs) - args[0].thisown = 0 - return val + args[0].this.own(False) + return _controls_.HelpProvider_Destroy(*args, **kwargs) _controls_.HelpProvider_swigregister(HelpProvider) @@ -6919,7 +6936,7 @@ class FontPickerCtrl(PickerBase): __repr__ = _swig_repr def __init__(self, *args, **kwargs): """ - __init__(self, Window parent, int id=-1, Font initial=*wxNORMAL_FONT, + __init__(self, Window parent, int id=-1, Font initial=wxNullFont, Point pos=DefaultPosition, Size size=DefaultSize, long style=FNTP_DEFAULT_STYLE, Validator validator=DefaultValidator, String name=FontPickerCtrlNameStr) -> FontPickerCtrl @@ -6929,7 +6946,7 @@ class FontPickerCtrl(PickerBase): def Create(*args, **kwargs): """ - Create(self, Window parent, int id=-1, Font initial=*wxNORMAL_FONT, + Create(self, Window parent, int id=-1, Font initial=wxNullFont, Point pos=DefaultPosition, Size size=DefaultSize, long style=FNTP_DEFAULT_STYLE, Validator validator=DefaultValidator, String name=FontPickerCtrlNameStr) -> bool @@ -6983,5 +7000,208 @@ class FontPickerEvent(_core.CommandEvent): Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") _controls_.FontPickerEvent_swigregister(FontPickerEvent) +#--------------------------------------------------------------------------- + +CP_DEFAULT_STYLE = _controls_.CP_DEFAULT_STYLE +CP_NO_TLW_RESIZE = _controls_.CP_NO_TLW_RESIZE +class CollapsiblePane(_core.Control): + """ + A collapsable pane is a container with an embedded button-like + control which can be used by the user to collapse or expand the pane's + contents. + + Once constructed you should use the `GetPane` function to access the + pane and add your controls inside it (i.e. use the window returned + from `GetPane` as the parent for the controls which must go in the + pane, NOT the wx.CollapsiblePane itself!). + + Note that because of its nature of control which can dynamically (and + drastically) change its size at run-time under user-input, when + putting a wx.CollapsiblePane inside a `wx.Sizer` you should be careful + to add it with a proportion value of zero; this is because otherwise + all other windows with non-zero proportion values would automatically + get resized each time the user expands or collapses the pane window, + usually resulting a weird, flickering effect. + """ + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self, Window parent, int winid=-1, String label=EmptyString, + Point pos=DefaultPosition, Size size=DefaultSize, + long style=CP_DEFAULT_STYLE, Validator val=DefaultValidator, + String name=CollapsiblePaneNameStr) -> CollapsiblePane + + Create and show a wx.CollapsiblePane + """ + _controls_.CollapsiblePane_swiginit(self,_controls_.new_CollapsiblePane(*args, **kwargs)) + self._setOORInfo(self) + + def Create(*args, **kwargs): + """ + Create(self, Window parent, int winid=-1, String label=EmptyString, + Point pos=DefaultPosition, Size size=DefaultSize, + long style=CP_DEFAULT_STYLE, Validator val=DefaultValidator, + String name=CollapsiblePaneNameStr) -> bool + """ + return _controls_.CollapsiblePane_Create(*args, **kwargs) + + def Collapse(*args, **kwargs): + """ + Collapse(self, bool collapse=True) + + Collapses or expands the pane window. + """ + return _controls_.CollapsiblePane_Collapse(*args, **kwargs) + + def Expand(*args, **kwargs): + """ + Expand(self) + + Same as Collapse(False). + """ + return _controls_.CollapsiblePane_Expand(*args, **kwargs) + + def IsCollapsed(*args, **kwargs): + """ + IsCollapsed(self) -> bool + + Returns ``True`` if the pane window is currently hidden. + """ + return _controls_.CollapsiblePane_IsCollapsed(*args, **kwargs) + + def IsExpanded(*args, **kwargs): + """ + IsExpanded(self) -> bool + + Returns ``True`` if the pane window is currently shown. + """ + return _controls_.CollapsiblePane_IsExpanded(*args, **kwargs) + + def GetPane(*args, **kwargs): + """ + GetPane(self) -> Window + + Returns a reference to the pane window. Use the returned `wx.Window` + as the parent of widgets to make them part of the collapsible area. + """ + return _controls_.CollapsiblePane_GetPane(*args, **kwargs) + + Expanded = property(IsExpanded) + Collapsed = property(IsCollapsed) +_controls_.CollapsiblePane_swigregister(CollapsiblePane) +CollapsiblePaneNameStr = cvar.CollapsiblePaneNameStr + +def PreCollapsiblePane(*args, **kwargs): + """ + PreCollapsiblePane() -> CollapsiblePane + + Precreate a wx.CollapsiblePane for 2-phase creation. + """ + val = _controls_.new_PreCollapsiblePane(*args, **kwargs) + return val + +wxEVT_COMMAND_COLLPANE_CHANGED = _controls_.wxEVT_COMMAND_COLLPANE_CHANGED +EVT_COLLAPSIBLEPANE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_COLLPANE_CHANGED, 1 ) + +class CollapsiblePaneEvent(_core.CommandEvent): + """Proxy of C++ CollapsiblePaneEvent class""" + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """__init__(self, Object generator, int id, bool collapsed) -> CollapsiblePaneEvent""" + _controls_.CollapsiblePaneEvent_swiginit(self,_controls_.new_CollapsiblePaneEvent(*args, **kwargs)) + def GetCollapsed(*args, **kwargs): + """GetCollapsed(self) -> bool""" + return _controls_.CollapsiblePaneEvent_GetCollapsed(*args, **kwargs) + + def SetCollapsed(*args, **kwargs): + """SetCollapsed(self, bool c)""" + return _controls_.CollapsiblePaneEvent_SetCollapsed(*args, **kwargs) + + Collapsed = property(GetCollapsed,SetCollapsed) +_controls_.CollapsiblePaneEvent_swigregister(CollapsiblePaneEvent) + +#--------------------------------------------------------------------------- + +class SearchCtrl(TextCtrl): + """Proxy of C++ SearchCtrl class""" + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self, Window parent, int id=-1, String value=wxEmptyString, + Point pos=DefaultPosition, Size size=DefaultSize, + long style=0, Validator validator=DefaultValidator, + String name=SearchCtrlNameStr) -> SearchCtrl + """ + _controls_.SearchCtrl_swiginit(self,_controls_.new_SearchCtrl(*args, **kwargs)) + self._setOORInfo(self) + + def Create(*args, **kwargs): + """ + Create(self, Window parent, int id=-1, String value=wxEmptyString, + Point pos=DefaultPosition, Size size=DefaultSize, + long style=0, Validator validator=DefaultValidator, + String name=SearchCtrlNameStr) -> bool + """ + return _controls_.SearchCtrl_Create(*args, **kwargs) + + def SetMenu(*args, **kwargs): + """SetMenu(self, Menu menu)""" + return _controls_.SearchCtrl_SetMenu(*args, **kwargs) + + def GetMenu(*args, **kwargs): + """GetMenu(self) -> Menu""" + return _controls_.SearchCtrl_GetMenu(*args, **kwargs) + + def ShowSearchButton(*args, **kwargs): + """ShowSearchButton(self, bool show)""" + return _controls_.SearchCtrl_ShowSearchButton(*args, **kwargs) + + def IsSearchButtonVisible(*args, **kwargs): + """IsSearchButtonVisible(self) -> bool""" + return _controls_.SearchCtrl_IsSearchButtonVisible(*args, **kwargs) + + def ShowCancelButton(*args, **kwargs): + """ShowCancelButton(self, bool show)""" + return _controls_.SearchCtrl_ShowCancelButton(*args, **kwargs) + + def IsCancelButtonVisible(*args, **kwargs): + """IsCancelButtonVisible(self) -> bool""" + return _controls_.SearchCtrl_IsCancelButtonVisible(*args, **kwargs) + + def SetSearchBitmap(*args, **kwargs): + """SetSearchBitmap(self, Bitmap ?)""" + return _controls_.SearchCtrl_SetSearchBitmap(*args, **kwargs) + + def SetSearchMenuBitmap(*args, **kwargs): + """SetSearchMenuBitmap(self, Bitmap ?)""" + return _controls_.SearchCtrl_SetSearchMenuBitmap(*args, **kwargs) + + def SetCancelBitmap(*args, **kwargs): + """SetCancelBitmap(self, Bitmap ?)""" + return _controls_.SearchCtrl_SetCancelBitmap(*args, **kwargs) + + Menu = property(GetMenu,SetMenu) + SearchButtonVisible = property(IsSearchButtonVisible,ShowSearchButton) + CancelButtonVisible = property(IsCancelButtonVisible,ShowCancelButton) +_controls_.SearchCtrl_swigregister(SearchCtrl) +SearchCtrlNameStr = cvar.SearchCtrlNameStr + +def PreSearchCtrl(*args, **kwargs): + """ + PreSearchCtrl() -> SearchCtrl + + Precreate a wx.SearchCtrl for 2-phase creation. + """ + val = _controls_.new_PreSearchCtrl(*args, **kwargs) + return val + +wxEVT_COMMAND_SEARCHCTRL_CANCEL = _controls_.wxEVT_COMMAND_SEARCHCTRL_CANCEL +wxEVT_COMMAND_SEARCHCTRL_SEARCH = _controls_.wxEVT_COMMAND_SEARCHCTRL_SEARCH +EVT_SEARCHCTRL_CANCEL = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_CANCEL, 1) +EVT_SEARCHCTRL_SEARCH = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_SEARCH, 1) +