X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f1e01716310cb6e3bfcf5894b442d277bc32789a..0d1903dbda864780eec30efdc4e91776bdbfd21b:/src/cocoa/button.mm

diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index 0485809e1b..ab68639c6e 100644
--- a/src/cocoa/button.mm
+++ b/src/cocoa/button.mm
@@ -4,9 +4,8 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/30
-// RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -48,7 +47,20 @@ bool wxButton::Create(wxWindow *parent, wxWindowID winid,
     [m_cocoaNSView release];
 
     [GetNSButton() setBezelStyle:NSRoundedBezelStyle];
-    [GetNSButton() setTitle:wxNSStringWithWxString(wxStripMenuCodes(label))];
+    CocoaSetLabelForObject(label, GetNSButton());
+
+    do
+    {
+        NSTextAlignment mode;
+        if ((style & wxBU_LEFT) && !(style & wxBU_RIGHT))
+            mode = NSLeftTextAlignment;
+        else if ((style & wxBU_RIGHT) && !(style & wxBU_LEFT))
+            mode = NSRightTextAlignment;
+        else
+            break;
+        [GetNSControl() setAlignment:mode];
+    } while(0);
+
     [GetNSControl() sizeToFit];
 
     if(m_parent)
@@ -66,7 +78,7 @@ wxButton::~wxButton()
 void wxButton::Cocoa_wxNSButtonAction(void)
 {
     wxLogTrace(wxTRACE_COCOA,wxT("YAY!"));
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
+    wxCommandEvent event(wxEVT_BUTTON, GetId());
     InitCommandEvent(event); //    event.SetEventObject(this);
     Command(event);
 }
@@ -78,7 +90,7 @@ wxString wxButton::GetLabel() const
 
 void wxButton::SetLabel(const wxString& label)
 {
-    [GetNSButton() setTitle:wxNSStringWithWxString(wxStripMenuCodes(label))];
+    CocoaSetLabelForObject(label, GetNSButton());
 }
 
 wxSize wxButton::DoGetBestSize() const