Implement wxApp::Yield

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

diff --git a/src/cocoa/textctrl.mm b/src/cocoa/textctrl.mm
index e062ea4f42c3c8b88b9eca0e966dedd64a01a9de..1036882df4b71129e2d3bda6c1cd53097864c8a4 100644 (file)
--- a/src/cocoa/textctrl.mm
+++ b/src/cocoa/textctrl.mm
@@ -9,11 +9,16 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/app.h"
-#include "wx/textctrl.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/textctrl.h"
+#endif //WX_PRECOMP
 
 #include "wx/cocoa/string.h"
 
+#include "wx/cocoa/autorelease.h"
+
 #import <Foundation/NSString.h>
 #import <AppKit/NSTextField.h>
 
@@ -30,21 +35,29 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID winid,
             const wxValidator& validator,
             const wxString& name)
 {
+    wxAutoNSAutoreleasePool pool;
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
     m_cocoaNSView = NULL;
-    SetNSTextField([[NSTextField alloc] initWithFrame:NSMakeRect(0,0,30,30)]);
+    SetNSTextField([[NSTextField alloc] initWithFrame:MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
     [GetNSTextField() setStringValue:[NSString stringWithCString:value.c_str()]];
     [GetNSControl() sizeToFit];
+    NSRect currentFrame = [m_cocoaNSView frame];
+    if(currentFrame.size.width < 70)
+    {
+        currentFrame.size.width = 70;
+        [m_cocoaNSView setFrame:currentFrame];
+    }
     if(m_parent)
         m_parent->CocoaAddChild(this);
+    SetInitialFrameRect(pos,size);
     return true;
 }
 
 wxTextCtrl::~wxTextCtrl()
 {
-    DisassociateNSTextField(m_cocoaNSView);
+    DisassociateNSTextField(GetNSTextField());
 }
 
 void wxTextCtrl::Cocoa_didChangeText(void)
@@ -113,6 +126,7 @@ void wxTextCtrl::Replace(long, long, wxString const&)
 
 void wxTextCtrl::SetValue(wxString const& value)
 {
+    wxAutoNSAutoreleasePool pool;
     [GetNSTextField() setStringValue: wxNSStringWithWxString(value)];
 }
 
@@ -181,6 +195,7 @@ bool wxTextCtrl::CanUndo() const
 
 wxString wxTextCtrl::GetValue() const
 {
+    wxAutoNSAutoreleasePool pool;
     return wxString([[GetNSTextField() stringValue] lossyCString]);
 }