/////////////////////////////////////////////////////////////////////////////
-// 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
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)
wxBitmapButton::~wxBitmapButton()
{
- DisassociateNSButton(m_cocoaNSView);
+ 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