From 11573ad88279419c6b2c94f2840372071134e488 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Mon, 8 Sep 2003 19:03:31 +0000 Subject: [PATCH] Implement wxSpinButton (except up/down events) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cocoa/spinbutt.h | 7 ++++--- src/cocoa/spinbutt.mm | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/include/wx/cocoa/spinbutt.h b/include/wx/cocoa/spinbutt.h index cc55ddf446..20f1e70c85 100644 --- a/include/wx/cocoa/spinbutt.h +++ b/include/wx/cocoa/spinbutt.h @@ -47,16 +47,17 @@ public: // Cocoa callbacks // ------------------------------------------------------------------------ protected: + virtual void CocoaTarget_action(); // ------------------------------------------------------------------------ // Implementation // ------------------------------------------------------------------------ public: // Pure Virtuals - virtual int GetValue() const { return 0; } - virtual void SetValue(int value) { } + virtual int GetValue() const; + virtual void SetValue(int value); // retrieve/change the range - virtual void SetRange(int minValue, int maxValue) { } + virtual void SetRange(int minValue, int maxValue); }; #endif // __WX_COCOA_SPINBUTT_H__ diff --git a/src/cocoa/spinbutt.mm b/src/cocoa/spinbutt.mm index 2a3cd8038d..9cc5045947 100644 --- a/src/cocoa/spinbutt.mm +++ b/src/cocoa/spinbutt.mm @@ -34,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); @@ -43,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) +{ + return [(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 -- 2.45.2