X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d5f229692e1ef5b0cbdae2ceb5195c796a8ef7b3..643e9cf9f61fdbe517b15477f9247ca8ac0b3578:/src/cocoa/statline2.mm diff --git a/src/cocoa/statline2.mm b/src/cocoa/statline2.mm index 8ad30c3250..643ca84b0a 100644 --- a/src/cocoa/statline2.mm +++ b/src/cocoa/statline2.mm @@ -1,20 +1,24 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/statline.mm +// Name: src/cocoa/statline2.mm // Purpose: wxStaticLine // Author: David Elliott // Modified by: // Created: 2003/02/15 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/app.h" +#include "wx/wxprec.h" +#ifndef WX_PRECOMP + #include "wx/app.h" +#endif //WX_PRECOMP #include "wx/statline.h" -#import +#include "wx/cocoa/autorelease.h" + +#import -IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl) BEGIN_EVENT_TABLE(wxStaticLine, wxStaticLineBase) END_EVENT_TABLE() // WX_IMPLEMENT_COCOA_OWNER(wxStaticLine,NSTextField,NSControl,NSView) @@ -25,18 +29,20 @@ bool wxStaticLine::Create(wxWindow *parent, wxWindowID winid, long style, const wxString& name) { + wxAutoNSAutoreleasePool pool; if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name)) return false; - SetNSView([[NSView alloc] initWithFrame: NSMakeRect(10,10,20,20)]); + SetNSView([[NSBox alloc] initWithFrame: MakeDefaultNSRect(size)]); [m_cocoaNSView release]; + [(NSBox*)m_cocoaNSView setBoxType: NSBoxSeparator]; if(m_parent) m_parent->CocoaAddChild(this); + SetInitialFrameRect(pos,size); + return true; } wxStaticLine::~wxStaticLine() { - CocoaRemoveFromParent(); - SetNSView(NULL); }