replace usage of objective-c keyword 'id'

[wxWidgets.git] / src / osx / button_osx.cpp

diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp
index 6c83fb16baf24680459cae742ca15561f4fa65a7..358fffffd3f5a450134b483ff2edde9640dedd75 100644 (file)
--- a/src/osx/button_osx.cpp
+++ b/src/osx/button_osx.cpp
@@ -42,8 +42,6 @@ bool IsHelpButtonWithStandardLabel(wxWindowID id, const wxString& label)
 
 } // anonymous namespace
 
-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-
 BEGIN_EVENT_TABLE(wxButton, wxControl)
     EVT_ENTER_WINDOW(wxButton::OnEnterWindow)
     EVT_LEAVE_WINDOW(wxButton::OnLeaveWindow)
@@ -144,6 +142,20 @@ void wxButton::DoSetBitmapPosition(wxDirection dir)
     InvalidateBestSize();
 }
 
+#if wxUSE_MARKUP && wxOSX_USE_COCOA
+
+bool wxButton::DoSetLabelMarkup(const wxString& markup)
+{
+    if ( !wxButtonBase::DoSetLabelMarkup(markup) )
+        return false;
+
+    m_peer->SetLabelMarkup(markup);
+
+    return true;
+}
+
+#endif // wxUSE_MARKUP && wxOSX_USE_COCOA
+
 wxWindow *wxButton::SetDefault()
 {
     wxWindow *btnOldDefault = wxButtonBase::SetDefault();