X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c8cae94c72c219a41789a115a142c5e7d5defd1a..a0b0865599239b35bbfb1fcb1d564c077f90eb66:/src/cocoa/button.mm diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm index aa8472a8d7..7b93013217 100644 --- a/src/cocoa/button.mm +++ b/src/cocoa/button.mm @@ -16,6 +16,8 @@ #include "wx/log.h" #endif +#include "wx/cocoa/autorelease.h" + #import #include "wx/cocoa/string.h" @@ -29,31 +31,31 @@ bool wxButton::Create(wxWindow *parent, wxWindowID winid, const wxSize& size, long style, const wxValidator& validator, const wxString& name) { + wxAutoNSAutoreleasePool pool; wxLogDebug("Creating control with id=%d",winid); if(!CreateControl(parent,winid,pos,size,style,validator,name)) return false; wxLogDebug("Created control with id=%d",GetId()); - NSRect cocoaRect = NSMakeRect(10,10,20,20); m_cocoaNSView = NULL; - SetNSButton([[NSButton alloc] initWithFrame: cocoaRect]); + SetNSButton([[NSButton alloc] initWithFrame: MakeDefaultNSRect(size)]); // NOTE: YES we want to release this (to match the alloc). // DoAddChild(this) will retain us again since addSubView doesn't. [m_cocoaNSView release]; [GetNSButton() setBezelStyle:NSRoundedBezelStyle]; - [GetNSButton() setTitle:wxNSStringWithWxString(label)]; + [GetNSButton() setTitle:wxNSStringWithWxString(wxStripMenuCodes(label))]; [GetNSControl() sizeToFit]; if(m_parent) m_parent->CocoaAddChild(this); + SetInitialFrameRect(pos,size); return true; } wxButton::~wxButton() { - CocoaRemoveFromParent(); - SetNSButton(NULL); + DisassociateNSButton(GetNSButton()); } void wxButton::Cocoa_wxNSButtonAction(void) @@ -64,3 +66,19 @@ void wxButton::Cocoa_wxNSButtonAction(void) Command(event); } +wxString wxButton::GetLabel() const +{ + return wxString([[GetNSButton() title] lossyCString]); +} + +void wxButton::SetLabel(const wxString& label) +{ + [GetNSButton() setTitle:wxNSStringWithWxString(wxStripMenuCodes(label))]; +} + +wxSize wxButtonBase::GetDefaultSize() +{ + // FIXME: stub + return wxDefaultSize; +} +