X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32cd189dfcfe96c41e32c3b9827bf67484c60b13..ea160f01c60cfc879e1ba3ffec76d113a0404603:/src/cocoa/button.mm diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm index 2e9cb7103c..a78e3b6c59 100644 --- a/src/cocoa/button.mm +++ b/src/cocoa/button.mm @@ -6,7 +6,7 @@ // Created: 2002/12/30 // RCS-ID: $Id$ // Copyright: (c) 2002 David Elliott -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -48,7 +48,20 @@ bool wxButton::Create(wxWindow *parent, wxWindowID winid, [m_cocoaNSView release]; [GetNSButton() setBezelStyle:NSRoundedBezelStyle]; - [GetNSButton() setTitle:wxNSStringWithWxString(GetLabelText(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 +79,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 +91,7 @@ wxString wxButton::GetLabel() const void wxButton::SetLabel(const wxString& label) { - [GetNSButton() setTitle:wxNSStringWithWxString(GetLabelText(label))]; + CocoaSetLabelForObject(label, GetNSButton()); } wxSize wxButton::DoGetBestSize() const