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 8945f901618e37b4a1bbe8ae9d23ad1900c8c909..3b1b5c1061f70611882c943c37a96e7a29f05f60 100644 (file)
--- a/src/cocoa/textctrl.mm
+++ b/src/cocoa/textctrl.mm
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/03/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

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

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


@@ -24,6 +24,7 @@
 
 #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>


@@ -45,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)];
 


@@ -93,15 +94,7 @@ void wxTextCtrl::Cocoa_didChangeText(void)
 
 void wxTextCtrl::CocoaTarget_action(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);
+    SendTextUpdatedEvent();

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