X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/449c567346a1b3937e532cd87aac007faad76b04..0962839d231c7ae1250337c9a22c1384dd0285ea:/src/cocoa/spinbutt.mm diff --git a/src/cocoa/spinbutt.mm b/src/cocoa/spinbutt.mm index 2a3cd8038d..a304c38be5 100644 --- a/src/cocoa/spinbutt.mm +++ b/src/cocoa/spinbutt.mm @@ -6,7 +6,7 @@ // Created: 2003/07/14 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -30,10 +30,19 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID winid, const wxPoint& pos, const wxSize& size, long style, const wxString& name) { + //bad flag checking + wxASSERT_MSG( !(style & wxSP_HORIZONTAL), wxT("Horizontal wxSpinButton not supported in cocoa")); if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name)) return false; SetNSControl([[NSStepper alloc] initWithFrame: MakeDefaultNSRect(size)]); [m_cocoaNSView release]; + + //flag handling + [(NSStepper*)m_cocoaNSView setValueWraps:style & wxSP_WRAP]; //default == true, evidently + + //final setup + [(NSStepper*)m_cocoaNSView setTarget: sm_cocoaTarget]; + [(NSStepper*)m_cocoaNSView setAction:@selector(wxNSControlAction:)]; if(m_parent) m_parent->CocoaAddChild(this); SetInitialFrameRect(pos,size); @@ -43,6 +52,35 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID winid, wxSpinButton::~wxSpinButton() { + [(NSStepper*)m_cocoaNSView setTarget: nil]; + [(NSStepper*)m_cocoaNSView setAction: nil]; +} + +int wxSpinButton::GetValue() const +{ + return [(NSStepper*)m_cocoaNSView intValue]; +} + +void wxSpinButton::SetValue(int value) +{ + [(NSStepper*)m_cocoaNSView setIntValue:value]; +} + +void wxSpinButton::SetRange(int minValue, int maxValue) +{ + [(NSStepper*)m_cocoaNSView setMinValue:minValue]; + [(NSStepper*)m_cocoaNSView setMaxValue:maxValue]; + wxSpinButtonBase::SetRange(minValue,maxValue); +} + +void wxSpinButton::CocoaTarget_action() +{ + /* TODO: up/down events */ + /* This sends the changed event (not specific on up or down) */ + wxSpinEvent event(wxEVT_SCROLL_THUMBTRACK, GetId()); + event.SetPosition(GetValue()); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); } #endif // wxUSE_SPINBTN