wx.VScrolledWindow has been refactored, and new wx.HScrolledWindow and

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

diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py
index eb1ed041fc99cf5f3448dae2a108a50e7a28266c..9506c5639db77b46a79d82f856ec59d604010374 100644 (file)
--- a/wxPython/src/msw/_controls.py
+++ b/wxPython/src/msw/_controls.py
@@ -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 (&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
@@ -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 (&lt; &gt; &quot; &apos;
+    &amp;)
+    """
+  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):