/////////////////////////////////////////////////////////////////////////////
-// 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>
+
+#include <math.h>
IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
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)
{
}
+void wxTextCtrl::MarkDirty()
+{
+}
+
void wxTextCtrl::DiscardEdits()
{
}
void wxTextCtrl::SetValue(wxString const& value)
{
+ wxAutoNSAutoreleasePool pool;
[GetNSTextField() setStringValue: wxNSStringWithWxString(value)];
}
return 0;
}
-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const
{
return 0;
}
wxString wxTextCtrl::GetValue() const
{
- return wxString([[GetNSTextField() stringValue] lossyCString]);
+ 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;
+}