X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19cf1ef3a7077dd99a90f141847b8a9b67b318c9..05dff6b0756ec639d4d05ed88ef47e57a8dbbae8:/include/wx/stattext.h?ds=sidebyside

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 3a1c6cb047..395b19066a 100644
--- 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
 {
@@ -72,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;