X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..3e1924dd5f5744c3e2a8973de9b3e4f372b7fd85:/src/cocoa/bmpbuttn.mm?ds=sidebyside diff --git a/src/cocoa/bmpbuttn.mm b/src/cocoa/bmpbuttn.mm index 3b12f4224f..c35d8ea44b 100644 --- a/src/cocoa/bmpbuttn.mm +++ b/src/cocoa/bmpbuttn.mm @@ -1,18 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 @@ -26,34 +29,24 @@ BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase) END_EVENT_TABLE() WX_IMPLEMENT_COCOA_OWNER(wxBitmapButton,NSButton,NSControl,NSView) -wxBitmapButtonBase::wxBitmapButtonBase() - : m_bmpNormal(), - m_bmpSelected(), - m_bmpFocus(), - m_bmpDisabled(), - m_marginX(0), - m_marginY(0) -{ -} - bool wxBitmapButton::Create(wxWindow *parent, wxWindowID winid, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size, long style, 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()); + wxLogTrace(wxTRACE_COCOA,wxT("Created control with id=%d"),GetId()); m_cocoaNSView = NULL; 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) @@ -70,9 +63,10 @@ wxBitmapButton::~wxBitmapButton() 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