X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da0634c1401743089b1d8be20f9b6bdad0e8085b..618d53b890bfcdc2daf0856fe4a72c69318bf479:/src/cocoa/bmpbuttn.mm diff --git a/src/cocoa/bmpbuttn.mm b/src/cocoa/bmpbuttn.mm index 94b40d9160..c35d8ea44b 100644 --- a/src/cocoa/bmpbuttn.mm +++ b/src/cocoa/bmpbuttn.mm @@ -1,21 +1,26 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/bmpbuttn.mm +// Name: src/cocoa/bmpbuttn.mm // Purpose: wxBitmapButton // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + +#if wxUSE_BMPBUTTON + +#include "wx/bmpbuttn.h" + #ifndef WX_PRECOMP - #include "wx/defs.h" - #include "wx/bmpbuttn.h" #include "wx/log.h" #endif +#include "wx/cocoa/autorelease.h" + #import <AppKit/NSButton.h> #import <Foundation/NSString.h> @@ -29,38 +34,39 @@ bool wxBitmapButton::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:@"Bitmap Button"]; + [GetNSButton() setBezelStyle: NSRegularSquareBezelStyle]; + [GetNSButton() setImage:bitmap.GetNSImage(true)]; [GetNSControl() sizeToFit]; if(m_parent) m_parent->CocoaAddChild(this); + SetInitialFrameRect(pos,size); return true; } wxBitmapButton::~wxBitmapButton() { - CocoaRemoveFromParent(); - SetNSButton(NULL); + DisassociateNSButton(GetNSButton()); } void wxBitmapButton::Cocoa_wxNSButtonAction(void) { - wxLogDebug("YAY!"); + wxLogTrace(wxTRACE_COCOA,wxT("YAY!")); wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetId()); InitCommandEvent(event); // event.SetEventObject(this); Command(event); } +#endif