#include "wx/log.h"
#endif
+#include "wx/cocoa/autorelease.h"
+
#import <AppKit/NSControl.h>
IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
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);
m_cocoaNSView = NULL;
- SetNSControl([[NSControl alloc] initWithFrame: cocoaRect]);
+ SetNSControl([[NSControl 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];
if(m_parent)
m_parent->CocoaAddChild(this);
+ SetInitialFrameRect(pos,size);
return true;
}
wxSize wxControl::DoGetBestSize() const
{
+ wxAutoNSAutoreleasePool pool;
wxASSERT(m_cocoaNSView);
NSRect storedRect = [m_cocoaNSView frame];
[GetNSControl() sizeToFit];
bool wxControl::ProcessCommand(wxCommandEvent& event)
{
-#if WXWIN_COMPATIBILITY
- if ( m_callback )
- {
- (void)(*m_callback)(*this, event);
-
- return TRUE;
- }
- else
-#endif // WXWIN_COMPATIBILITY
-
return GetEventHandler()->ProcessEvent(event);
}
+void wxControl::CocoaSetEnabled(bool enable)
+{
+ [GetNSControl() setEnabled: enable];
+}
+