Replace wxST_MARKUP style with wxControl::SetLabelMarkup().
This is an incompatible change which removes the wxStaticText-specific wxST_MARKUP style and adds wxControl::SetLabelMarkup() replacing it. It doesn't actually change anything yet but it simplifies wxStaticText code a lot by getting rid of many markup-related functions in it which had to behave differently depending on whether wxST_MARKUP was used or not and also paves way for adding markup support for the other controls in the future. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -94,6 +94,27 @@ public:
|
||||
// get just the text of the label, without mnemonic characters ('&')
|
||||
virtual wxString GetLabelText() const { return GetLabelText(GetLabel()); }
|
||||
|
||||
|
||||
// Set the label with markup (and mnemonics). Markup is a simple subset of
|
||||
// HTML with tags such as <b>, <i> and <span>. By default it is not
|
||||
// supported i.e. all the markup is simply stripped and SetLabel() is
|
||||
// called but some controls in some ports do support this already and in
|
||||
// the future most of them should.
|
||||
//
|
||||
// Notice that, being HTML-like, markup also supports XML entities so '<'
|
||||
// should be encoded as "<" and so on, a bare '<' in the input will
|
||||
// likely result in an error. As an exception, a bare '&' is allowed and
|
||||
// indicates that the next character is a mnemonic. To insert a literal '&'
|
||||
// in the control you need to use "&" in the input string.
|
||||
//
|
||||
// Returns true if the label was set, even if the markup in it was ignored.
|
||||
// False is only returned if we failed to parse the label.
|
||||
bool SetLabelMarkup(const wxString& markup)
|
||||
{
|
||||
return DoSetLabelMarkup(markup);
|
||||
}
|
||||
|
||||
|
||||
// controls by default inherit the colours of their parents, if a
|
||||
// particular control class doesn't want to do it, it can override
|
||||
// ShouldInheritColours() to return false
|
||||
@@ -162,6 +183,12 @@ protected:
|
||||
const wxValidator& validator,
|
||||
const wxString& name);
|
||||
|
||||
// This function may be overridden in the derived classes to implement
|
||||
// support for labels with markup. The base class version simply strips the
|
||||
// markup and calls SetLabel() with the remaining text.
|
||||
virtual bool DoSetLabelMarkup(const wxString& markup);
|
||||
|
||||
|
||||
// initialize the common fields of wxCommandEvent
|
||||
void InitCommandEvent(wxCommandEvent& event) const;
|
||||
|
||||
@@ -170,6 +197,11 @@ protected:
|
||||
wxEllipsizeMode mode, int maxWidth,
|
||||
int replacementWidth);
|
||||
|
||||
// Remove markup from the given string, returns empty string on error i.e.
|
||||
// if markup was syntactically invalid.
|
||||
static wxString RemoveMarkup(const wxString& markup);
|
||||
|
||||
|
||||
// this field contains the label in wx format, i.e. with '&' mnemonics,
|
||||
// as it was passed to the last SetLabel() call
|
||||
wxString m_labelOrig;
|
||||
|
Reference in New Issue
Block a user