X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0afa3752f635a4fb621e2f55dfa41dce4f062d94..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/osx/button_osx.cpp?ds=sidebyside

diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp
index b52bf2221b..bd55cf3c46 100644
--- a/src/osx/button_osx.cpp
+++ b/src/osx/button_osx.cpp
@@ -51,23 +51,23 @@ bool wxButton::Create(wxWindow *parent,
     const wxValidator& validator,
     const wxString& name)
 {
-    DontCreatePeer();
-    
-    m_marginX =
-    m_marginY = 0;
-
     // FIXME: this hack is needed because we're called from
     //        wxBitmapButton::Create() with this style and we currently use a
     //        different wxWidgetImpl method (CreateBitmapButton() rather than
     //        CreateButton()) for creating bitmap buttons, but we really ought
     //        to unify the creation of buttons of all kinds and then remove
     //        this check
-    if ( style & wxBU_NOTEXT )
+    if ( style & wxBU_NOTEXT && !ShouldCreatePeer() )
     {
         return wxControl::Create(parent, id, pos, size, style,
                                  validator, name);
     }
 
+    DontCreatePeer();
+
+    m_marginX =
+    m_marginY = 0;
+
     wxString label;
 
     // Ignore the standard label for help buttons if possible, they use "?"
@@ -102,7 +102,7 @@ void wxButton::SetLabel(const wxString& label)
 
     wxAnyButton::SetLabel(label);
 #if wxOSX_USE_COCOA
-    OSXSetAcceleratorFromLabel(label);
+    OSXUpdateAfterLabelChange(label);
 #endif
 }
 
@@ -128,7 +128,7 @@ void wxButton::Command (wxCommandEvent & WXUNUSED(event))
 
 bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
+    wxCommandEvent event(wxEVT_BUTTON, m_windowId);
     event.SetEventObject(this);
     ProcessCommand(event);
     return true;
@@ -173,7 +173,7 @@ bool wxDisclosureTriangle::IsOpen() const
 bool wxDisclosureTriangle::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     // Just emit button event for now
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
+    wxCommandEvent event(wxEVT_BUTTON, m_windowId);
     event.SetEventObject(this);
     ProcessCommand(event);