Bail out if GetCurrentMenu returns NULL

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

diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm
index 08d2b9853c2fb61a9fd094c127731b3d6ef0b5a8..a4955ccb28e45fac0c9138b9e307a073c8142c4a 100644 (file)
--- 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
 // Created:     2002/12/30
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2002 David Elliott

-// Licence:    wxWindows license
+// Licence:    wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -16,6 +16,7 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

+#include "wx/stockitem.h"

 #include "wx/cocoa/autorelease.h"
 
 #import <AppKit/NSButton.h>
 #include "wx/cocoa/autorelease.h"
 
 #import <AppKit/NSButton.h>


@@ -27,40 +28,42 @@ END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxButton,NSButton,NSControl,NSView)
 
 bool wxButton::Create(wxWindow *parent, wxWindowID winid,
 WX_IMPLEMENT_COCOA_OWNER(wxButton,NSButton,NSControl,NSView)
 
 bool wxButton::Create(wxWindow *parent, wxWindowID winid,

-            const wxString& label, const wxPoint& pos,
+            const wxString& lbl, const wxPoint& pos,

             const wxSize& size, long style,
             const wxValidator& validator, const wxString& name)
 {
             const wxSize& size, long style,
             const wxValidator& validator, const wxString& name)
 {

+    wxString label((lbl.empty() && wxIsStockID(winid))?wxGetStockLabel(winid):lbl);
+

     wxAutoNSAutoreleasePool pool;
     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;
     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;
     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)
 {

-    wxLogDebug("YAY!");
+    wxLogTrace(wxTRACE_COCOA,wxT("YAY!"));

     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
     InitCommandEvent(event); //    event.SetEventObject(this);
     Command(event);
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId());
     InitCommandEvent(event); //    event.SetEventObject(this);
     Command(event);


@@ -68,12 +71,12 @@ void wxButton::Cocoa_wxNSButtonAction(void)
 
 wxString wxButton::GetLabel() const
 {
 
 wxString wxButton::GetLabel() const
 {

-    return wxString([[GetNSButton() title] lossyCString]);
+    return wxStringWithNSString([GetNSButton() title]);

 }
 
 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()