When using a non-subclassed NSControl, use a new wxNonControlNSControl
subclass which implements drawRect: like wxPoserNSView does. If this is not done, NSControl simply eats the drawRect: message. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -20,6 +20,22 @@
|
||||
|
||||
#import <AppKit/NSControl.h>
|
||||
|
||||
@interface wxNonControlNSControl : NSControl
|
||||
{
|
||||
}
|
||||
|
||||
- (void)drawRect: (NSRect)rect;
|
||||
@end // wxNonControlNSControl
|
||||
|
||||
@implementation wxNonControlNSControl : NSControl
|
||||
- (void)drawRect: (NSRect)rect
|
||||
{
|
||||
wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
|
||||
if( !win || !win->Cocoa_drawRect(rect) )
|
||||
[super drawRect:rect];
|
||||
}
|
||||
@end // wxNonControlNSControl
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
|
||||
BEGIN_EVENT_TABLE(wxControl, wxControlBase)
|
||||
END_EVENT_TABLE()
|
||||
@@ -34,7 +50,7 @@ bool wxControl::Create(wxWindow *parent, wxWindowID winid,
|
||||
return false;
|
||||
wxLogDebug("Created control with id=%d",GetId());
|
||||
m_cocoaNSView = NULL;
|
||||
SetNSControl([[NSControl alloc] initWithFrame: MakeDefaultNSRect(size)]);
|
||||
SetNSControl([[wxNonControlNSControl 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];
|
||||
|
Reference in New Issue
Block a user