/////////////////////////////////////////////////////////////////////////////
-// 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/wxprec.h"
+
+#include "wx/textctrl.h"
+
#ifndef WX_PRECOMP
#include "wx/app.h"
- #include "wx/textctrl.h"
#include "wx/log.h"
#endif //WX_PRECOMP
#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)
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
END_EVENT_TABLE()
WX_IMPLEMENT_COCOA_OWNER(wxTextCtrl,NSTextField,NSControl,NSView)
if(m_parent)
m_parent->CocoaAddChild(this);
SetInitialFrameRect(pos,size);
+
+ [(NSTextField*)m_cocoaNSView setTarget: sm_cocoaTarget];
+ [(NSTextField*)m_cocoaNSView setAction:@selector(wxNSControlAction:)];
+
return true;
}
{
}
+void wxTextCtrl::CocoaTarget_action(void)
+{
+ // NSTextField only sends the action message on enter key press and thus
+ // we send the appropriate event type.
+ wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, GetId());
+
+ // See wxTextCtrlBase::SendTextUpdatedEvent for why we don't set the string.
+ //event.SetString(GetValue());
+
+ event.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(event);
+}
+
void wxTextCtrl::AppendText(wxString const&)
{
}
{
}
-void wxTextCtrl::SetValue(wxString const& value)
+void wxTextCtrl::DoSetValue(wxString const& value, int flags)
{
wxAutoNSAutoreleasePool pool;
[GetNSTextField() setStringValue: wxNSStringWithWxString(value)];
+
+ if ( flags & SetValue_SendEvent )
+ SendTextUpdatedEvent();
}
void wxTextCtrl::WriteText(wxString const&)
return 0;
}
-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const
{
return 0;
}
NSCell *cell = [GetNSControl() cell];
wxASSERT(cell);
NSSize cellSize = [cell cellSize];
- wxSize size(100,(int)ceilf(cellSize.height));
+ 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;
}
-