X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c05c7cb50b01e7d081e572193cb9c68a6974e1c6..404b319a85dadd7decf7a5a5331020520031a41c:/src/cocoa/button.mm

diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index a00ff71329..1ef4130155 100644
--- a/src/cocoa/button.mm
+++ b/src/cocoa/button.mm
@@ -1,18 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/button.mm
+// Name:        src/cocoa/button.mm
 // Purpose:     wxButton
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/30
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:   	wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
+#include "wx/button.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/button.h"
     #include "wx/log.h"
 #endif
 
@@ -47,7 +48,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)
@@ -77,7 +91,7 @@ wxString wxButton::GetLabel() const
 
 void wxButton::SetLabel(const wxString& label)
 {
-    [GetNSButton() setTitle:wxNSStringWithWxString(wxStripMenuCodes(label))];
+    CocoaSetLabelForObject(label, GetNSButton());
 }
 
 wxSize wxButton::DoGetBestSize() const
@@ -108,4 +122,3 @@ wxSize wxButtonBase::GetDefaultSize()
     // Apple HIG says OK/Cancel buttons have default width of 68.
     return wxSize(68,(int)ceil(cocoaRect.size.height));
 }
-