X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d656ea93c0f3d53f97a1c67244baa39d72b7334..907173e51df6d2a91d65463ddf6ce810d3fd921a:/src/cocoa/spinbutt.mm?ds=sidebyside diff --git a/src/cocoa/spinbutt.mm b/src/cocoa/spinbutt.mm index 60d3cd59ef..336787d572 100644 --- a/src/cocoa/spinbutt.mm +++ b/src/cocoa/spinbutt.mm @@ -6,13 +6,15 @@ // Created: 2003/07/14 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// -#include "wx/setup.h" +#include "wx/wxprec.h" #if wxUSE_SPINBTN -#include "wx/app.h" +#ifndef WX_PRECOMP + #include "wx/app.h" +#endif //WX_PRECOMP #include "wx/spinbutt.h" #import @@ -32,6 +34,8 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID winid, return false; SetNSControl([[NSStepper alloc] initWithFrame: MakeDefaultNSRect(size)]); [m_cocoaNSView release]; + [(NSStepper*)m_cocoaNSView setTarget: sm_cocoaTarget]; + [(NSStepper*)m_cocoaNSView setAction:@selector(wxNSControlAction:)]; if(m_parent) m_parent->CocoaAddChild(this); SetInitialFrameRect(pos,size); @@ -41,6 +45,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