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:
@@ -236,6 +236,8 @@ wxControlBase::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(va
|
||||
// wxControl markup support
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if wxUSE_MARKUP
|
||||
|
||||
/* static */
|
||||
wxString wxControlBase::RemoveMarkup(const wxString& markup)
|
||||
{
|
||||
@@ -253,6 +255,8 @@ bool wxControlBase::DoSetLabelMarkup(const wxString& markup)
|
||||
return true;
|
||||
}
|
||||
|
||||
#endif // wxUSE_MARKUP
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxControlBase - ellipsization code
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user