X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a4c6734ad039e2cf4ec6a36e578cde893b561d9..dd12ce22d806e6a9c40cf7bdfddbb237cd55b0ca:/src/mac/carbon/button.cpp diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index f280182a11..28b8697630 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -17,6 +17,7 @@ #include "wx/button.h" #include "wx/panel.h" +#include "wx/stockitem.h" #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) @@ -25,12 +26,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) #include "wx/mac/uma.h" // Button -bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, +bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) { + wxString label(lbl); + if (label.empty() && wxIsStockID(id)) + label = wxGetStockLabel(id); + m_macIsUserPane = FALSE ; if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) )