X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19cf1ef3a7077dd99a90f141847b8a9b67b318c9..5e5a020c0d20c58630ad7d7683301f9d3c314728:/include/wx/stattext.h diff --git a/include/wx/stattext.h b/include/wx/stattext.h index 3a1c6cb047..e6e38f1da4 100644 --- a/include/wx/stattext.h +++ b/include/wx/stattext.h @@ -29,9 +29,9 @@ #define wxST_ELLIPSIZE_END 0x0010 -extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticTextNameStr[]; -class WXDLLEXPORT wxStaticTextBase : public wxControl +class WXDLLIMPEXP_CORE wxStaticTextBase : public wxControl { public: wxStaticTextBase() { } @@ -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;