X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/570aaadf1ff3f8c3f8ecfea44dbeae64532c82c4..960cb7d715a21b40d9d2472638a237b210683088:/src/cocoa/statbox.mm diff --git a/src/cocoa/statbox.mm b/src/cocoa/statbox.mm index 766f6773fb..7e6e457e7e 100644 --- a/src/cocoa/statbox.mm +++ b/src/cocoa/statbox.mm @@ -9,8 +9,13 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#include "wx/app.h" -#include "wx/statbox.h" +#include "wx/wxprec.h" +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/statbox.h" +#endif //WX_PRECOMP + +#include "wx/cocoa/autorelease.h" #import #import @@ -27,19 +32,22 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID winid, long style, const wxValidator& validator, const wxString& name) { + wxAutoNSAutoreleasePool pool; if(!CreateControl(parent,winid,pos,size,style,validator,name)) return false; m_cocoaNSView = NULL; - SetNSBox([[NSBox alloc] initWithFrame:NSMakeRect(0,0,30,30)]); + SetNSBox([[NSBox alloc] initWithFrame:MakeDefaultNSRect(size)]); [GetNSBox() setTitle:[NSString stringWithCString:title.c_str()]]; if(m_parent) m_parent->CocoaAddChild(this); + SetInitialFrameRect(pos,size); + return true; } wxStaticBox::~wxStaticBox() { - DisassociateNSBox(m_cocoaNSView); + DisassociateNSBox(GetNSBox()); } void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const