Add wxUSE_MARKUP and wrap SetLabelMarkup() in it.
Make it possible to disable all the new markup-related code by setting wxUSE_MARKUP to 0 in setup.h or using configure --disable-markup option. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -133,6 +133,8 @@ void wxStaticText::SetLabel(const wxString& label)
|
||||
GTKDoSetLabel(&wxStaticText::GTKSetLabelForLabel, label);
|
||||
}
|
||||
|
||||
#if wxUSE_MARKUP
|
||||
|
||||
bool wxStaticText::DoSetLabelMarkup(const wxString& markup)
|
||||
{
|
||||
const wxString stripped = RemoveMarkup(markup);
|
||||
@@ -146,6 +148,8 @@ bool wxStaticText::DoSetLabelMarkup(const wxString& markup)
|
||||
return true;
|
||||
}
|
||||
|
||||
#endif // wxUSE_MARKUP
|
||||
|
||||
bool wxStaticText::SetFont( const wxFont &font )
|
||||
{
|
||||
const bool wasUnderlined = GetFont().GetUnderlined();
|
||||
|
Reference in New Issue
Block a user