X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/010d343bb28bbfd7a702a3ac60be30d15e132ba3..4d931bcca003e3616204c1eebc218ec6cd5b7029:/src/cocoa/statbmp.mm diff --git a/src/cocoa/statbmp.mm b/src/cocoa/statbmp.mm index 832ce11acd..10c5ec1ebe 100644 --- a/src/cocoa/statbmp.mm +++ b/src/cocoa/statbmp.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/statbmp.h" +#include "wx/wxprec.h" +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/statbmp.h" +#endif //WX_PRECOMP +#include "wx/cocoa/autorelease.h" -#import +#import IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) BEGIN_EVENT_TABLE(wxStaticBitmap, wxControl) @@ -26,13 +30,16 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID winid, long style, const wxString& name) { + wxAutoNSAutoreleasePool pool; if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name)) return false; m_cocoaNSView = NULL; - SetNSView([[NSView alloc] initWithFrame: NSMakeRect(10,10,20,20)]); + SetNSView([[NSImageView alloc] initWithFrame: MakeDefaultNSRect(size)]); [m_cocoaNSView release]; if(m_parent) m_parent->CocoaAddChild(this); + SetInitialFrameRect(pos,size); + return true; }