X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da19c58b6085f590b912b56e81cfdb8ff244cdb7..769c3372a2bd68c45d1a4afc8462d3b7939decb1:/src/cocoa/textctrl.mm diff --git a/src/cocoa/textctrl.mm b/src/cocoa/textctrl.mm index 8945f90161..d60d410123 100644 --- 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 -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -24,11 +24,11 @@ #import #import +#import #import #include -IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase) BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) END_EVENT_TABLE() WX_IMPLEMENT_COCOA_OWNER(wxTextCtrl,NSTextField,NSControl,NSView) @@ -45,7 +45,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID winid, 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)]; @@ -93,15 +93,7 @@ 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); + SendTextUpdatedEvent(); } void wxTextCtrl::AppendText(wxString const&)