Patch 1709108

[wxWidgets.git] / src / mac / carbon / button.cpp

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index b1d1f7228f83c5b4ba039886cfddfec9feaec490..fe3f47987009d93558353f0058c5b99d38119720 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -15,6 +15,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/panel.h"
+    #include "wx/toplevel.h"
 #endif
 
 #include "wx/stockitem.h"
@@ -100,20 +101,19 @@ bool wxButton::Create(wxWindow *parent,
     return true;
 }
 
-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()
 {
-    wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
-    wxButton *btnOldDefault = NULL;
-    if ( tlw )
-    {
-        btnOldDefault = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
-        tlw->SetDefaultItem(this);
-    }
+    wxWindow *btnOldDefault = wxButtonBase::SetDefault();
 
     if ( btnOldDefault )
-        btnOldDefault->m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 0 ) ;
+    {
+        // cast needed to access the protected member
+        btnOldDefault->GetPeer()->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 0 ) ;
+    }
 
     m_peer->SetData(kControlButtonPart , kControlPushButtonDefaultTag , (Boolean) 1 ) ;
+
+    return btnOldDefault;
 }
 
 wxSize wxButton::DoGetBestSize() const