removed assert which became incorrect after last change

[wxWidgets.git] / src / cocoa / control.mm

diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm
index fac6d2831dd111b861155505822a880ac9f37217..c83fa93dab34f435b4612e6c60bf11013e1aa129 100644 (file)
--- a/src/cocoa/control.mm
+++ b/src/cocoa/control.mm
@@ -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];
@@ -50,7 +66,7 @@ bool wxControl::Create(wxWindow *parent, wxWindowID winid,
 
 wxControl::~wxControl()
 {
-    DisassociateNSControl(m_cocoaNSView);
+    DisassociateNSControl(GetNSControl());
 }
 
 wxSize wxControl::DoGetBestSize() const