X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62358578028ca96debf45ffaeb675a92aac2df43..cc8ce392c535b7a614337e3bdba04b670e2e34d0:/wxPython/src/msw/_controls.py?ds=sidebyside diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py index 98a522b20f..9506c5639d 100644 --- a/wxPython/src/msw/_controls.py +++ b/wxPython/src/msw/_controls.py @@ -579,7 +579,7 @@ class ComboBox(Choice): __repr__ = _swig_repr def __init__(self, *args, **kwargs): """ - __init__(Window parent, int id, String value=EmptyString, + __init__(Window parent, int id=-1, String value=EmptyString, Point pos=DefaultPosition, Size size=DefaultSize, List choices=EmptyList, long style=0, Validator validator=DefaultValidator, String name=ComboBoxNameStr) -> ComboBox @@ -591,7 +591,7 @@ class ComboBox(Choice): def Create(*args, **kwargs): """ - Create(Window parent, int id, String value=EmptyString, + Create(Window parent, int id=-1, String value=EmptyString, Point pos=DefaultPosition, Size size=DefaultSize, List choices=EmptyList, long style=0, Validator validator=DefaultValidator, String name=ChoiceNameStr) -> bool @@ -1122,6 +1122,11 @@ def StaticLine_GetClassDefaultAttributes(*args, **kwargs): #--------------------------------------------------------------------------- +ST_NO_AUTORESIZE = _controls_.ST_NO_AUTORESIZE +ST_MARKUP = _controls_.ST_MARKUP +ST_ELLIPSIZE_START = _controls_.ST_ELLIPSIZE_START +ST_ELLIPSIZE_MIDDLE = _controls_.ST_ELLIPSIZE_MIDDLE +ST_ELLIPSIZE_END = _controls_.ST_ELLIPSIZE_END class StaticText(_core.Control): """Proxy of C++ StaticText class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') @@ -1154,6 +1159,32 @@ class StaticText(_core.Control): """ return _controls_.StaticText_Wrap(*args, **kwargs) + def IsEllipsized(*args, **kwargs): + """IsEllipsized(self) -> bool""" + return _controls_.StaticText_IsEllipsized(*args, **kwargs) + + def RemoveMarkup(*args, **kwargs): + """ + RemoveMarkup(String str) -> String + + Removes the markup accepted by wx.StaticText when wx.ST_MARKUP is + used, and then returns the cleaned string. + + """ + return _controls_.StaticText_RemoveMarkup(*args, **kwargs) + + RemoveMarkup = staticmethod(RemoveMarkup) + def EscapeMarkup(*args, **kwargs): + """ + EscapeMarkup(String str) -> String + + Escapes the alls special symbols (<>"'&) present inside the given + string using the corresponding entities (< > " ' + &) + """ + return _controls_.StaticText_EscapeMarkup(*args, **kwargs) + + EscapeMarkup = staticmethod(EscapeMarkup) def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -1179,6 +1210,26 @@ def PreStaticText(*args, **kwargs): val = _controls_.new_PreStaticText(*args, **kwargs) return val +def StaticText_RemoveMarkup(*args, **kwargs): + """ + StaticText_RemoveMarkup(String str) -> String + + Removes the markup accepted by wx.StaticText when wx.ST_MARKUP is + used, and then returns the cleaned string. + + """ + return _controls_.StaticText_RemoveMarkup(*args, **kwargs) + +def StaticText_EscapeMarkup(*args, **kwargs): + """ + StaticText_EscapeMarkup(String str) -> String + + Escapes the alls special symbols (<>"'&) present inside the given + string using the corresponding entities (< > " ' + &) + """ + return _controls_.StaticText_EscapeMarkup(*args, **kwargs) + def StaticText_GetClassDefaultAttributes(*args, **kwargs): """ StaticText_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -1500,6 +1551,9 @@ TE_BESTWRAP = _controls_.TE_BESTWRAP TE_RICH2 = _controls_.TE_RICH2 TE_CAPITALIZE = _controls_.TE_CAPITALIZE TE_LINEWRAP = TE_CHARWRAP +PROCESS_ENTER = TE_PROCESS_ENTER +PASSWORD = TE_PASSWORD + TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE @@ -3786,11 +3840,11 @@ class ToolBarBase(_core.Control): return _controls_.ToolBarBase_InsertToolItem(*args, **kwargs) def AddControl(*args, **kwargs): - """AddControl(self, Control control) -> ToolBarToolBase""" + """AddControl(self, Control control, String label=wxEmptyString) -> ToolBarToolBase""" return _controls_.ToolBarBase_AddControl(*args, **kwargs) def InsertControl(*args, **kwargs): - """InsertControl(self, size_t pos, Control control) -> ToolBarToolBase""" + """InsertControl(self, size_t pos, Control control, String label=wxEmptyString) -> ToolBarToolBase""" return _controls_.ToolBarBase_InsertControl(*args, **kwargs) def FindControl(*args, **kwargs): @@ -3981,6 +4035,14 @@ class ToolBar(ToolBarBase): """ return _controls_.ToolBar_Create(*args, **kwargs) + def SetToolNormalBitmap(*args, **kwargs): + """SetToolNormalBitmap(self, int id, Bitmap bitmap)""" + return _controls_.ToolBar_SetToolNormalBitmap(*args, **kwargs) + + def SetToolDisabledBitmap(*args, **kwargs): + """SetToolDisabledBitmap(self, int id, Bitmap bitmap)""" + return _controls_.ToolBar_SetToolDisabledBitmap(*args, **kwargs) + def GetClassDefaultAttributes(*args, **kwargs): """ GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes @@ -4845,7 +4907,6 @@ class ListCtrl(_core.Control): CountPerPage = property(GetCountPerPage,doc="See `GetCountPerPage`") EditControl = property(GetEditControl,doc="See `GetEditControl`") FocusedItem = property(GetFocusedItem,doc="See `GetFocusedItem`") - ImageList = property(GetImageList,SetImageList,doc="See `GetImageList` and `SetImageList`") ItemCount = property(GetItemCount,SetItemCount,doc="See `GetItemCount` and `SetItemCount`") MainWindow = property(GetMainWindow,doc="See `GetMainWindow`") SelectedItemCount = property(GetSelectedItemCount,doc="See `GetSelectedItemCount`") @@ -5333,6 +5394,10 @@ class TreeCtrl(_core.Control): """IsBold(self, TreeItemId item) -> bool""" return _controls_.TreeCtrl_IsBold(*args, **kwargs) + def IsEmpty(*args, **kwargs): + """IsEmpty(self) -> bool""" + return _controls_.TreeCtrl_IsEmpty(*args, **kwargs) + def GetChildrenCount(*args, **kwargs): """GetChildrenCount(self, TreeItemId item, bool recursively=True) -> size_t""" return _controls_.TreeCtrl_GetChildrenCount(*args, **kwargs) @@ -5445,6 +5510,14 @@ class TreeCtrl(_core.Control): """Collapse(self, TreeItemId item)""" return _controls_.TreeCtrl_Collapse(*args, **kwargs) + def CollapseAllChildren(*args, **kwargs): + """CollapseAllChildren(self, TreeItemId item)""" + return _controls_.TreeCtrl_CollapseAllChildren(*args, **kwargs) + + def CollapseAll(*args, **kwargs): + """CollapseAll(self)""" + return _controls_.TreeCtrl_CollapseAll(*args, **kwargs) + def CollapseAndReset(*args, **kwargs): """CollapseAndReset(self, TreeItemId item)""" return _controls_.TreeCtrl_CollapseAndReset(*args, **kwargs) @@ -7155,7 +7228,7 @@ class SearchCtrl(TextCtrl): A search control is a composite of a `wx.TextCtrl` with optional bitmap buttons and a drop-down menu. Controls like this can typically be found on a toolbar of applications that support some form of search - functionality. On the Mac this control is implemneted using the + functionality. On the Mac this control is implemented using the native HISearchField control, on the other platforms a generic control is used, although that may change in the future as more platforms introduce native search widgets. @@ -7188,7 +7261,7 @@ class SearchCtrl(TextCtrl): A search control is a composite of a `wx.TextCtrl` with optional bitmap buttons and a drop-down menu. Controls like this can typically be found on a toolbar of applications that support some form of search - functionality. On the Mac this control is implemneted using the + functionality. On the Mac this control is implemented using the native HISearchField control, on the other platforms a generic control is used, although that may change in the future as more platforms introduce native search widgets. @@ -7276,6 +7349,24 @@ class SearchCtrl(TextCtrl): """ return _controls_.SearchCtrl_IsCancelButtonVisible(*args, **kwargs) + def SetDescriptiveText(*args, **kwargs): + """ + SetDescriptiveText(self, String text) + + Set the text to be displayed when the user has not yet typed anything + in the control. + """ + return _controls_.SearchCtrl_SetDescriptiveText(*args, **kwargs) + + def GetDescriptiveText(*args, **kwargs): + """ + GetDescriptiveText(self) -> String + + Get the text to be displayed when the user has not yet typed anything + in the control. + """ + return _controls_.SearchCtrl_GetDescriptiveText(*args, **kwargs) + def SetSearchBitmap(*args, **kwargs): """ SetSearchBitmap(self, Bitmap bitmap) @@ -7307,6 +7398,7 @@ class SearchCtrl(TextCtrl): Menu = property(GetMenu,SetMenu) SearchButtonVisible = property(IsSearchButtonVisible,ShowSearchButton) CancelButtonVisible = property(IsCancelButtonVisible,ShowCancelButton) + DescriptiveText = property(GetDescriptiveText,SetDescriptiveText) _controls_.SearchCtrl_swigregister(SearchCtrl) SearchCtrlNameStr = cvar.SearchCtrlNameStr @@ -7319,10 +7411,10 @@ def PreSearchCtrl(*args, **kwargs): 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) +wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN = _controls_.wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN +wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN = _controls_.wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN +EVT_SEARCHCTRL_CANCEL_BTN = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1) +EVT_SEARCHCTRL_SEARCH_BTN = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, 1)