X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/911e17c6cf31c0e9e7ab4cdb8e03d66203ebbab8..3ca4086b22723db16d7e0fc23aa9021b4785096a:/src/cocoa/textctrl.mm diff --git a/src/cocoa/textctrl.mm b/src/cocoa/textctrl.mm index 1036882df4..6ead7fdd43 100644 --- a/src/cocoa/textctrl.mm +++ b/src/cocoa/textctrl.mm @@ -41,7 +41,8 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID winid, m_cocoaNSView = NULL; SetNSTextField([[NSTextField alloc] initWithFrame:MakeDefaultNSRect(size)]); [m_cocoaNSView release]; - [GetNSTextField() setStringValue:[NSString stringWithCString:value.c_str()]]; + [GetNSTextField() setStringValue:wxNSStringWithWxString(value)]; + [GetNSControl() sizeToFit]; NSRect currentFrame = [m_cocoaNSView frame]; if(currentFrame.size.width < 70) @@ -72,6 +73,10 @@ void wxTextCtrl::SetEditable(bool) { } +void wxTextCtrl::MarkDirty() +{ +} + void wxTextCtrl::DiscardEdits() { } @@ -196,6 +201,6 @@ bool wxTextCtrl::CanUndo() const wxString wxTextCtrl::GetValue() const { wxAutoNSAutoreleasePool pool; - return wxString([[GetNSTextField() stringValue] lossyCString]); + return wxStringWithNSString([GetNSTextField() stringValue]); }