Implement wxSpinButton (except up/down events)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/spinbutt.h b/include/wx/cocoa/spinbutt.h
index cc55ddf4463e5481f35540750d825f5d7cb3877a..20f1e70c85515905ff272efedabc97d4dc65a693 100644 (file)
--- 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 2a3cd8038d942d2d962e5f8c81542de878945fea..9cc50459470d041dc87717d659269f9b17258434 100644 (file)
--- 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