X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6646ca90e801375fa3ce36206e02f76f202e13c6..4ca056ea2be22bacda4a7f0a0787803cd18b6b10:/wxPython/src/gtk/_controls.py diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py index 233923129c..8fcc6817ca 100644 --- a/wxPython/src/gtk/_controls.py +++ b/wxPython/src/gtk/_controls.py @@ -579,7 +579,7 @@ class ComboBox(_core.Control,_core.ItemContainer): __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(_core.Control,_core.ItemContainer): 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 @@ -1500,6 +1500,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 @@ -3778,11 +3781,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): @@ -3973,6 +3976,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