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

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index a42f8287abad1e5664f75686c12c63bf753c33a3..6da5f8c7b0b9b2aaa569627d5650f32ee3a08da3 100644 (file)
--- 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;
     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
 
     virtual void        SetLabelMarkup( const wxString& WXUNUSED(markup) ) { }
 #endif
 

diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm
index 8e25f09c48e46210cfa193ca8e53d737a0ade4f4..2eb0889fe250f7d0d224471f34246173550f4187 100644 (file)
--- a/src/osx/cocoa/button.mm
+++ b/src/osx/cocoa/button.mm
@@ -130,6 +130,7 @@ public:
         wxWidgetCocoaImpl::SetBitmap(bitmap);
     }
 
         wxWidgetCocoaImpl::SetBitmap(bitmap);
     }
 

+#if wxUSE_MARKUP

     virtual void SetLabelMarkup(const wxString& markup)
     {
         wxMarkupToAttrString toAttr(GetWXPeer(), markup);
     virtual void SetLabelMarkup(const wxString& 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 )
     {