added support for ellipsization and markup in wxStaticText (modified patch 1629946)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-01 14:13:15 +00:00
parent 9d529fa05c
commit 39bc0347fd
35 changed files with 1387 additions and 280 deletions

View File

@@ -14,7 +14,7 @@
// wxStaticText
//-----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxStaticText : public wxControl
class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase
{
public:
wxStaticText();
@@ -43,8 +43,7 @@ public:
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
// see wx/stattext.h
void Wrap(int width);
// implementation
// --------------
@@ -59,6 +58,9 @@ protected:
virtual wxSize DoGetBestSize() const;
virtual wxString DoGetLabel() const;
virtual void DoSetLabel(const wxString& str);
DECLARE_DYNAMIC_CLASS(wxStaticText)
};