don't inherit font from the parent by default

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

diff --git a/src/cocoa/textctrl.mm b/src/cocoa/textctrl.mm
index 1036882df4b71129e2d3bda6c1cd53097864c8a4..6ead7fdd43e175125196f043b083a02fe8b6a5b4 100644 (file)
--- 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];
     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)
     [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()
 {
 }
 void wxTextCtrl::DiscardEdits()
 {
 }


@@ -196,6 +201,6 @@ bool wxTextCtrl::CanUndo() const
 wxString wxTextCtrl::GetValue() const
 {
     wxAutoNSAutoreleasePool pool;
 wxString wxTextCtrl::GetValue() const
 {
     wxAutoNSAutoreleasePool pool;

-    return wxString([[GetNSTextField() stringValue] lossyCString]);
+    return wxStringWithNSString([GetNSTextField() stringValue]);

 }
 
 }