Fixed menu creation in eVC3

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

diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm
index 1f28f4532b8f4518096eb03b1c71061ef7a4ebb9..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()
@@ -33,9 +49,8 @@ bool wxControl::Create(wxWindow *parent, wxWindowID winid,
     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([[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];
@@ -44,13 +59,14 @@ bool wxControl::Create(wxWindow *parent, wxWindowID winid,
 
     if(m_parent)
         m_parent->CocoaAddChild(this);
+    SetInitialFrameRect(pos,size);
 
     return true;
 }
 
 wxControl::~wxControl()
 {
-    DisassociateNSControl(m_cocoaNSView);
+    DisassociateNSControl(GetNSControl());
 }
 
 wxSize wxControl::DoGetBestSize() const
@@ -68,16 +84,11 @@ wxSize wxControl::DoGetBestSize() const
 
 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];
+}
+