X property data is long for format 32

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

diff --git a/src/cocoa/textctrl.mm b/src/cocoa/textctrl.mm
index ba2bc6060de3214e847898a7a1b771f51aeacb83..8945f901618e37b4a1bbe8ae9d23ad1900c8c909 100644 (file)
--- a/src/cocoa/textctrl.mm
+++ b/src/cocoa/textctrl.mm
@@ -2,7 +2,7 @@
 // Name:        src/cocoa/textctrl.mm
 // Purpose:     wxTextCtrl
 // Author:      David Elliott
-// Modified by:
+// Modified by: Mark Oxenham
 // Created:     2003/03/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
@@ -59,6 +59,26 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID winid,
     if(m_parent)
         m_parent->CocoaAddChild(this);
     SetInitialFrameRect(pos,size);
+
+    [(NSTextField*)m_cocoaNSView setTarget: sm_cocoaTarget];
+    [(NSTextField*)m_cocoaNSView setAction:@selector(wxNSControlAction:)];
+
+    // set the text alignment option
+    NSTextAlignment alignStyle;
+    if (style & wxTE_RIGHT)
+        alignStyle = NSRightTextAlignment;
+    else if (style & wxTE_CENTRE)
+        alignStyle = NSCenterTextAlignment;
+    else // default to wxTE_LEFT because it is 0 and can't be tested
+        alignStyle = NSLeftTextAlignment;
+    [GetNSControl() setAlignment:alignStyle];
+
+    // if Read-only then set as such, this flag is overwritable by wxTextCtrl::SetEditable(TRUE)
+    if (style & wxTE_READONLY)
+    {
+        SetEditable(FALSE);
+    }
+
     return true;
 }
 
@@ -71,12 +91,35 @@ void wxTextCtrl::Cocoa_didChangeText(void)
 {
 }
 
+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::SetEditable(bool)
+void wxTextCtrl::SetEditable(bool editable)
 {
+    // first ensure that the current value is stored (in case the user had not finished editing
+    // before SetEditable(FALSE) was called)
+    DoSetValue(GetValue(),1);
+
+    [GetNSTextField() setEditable: editable];
+
+    // forces the focus on the textctrl to be lost - while focus is still maintained
+    // after SetEditable(FALSE) the user may still edit the control
+    // (might not the best way to do this..)
+    [GetNSTextField() abortEditing];
 }
 
 void wxTextCtrl::MarkDirty()
@@ -135,10 +178,13 @@ void wxTextCtrl::Replace(long, long, 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&)
@@ -147,7 +193,7 @@ void wxTextCtrl::WriteText(wxString const&)
 
 bool wxTextCtrl::IsEditable() const
 {
-    return true;
+    return [GetNSTextField() isEditable];
 }
 
 bool wxTextCtrl::IsModified() const
@@ -181,7 +227,8 @@ int wxTextCtrl::GetLineLength(long) const
 
 wxTextPos wxTextCtrl::GetLastPosition() const
 {
-    return 0;
+    // working - returns the size of the wxString
+    return (long)(GetValue().Len());
 }
 
 int wxTextCtrl::GetNumberOfLines() const