X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7f11f60d0959321fa6f76cc0ba86f250fe9b130..c0b0635cf69537ca32377bad5650b39402cb21b6:/src/cocoa/slider.mm?ds=sidebyside diff --git a/src/cocoa/slider.mm b/src/cocoa/slider.mm index 207f9a8c99..2183b7b5cc 100644 --- a/src/cocoa/slider.mm +++ b/src/cocoa/slider.mm @@ -6,16 +6,18 @@ // Created: 2003/06/19 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/setup.h" +#include "wx/wxprec.h" #if wxUSE_SLIDER -#include "wx/app.h" -#include "wx/slider.h" +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/slider.h" +#endif //WX_PRECOMP -#import +#import IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) BEGIN_EVENT_TABLE(wxSlider, wxSliderBase) @@ -29,17 +31,17 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID winid, { if(!CreateControl(parent,winid,pos,size,style,validator,name)) return false; - SetNSView([[NSView alloc] initWithFrame: NSMakeRect(10,10,20,20)]); + SetNSView([[NSSlider alloc] initWithFrame: MakeDefaultNSRect(size)]); [m_cocoaNSView release]; if(m_parent) m_parent->CocoaAddChild(this); + SetInitialFrameRect(pos,size); + return true; } wxSlider::~wxSlider() { - CocoaRemoveFromParent(); - SetNSView(NULL); } #endif // wxUSE_SLIDER