projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compilation fix after wxBrushStyle changes (closes #9593)
[wxWidgets.git]
/
src
/
cocoa
/
bmpbuttn.mm
diff --git
a/src/cocoa/bmpbuttn.mm
b/src/cocoa/bmpbuttn.mm
index 2ae02dfdd09fa10c65756d7bfe27974c0947549b..c35d8ea44b768fe7a7899d635a0b6bb7f5e8339c 100644
(file)
--- 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
// Purpose: wxBitmapButton
// Author: David Elliott
// Modified by:
// Created: 2003/03/16
-// RCS-ID: $Id
:
+// RCS-ID: $Id
$
// Copyright: (c) 2003 David Elliott
// Copyright: (c) 2003 David Elliott
-// Licence:
wxWindows licens
e
+// Licence:
wxWidgets licenc
e
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
+
+#if wxUSE_BMPBUTTON
+
+#include "wx/bmpbuttn.h"
+
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
- #include "wx/defs.h"
- #include "wx/bmpbuttn.h"
#include "wx/log.h"
#endif
#include "wx/log.h"
#endif
@@
-32,37
+35,38
@@
bool wxBitmapButton::Create(wxWindow *parent, wxWindowID winid,
const wxValidator& validator, const wxString& name)
{
wxAutoNSAutoreleasePool pool;
const wxValidator& validator, const wxString& name)
{
wxAutoNSAutoreleasePool pool;
- wxLog
Debug("Creating control with id=%d"
,winid);
+ wxLog
Trace(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];
// 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:
NSRounded
BezelStyle];
- [GetNSButton() set
Title:@"Bitmap Button"
];
+ [GetNSButton() setBezelStyle:
NSRegularSquare
BezelStyle];
+ [GetNSButton() set
Image:bitmap.GetNSImage(true)
];
[GetNSControl() sizeToFit];
if(m_parent)
m_parent->CocoaAddChild(this);
[GetNSControl() sizeToFit];
if(m_parent)
m_parent->CocoaAddChild(this);
+ SetInitialFrameRect(pos,size);
return true;
}
wxBitmapButton::~wxBitmapButton()
{
return true;
}
wxBitmapButton::~wxBitmapButton()
{
- DisassociateNSButton(
m_cocoaNSView
);
+ DisassociateNSButton(
GetNSButton()
);
}
void wxBitmapButton::Cocoa_wxNSButtonAction(void)
{
}
void wxBitmapButton::Cocoa_wxNSButtonAction(void)
{
- wxLog
Debug("YAY!"
);
+ wxLog
Trace(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);
}
+#endif