X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/570aaadf1ff3f8c3f8ecfea44dbeae64532c82c4..e8f60bac1ab18be00b4e433f5db7b0261c5f17da:/src/cocoa/control.mm

diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm
index eac63d12e3..fac6d2831d 100644
--- a/src/cocoa/control.mm
+++ b/src/cocoa/control.mm
@@ -16,6 +16,8 @@
     #include "wx/log.h"
 #endif
 
+#include "wx/cocoa/autorelease.h"
+
 #import <AppKit/NSControl.h>
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
@@ -31,9 +33,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([[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];
@@ -42,6 +43,7 @@ bool wxControl::Create(wxWindow *parent, wxWindowID winid,
 
     if(m_parent)
         m_parent->CocoaAddChild(this);
+    SetInitialFrameRect(pos,size);
 
     return true;
 }
@@ -53,6 +55,7 @@ wxControl::~wxControl()
 
 wxSize wxControl::DoGetBestSize() const
 {
+    wxAutoNSAutoreleasePool pool;
     wxASSERT(m_cocoaNSView);
     NSRect storedRect = [m_cocoaNSView frame];
     [GetNSControl() sizeToFit];
@@ -65,16 +68,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];
+}
+