X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb896a322a2ed53d393ee738765ddd3f72cee004..5a1e0e91a1ca5ec98b0eeb335cda757d1261ed08:/src/cocoa/textctrl.mm

diff --git a/src/cocoa/textctrl.mm b/src/cocoa/textctrl.mm
index d417f3a36a..d755334440 100644
--- a/src/cocoa/textctrl.mm
+++ b/src/cocoa/textctrl.mm
@@ -1,22 +1,35 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/textctrl.mm
+// Name:        src/cocoa/textctrl.mm
 // Purpose:     wxTextCtrl
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
-// RCS-ID:      $Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/app.h"
+#include "wx/wxprec.h"
+
 #include "wx/textctrl.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/log.h"
+#endif //WX_PRECOMP
+
+#include "wx/cocoa/string.h"
+
+#include "wx/cocoa/autorelease.h"
+
 #import <Foundation/NSString.h>
 #import <AppKit/NSTextField.h>
+#import <AppKit/NSCell.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+#include <math.h>
+
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxTextCtrl,NSTextField,NSControl,NSView)
 
@@ -28,22 +41,30 @@ 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()]];
+    [GetNSTextField() setStringValue:wxNSStringWithWxString(value)];
+
     [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()
 {
-    CocoaRemoveFromParent();
-    SetNSTextField(NULL);
+    DisassociateNSTextField(GetNSTextField());
 }
 
 void wxTextCtrl::Cocoa_didChangeText(void)
@@ -58,6 +79,10 @@ void wxTextCtrl::SetEditable(bool)
 {
 }
 
+void wxTextCtrl::MarkDirty()
+{
+}
+
 void wxTextCtrl::DiscardEdits()
 {
 }
@@ -110,8 +135,13 @@ void wxTextCtrl::Replace(long, long, wxString const&)
 {
 }
 
-void wxTextCtrl::SetValue(wxString const&)
+void wxTextCtrl::DoSetValue(wxString const& value, int flags)
 {
+    wxAutoNSAutoreleasePool pool;
+    [GetNSTextField() setStringValue: wxNSStringWithWxString(value)];
+
+    if ( flags & SetValue_SendEvent )
+        SendTextUpdatedEvent();
 }
 
 void wxTextCtrl::WriteText(wxString const&)
@@ -152,7 +182,7 @@ int wxTextCtrl::GetLineLength(long) const
     return 0;
 }
 
-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const
 {
     return 0;
 }
@@ -179,6 +209,19 @@ bool wxTextCtrl::CanUndo() const
 
 wxString wxTextCtrl::GetValue() const
 {
-    return wxEmptyString;
+    wxAutoNSAutoreleasePool pool;
+    return wxStringWithNSString([GetNSTextField() stringValue]);
 }
 
+wxSize wxTextCtrl::DoGetBestSize() const
+{
+    wxAutoNSAutoreleasePool pool;
+    wxASSERT(GetNSControl());
+    NSCell *cell = [GetNSControl() cell];
+    wxASSERT(cell);
+    NSSize cellSize = [cell cellSize];
+    wxSize size(100,(int)ceil(cellSize.height));
+
+    wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxTextCtrl=%p::DoGetBestSize()==(%d,%d)"),this,size.x,size.y);
+    return size;
+}