X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/911e17c6cf31c0e9e7ab4cdb8e03d66203ebbab8..b09a59f521e4a365f1b073e26e53f17a5e03e1fa:/src/cocoa/statbox.mm?ds=sidebyside diff --git a/src/cocoa/statbox.mm b/src/cocoa/statbox.mm index 7e6e457e7e..f60c482e30 100644 --- a/src/cocoa/statbox.mm +++ b/src/cocoa/statbox.mm @@ -6,7 +6,7 @@ // Created: 2003/02/15 // RCS-ID: $Id: // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -16,6 +16,7 @@ #endif //WX_PRECOMP #include "wx/cocoa/autorelease.h" +#include "wx/cocoa/string.h" #import #import @@ -26,18 +27,15 @@ END_EVENT_TABLE() WX_IMPLEMENT_COCOA_OWNER(wxStaticBox,NSBox,NSView,NSView) bool wxStaticBox::Create(wxWindow *parent, wxWindowID winid, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, const wxValidator& validator, - const wxString& name) + const wxString& title, const wxPoint& pos, const wxSize& size, + long style, const wxString& name) { wxAutoNSAutoreleasePool pool; - if(!CreateControl(parent,winid,pos,size,style,validator,name)) + if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name)) return false; m_cocoaNSView = NULL; SetNSBox([[NSBox alloc] initWithFrame:MakeDefaultNSRect(size)]); - [GetNSBox() setTitle:[NSString stringWithCString:title.c_str()]]; + [GetNSBox() setTitle:wxNSStringWithWxString(wxStripMenuCodes(title))]; if(m_parent) m_parent->CocoaAddChild(this); SetInitialFrameRect(pos,size);