const wxValidator& validator, const wxString& name)
{
wxAutoNSAutoreleasePool pool;
- wxLogDebug("Creating control with id=%d",winid);
+ wxLogTrace(wxTRACE_COCOA,wxT("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);
+ wxLogTrace(wxTRACE_COCOA,wxT("Created control with id=%d"),GetId());
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()
{
- DisassociateNSButton(m_cocoaNSView);
+ DisassociateNSButton(GetNSButton());
}
void wxButton::Cocoa_wxNSButtonAction(void)
{
- wxLogDebug("YAY!");
+ wxLogTrace(wxTRACE_COCOA,wxT("YAY!"));
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
InitCommandEvent(event); // event.SetEventObject(this);
Command(event);
}
+wxString wxButton::GetLabel() const
+{
+ return wxStringWithNSString([GetNSButton() title]);
+}
+
+void wxButton::SetLabel(const wxString& label)
+{
+ [GetNSButton() setTitle:wxNSStringWithWxString(wxStripMenuCodes(label))];
+}
+
wxSize wxButtonBase::GetDefaultSize()
{
// FIXME: stub