From b6567e32eedc90113e05ad8241cff5872f55743d Mon Sep 17 00:00:00 2001 From: David Elliott Date: Mon, 8 Sep 2003 18:14:57 +0000 Subject: [PATCH] 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 --- src/cocoa/control.mm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm index 2919b00d10..c83fa93dab 100644 --- a/src/cocoa/control.mm +++ b/src/cocoa/control.mm @@ -20,6 +20,22 @@ #import +@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]; -- 2.45.2