Unicode build fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-01-22 07:29:54 +00:00
parent 9e888492a6
commit b0c0a393c4
11 changed files with 23 additions and 18 deletions

View File

@@ -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)
@@ -200,6 +201,6 @@ bool wxTextCtrl::CanUndo() const
wxString wxTextCtrl::GetValue() const
{
wxAutoNSAutoreleasePool pool;
return wxString([[GetNSTextField() stringValue] lossyCString]);
return wxStringWithNSString([GetNSTextField() stringValue]);
}