From 6a219e34a02be0c6bd3a11cfeed8343db39ee8f6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 2 Mar 2011 10:15:35 +0000 Subject: [PATCH] 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 --- include/wx/osx/core/private.h | 2 +- src/osx/cocoa/button.mm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h index a42f8287ab..6da5f8c7b0 100644 --- a/include/wx/osx/core/private.h +++ b/include/wx/osx/core/private.h @@ -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 diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm index 8e25f09c48..2eb0889fe2 100644 --- a/src/osx/cocoa/button.mm +++ b/src/osx/cocoa/button.mm @@ -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 ) { -- 2.47.2