Elippsis and markup support for wxStaticText

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_control.i b/wxPython/src/_control.i
index c0ae644c43f30b4461ded830a9d5d300f2af9633..b0de16d9a369e590ed7566c7e24ba21b9cffbd11 100644 (file)
--- a/wxPython/src/_control.i
+++ b/wxPython/src/_control.i
@@ -99,7 +99,19 @@ __init__ as a plain old wx.Control is not very useful.", "");
 
 // :see: `GetAdjustMinSizeFlag`
 // ");
+
+ 
+    DocDeclStr(
+        static wxString , RemoveMnemonics(const wxString& str),
+        "removes the mnemonics characters", "");
+
+    
+// Link error...
+//     DocDeclStr(
+//         static wxString , EscapeMnemonics(const wxString& str),
+//         "escapes the mnemonics characters ('&') by doubling them", "");
     
+     
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index d56781bf997193a5439eb8a421e2861b6cbc5d69..1751c9d5e588ce058339990f8295fb9ff62dc959 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -536,9 +536,6 @@ enum {
     wxSB_VERTICAL,
     wxRB_USE_CHECKBOX,
     wxST_SIZEGRIP,
-    wxST_NO_AUTORESIZE,
-    wxST_DOTS_MIDDLE,
-    wxST_DOTS_END,
     
     wxFLOOD_SURFACE,
     wxFLOOD_BORDER,

diff --git a/wxPython/src/_statctrls.i b/wxPython/src/_statctrls.i
index b3be54e9609a4e82827516049c6e4dca0ee6eec6..904bcbd2b2d2a37d9a6fc3f3d72bf9bafbeebe36 100644 (file)
--- a/wxPython/src/_statctrls.i
+++ b/wxPython/src/_statctrls.i
@@ -95,6 +95,16 @@ public:
 
 MustHaveApp(wxStaticText);
 
+enum {
+    wxST_NO_AUTORESIZE,
+    wxST_MARKUP,
+
+    wxST_ELLIPSIZE_START,
+    wxST_ELLIPSIZE_MIDDLE,
+    wxST_ELLIPSIZE_END
+};
+
+
 class wxStaticText : public wxControl {
 public:
     %pythonAppend wxStaticText         "self._setOORInfo(self)"
@@ -121,8 +131,23 @@ public:
 becomes at most ``width`` pixels wide if possible (the lines are
 broken at words boundaries so it might not be the case if words are
 too long). If ``width`` is negative, no wrapping is done.", "");
+
+    bool IsEllipsized() const;
     
+    DocDeclStr(
+        static wxString , RemoveMarkup(const wxString& str),
+        "Removes the markup accepted by wx.StaticText when wx.ST_MARKUP is
+used, and then returns the cleaned string.
+    ", "");
     
+
+    DocDeclStr(
+        static wxString , EscapeMarkup(const wxString& str),
+        "Escapes the alls special symbols (<>\"\'&) present inside the given
+string using the corresponding entities (&lt; &gt; &quot; &apos;
+&amp;)", "");
+    
+
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 };