X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d656ea93c0f3d53f97a1c67244baa39d72b7334..2b9a7d4cc2f5f55df3d83f7cf2160cf9a509a4f2:/src/cocoa/stattext.mm diff --git a/src/cocoa/stattext.mm b/src/cocoa/stattext.mm index 29e247c9c9..1e9c86e7f3 100644 --- a/src/cocoa/stattext.mm +++ b/src/cocoa/stattext.mm @@ -6,13 +6,17 @@ // Created: 2003/02/15 // RCS-ID: $Id: // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/app.h" -#include "wx/stattext.h" +#include "wx/wxprec.h" +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/stattext.h" +#endif //WX_PRECOMP #include "wx/cocoa/autorelease.h" +#include "wx/cocoa/string.h" #import #import @@ -36,7 +40,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID winid, m_cocoaNSView = NULL; SetNSTextField([[NSTextField alloc] initWithFrame:MakeDefaultNSRect(size)]); [m_cocoaNSView release]; - [GetNSTextField() setStringValue:[NSString stringWithCString:label.c_str()]]; + [GetNSTextField() setStringValue:wxNSStringWithWxString(label)]; // [GetNSTextField() setBordered: NO]; [GetNSTextField() setBezeled: NO]; [GetNSTextField() setEditable: NO]; @@ -57,7 +61,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID winid, wxStaticText::~wxStaticText() { - DisassociateNSTextField(m_cocoaNSView); + DisassociateNSTextField(GetNSTextField()); } void wxStaticText::SetLabel(const wxString& label)