User lower case property names in wx.DateSpan and wx.TimeSpan in order

[wxWidgets.git] / wxPython / src / mac / _controls.py

diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py
index cb9f2787a6ce4d117f21aae2293ba24b7b388f21..4cc5f878e70a0e8f6104fab9703c2f4895862ff3 100644 (file)
--- a/wxPython/src/mac/_controls.py
+++ b/wxPython/src/mac/_controls.py
@@ -99,7 +99,7 @@ class Button(_core.Control):
 
     def SetDefault(*args, **kwargs):
         """
 
     def SetDefault(*args, **kwargs):
         """

-        SetDefault(self)
+        SetDefault(self) -> Window

 
         This sets the button to be the default item for the panel or dialog box.
         """
 
         This sets the button to be the default item for the panel or dialog box.
         """


@@ -579,7 +579,7 @@ class ComboBox(_core.Control,_core.ItemContainer):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __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
             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):
         """
 
     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
             Point pos=DefaultPosition, Size size=DefaultSize,
             List choices=EmptyList, long style=0, Validator validator=DefaultValidator,
             String name=ChoiceNameStr) -> bool


@@ -1116,6 +1116,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')
 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')


@@ -1148,6 +1153,32 @@ class StaticText(_core.Control):
         """
         return _controls_.StaticText_Wrap(*args, **kwargs)
 
         """
         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 (&lt; &gt; &quot; &apos;
+        &amp;)
+        """
+        return _controls_.StaticText_EscapeMarkup(*args, **kwargs)
+
+    EscapeMarkup = staticmethod(EscapeMarkup)

     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes


@@ -1173,6 +1204,26 @@ def PreStaticText(*args, **kwargs):
     val = _controls_.new_PreStaticText(*args, **kwargs)
     return val
 
     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 (&lt; &gt; &quot; &apos;
+    &amp;)
+    """
+  return _controls_.StaticText_EscapeMarkup(*args, **kwargs)
+

 def StaticText_GetClassDefaultAttributes(*args, **kwargs):
   """
     StaticText_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
 def StaticText_GetClassDefaultAttributes(*args, **kwargs):
   """
     StaticText_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes


@@ -1493,6 +1544,9 @@ TE_BESTWRAP = _controls_.TE_BESTWRAP
 TE_RICH2 = _controls_.TE_RICH2
 TE_CAPITALIZE = _controls_.TE_CAPITALIZE
 TE_LINEWRAP = TE_CHARWRAP 
 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
 TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
 TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
 TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE


@@ -3771,11 +3825,11 @@ class ToolBarBase(_core.Control):
         return _controls_.ToolBarBase_InsertToolItem(*args, **kwargs)
 
     def AddControl(*args, **kwargs):
         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):
         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):
         return _controls_.ToolBarBase_InsertControl(*args, **kwargs)
 
     def FindControl(*args, **kwargs):


@@ -3966,6 +4020,14 @@ class ToolBar(ToolBarBase):
         """
         return _controls_.ToolBar_Create(*args, **kwargs)
 
         """
         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
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes


@@ -7261,6 +7323,24 @@ class SearchCtrl(TextCtrl):
         """
         return _controls_.SearchCtrl_IsCancelButtonVisible(*args, **kwargs)
 
         """
         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 ?)
     def SetSearchBitmap(*args, **kwargs):
         """
         SetSearchBitmap(self, Bitmap ?)


@@ -7292,6 +7372,7 @@ class SearchCtrl(TextCtrl):
     Menu = property(GetMenu,SetMenu) 
     SearchButtonVisible = property(IsSearchButtonVisible,ShowSearchButton) 
     CancelButtonVisible = property(IsCancelButtonVisible,ShowCancelButton) 
     Menu = property(GetMenu,SetMenu) 
     SearchButtonVisible = property(IsSearchButtonVisible,ShowSearchButton) 
     CancelButtonVisible = property(IsCancelButtonVisible,ShowCancelButton) 

+    DescriptiveText = property(GetDescriptiveText,SetDescriptiveText) 

 _controls_.SearchCtrl_swigregister(SearchCtrl)
 SearchCtrlNameStr = cvar.SearchCtrlNameStr
 
 _controls_.SearchCtrl_swigregister(SearchCtrl)
 SearchCtrlNameStr = cvar.SearchCtrlNameStr