removed assert which became incorrect after last change

[wxWidgets.git] / src / cocoa / button.mm

diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index 08d2b9853c2fb61a9fd094c127731b3d6ef0b5a8..7b93013217cb15932c6238b39e7a38406a41fb49 100644 (file)
--- a/src/cocoa/button.mm
+++ b/src/cocoa/button.mm
@@ -36,26 +36,26 @@ bool wxButton::Create(wxWindow *parent, wxWindowID winid,
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
     wxLogDebug("Created control with id=%d",GetId());
     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;
     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];
     // 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);
     [GetNSControl() sizeToFit];
 
     if(m_parent)
         m_parent->CocoaAddChild(this);

+    SetInitialFrameRect(pos,size);

 
     return true;
 }
 
 wxButton::~wxButton()
 {
 
     return true;
 }
 
 wxButton::~wxButton()
 {

-    DisassociateNSButton(m_cocoaNSView);
+    DisassociateNSButton(GetNSButton());

 }
 
 void wxButton::Cocoa_wxNSButtonAction(void)
 }
 
 void wxButton::Cocoa_wxNSButtonAction(void)


@@ -73,7 +73,7 @@ wxString wxButton::GetLabel() const
 
 void wxButton::SetLabel(const wxString& label)
 {
 
 void wxButton::SetLabel(const wxString& label)
 {

-    [GetNSButton() setTitle:wxNSStringWithWxString(label)];
+    [GetNSButton() setTitle:wxNSStringWithWxString(wxStripMenuCodes(label))];

 }
 
 wxSize wxButtonBase::GetDefaultSize()
 }
 
 wxSize wxButtonBase::GetDefaultSize()