Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing wxUSE_MARKUP checks in wxOSX code.

Browse Source 
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:
Vadim Zeitlin
2011-03-02 10:15:35 +00:00
parent 8529b0b909
commit 6a219e34a0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/core/private.h
View File

@@ -270,7 +270,7 @@ public :
virtual void SetDefaultButton( bool isDefault ) = 0; virtual void SetDefaultButton( bool isDefault ) = 0;
virtual void PerformClick() = 0; virtual void PerformClick() = 0;
virtual void SetLabel( const wxString& title, wxFontEncoding encoding ) = 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) ) { } virtual void SetLabelMarkup( const wxString& WXUNUSED(markup) ) { }
#endif #endif

2
src/osx/cocoa/button.mm
View File

@@ -130,6 +130,7 @@ public:
wxWidgetCocoaImpl::SetBitmap(bitmap); wxWidgetCocoaImpl::SetBitmap(bitmap);
} }
#if wxUSE_MARKUP
virtual void SetLabelMarkup(const wxString& markup) virtual void SetLabelMarkup(const wxString& markup)
{ {
wxMarkupToAttrString toAttr(GetWXPeer(), markup); wxMarkupToAttrString toAttr(GetWXPeer(), markup);
@@ -146,6 +147,7 @@ public:
[GetNSButton() setAttributedTitle:attrString]; [GetNSButton() setAttributedTitle:attrString];
} }
#endif // wxUSE_MARKUP
void SetPressedBitmap( const wxBitmap& bitmap ) void SetPressedBitmap( const wxBitmap& bitmap )
{ {