Don't assert in wxDataViewCtrl::ItemDeleted() if item doesn't exist.

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

diff --git a/src/cocoa/textctrl.mm b/src/cocoa/textctrl.mm
index b1333610cbc63ab5ea9a1dbbca44c45396cf55b9..3b1b5c1061f70611882c943c37a96e7a29f05f60 100644 (file)
--- a/src/cocoa/textctrl.mm
+++ b/src/cocoa/textctrl.mm
@@ -1,18 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/textctrl.mm
+// Name:        src/cocoa/textctrl.mm

 // Purpose:     wxTextCtrl
 // Author:      David Elliott
 // Purpose:     wxTextCtrl
 // Author:      David Elliott

-// Modified by:
+// Modified by: Mark Oxenham

 // Created:     2003/03/16
 // Created:     2003/03/16

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#include "wx/textctrl.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/textctrl.h"

     #include "wx/log.h"
 #endif //WX_PRECOMP
 
     #include "wx/log.h"
 #endif //WX_PRECOMP
 


@@ -22,12 +24,13 @@
 
 #import <Foundation/NSString.h>
 #import <AppKit/NSTextField.h>
 
 #import <Foundation/NSString.h>
 #import <AppKit/NSTextField.h>

+#import <AppKit/NSSecureTextField.h>

 #import <AppKit/NSCell.h>
 
 #include <math.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)
 
 END_EVENT_TABLE()
 WX_IMPLEMENT_COCOA_OWNER(wxTextCtrl,NSTextField,NSControl,NSView)
 


@@ -43,7 +46,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID winid,
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
     m_cocoaNSView = NULL;
     if(!CreateControl(parent,winid,pos,size,style,validator,name))
         return false;
     m_cocoaNSView = NULL;

-    SetNSTextField([[NSTextField alloc] initWithFrame:MakeDefaultNSRect(size)]);
+    SetNSTextField([(style & wxTE_PASSWORD)?[NSSecureTextField alloc]:[NSTextField alloc] initWithFrame:MakeDefaultNSRect(size)]);

     [m_cocoaNSView release];
     [GetNSTextField() setStringValue:wxNSStringWithWxString(value)];
 
     [m_cocoaNSView release];
     [GetNSTextField() setStringValue:wxNSStringWithWxString(value)];
 


@@ -57,6 +60,26 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID winid,
     if(m_parent)
         m_parent->CocoaAddChild(this);
     SetInitialFrameRect(pos,size);
     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;
 }
 
     return true;
 }
 


@@ -69,12 +92,27 @@ void wxTextCtrl::Cocoa_didChangeText(void)
 {
 }
 
 {
 }
 

+void wxTextCtrl::CocoaTarget_action(void)
+{
+    SendTextUpdatedEvent();
+}
+

 void wxTextCtrl::AppendText(wxString const&)
 {
 }
 
 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()
 }
 
 void wxTextCtrl::MarkDirty()


@@ -133,10 +171,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)];
 {
     wxAutoNSAutoreleasePool pool;
     [GetNSTextField() setStringValue: wxNSStringWithWxString(value)];

+
+    if ( flags & SetValue_SendEvent )
+        SendTextUpdatedEvent();

 }
 
 void wxTextCtrl::WriteText(wxString const&)
 }
 
 void wxTextCtrl::WriteText(wxString const&)


@@ -145,7 +186,7 @@ void wxTextCtrl::WriteText(wxString const&)
 
 bool wxTextCtrl::IsEditable() const
 {
 
 bool wxTextCtrl::IsEditable() const
 {

-    return true;
+    return [GetNSTextField() isEditable];

 }
 
 bool wxTextCtrl::IsModified() const
 }
 
 bool wxTextCtrl::IsModified() const


@@ -179,7 +220,8 @@ int wxTextCtrl::GetLineLength(long) const
 
 wxTextPos wxTextCtrl::GetLastPosition() const
 {
 
 wxTextPos wxTextCtrl::GetLastPosition() const
 {

-    return 0;
+    // working - returns the size of the wxString
+    return (long)(GetValue().Len());

 }
 
 int wxTextCtrl::GetNumberOfLines() const
 }
 
 int wxTextCtrl::GetNumberOfLines() const


@@ -215,9 +257,8 @@ wxSize wxTextCtrl::DoGetBestSize() const
     NSCell *cell = [GetNSControl() cell];
     wxASSERT(cell);
     NSSize cellSize = [cell cellSize];
     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;
 }
 
     wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxTextCtrl=%p::DoGetBestSize()==(%d,%d)"),this,size.x,size.y);
     return size;
 }

-