Add missing wxUSE_MARKUP checks in wxOSX code.
Don't define wxWidgetImpl::SetLabelMarkup() when wxUSE_MARKUP is off and definitely don't reimplement it in wxButtonCocoaImpl as this code doesn't compile without markup support. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -270,7 +270,7 @@ public :
|
||||
virtual void SetDefaultButton( bool isDefault ) = 0;
|
||||
virtual void PerformClick() = 0;
|
||||
virtual void SetLabel( const wxString& title, wxFontEncoding encoding ) = 0;
|
||||
#if wxOSX_USE_COCOA
|
||||
#if wxUSE_MARKUP && wxOSX_USE_COCOA
|
||||
virtual void SetLabelMarkup( const wxString& WXUNUSED(markup) ) { }
|
||||
#endif
|
||||
|
||||
|
@@ -130,6 +130,7 @@ public:
|
||||
wxWidgetCocoaImpl::SetBitmap(bitmap);
|
||||
}
|
||||
|
||||
#if wxUSE_MARKUP
|
||||
virtual void SetLabelMarkup(const wxString& markup)
|
||||
{
|
||||
wxMarkupToAttrString toAttr(GetWXPeer(), markup);
|
||||
@@ -146,6 +147,7 @@ public:
|
||||
|
||||
[GetNSButton() setAttributedTitle:attrString];
|
||||
}
|
||||
#endif // wxUSE_MARKUP
|
||||
|
||||
void SetPressedBitmap( const wxBitmap& bitmap )
|
||||
{
|
||||
|
Reference in New Issue
Block a user