X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c8cae94c72c219a41789a115a142c5e7d5defd1a..448971f395cc928aea625448fdd74dcac5a6cb1c:/src/cocoa/button.mm

diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index aa8472a8d7..5bd7101249 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:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -16,6 +16,8 @@
     #include "wx/log.h"
 #endif
 
+#include "wx/cocoa/autorelease.h"
+
 #import <AppKit/NSButton.h>
 #include "wx/cocoa/string.h"
 
@@ -29,38 +31,54 @@ bool wxButton::Create(wxWindow *parent, wxWindowID winid,
             const wxSize& size, long style,
             const wxValidator& validator, const wxString& name)
 {
-    wxLogDebug("Creating control with id=%d",winid);
+    wxAutoNSAutoreleasePool pool;
+    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()
 {
-    CocoaRemoveFromParent();
-    SetNSButton(NULL);
+    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
+    return wxDefaultSize;
+}
+