using common code

[wxWidgets.git] / include / wx / stattext.h

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 8795777ea8d1bf8677e52523c971cd627734182b..395b19066aa4718e07631b285a6bbf7f38d2e037 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -29,7 +29,7 @@
 #define wxST_ELLIPSIZE_END         0x0010
 
 
-extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxStaticTextNameStr[];
 
 class WXDLLEXPORT wxStaticTextBase : public wxControl
 {
@@ -58,6 +58,9 @@ public:
 
     // public utilities (symmetric to those in wxControl about mnemonics):
 
+    // get the string without mnemonic characters ('&') and without markup
+    static wxString GetLabelText(const wxString& label);
+
     // removes the markup accepted by wxStaticText when wxST_MARKUP is used,
     // and then returns the cleaned string
     static wxString RemoveMarkup(const wxString& str);
@@ -69,6 +72,9 @@ public:
 
 protected:      // functions required for wxST_ELLIPSIZE_* support
 
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     // just calls RemoveMarkup & Ellipsize on the original label.
     virtual wxString GetEllipsizedLabelWithoutMarkup() const;