X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/768d9ec8ca53f44275a6250c44bb69bfc2840e8c..48fbb5214d7dd35f17d23e6e05631bc8ccc1c8a5:/src/cocoa/spinbutt.mm?ds=inline

diff --git a/src/cocoa/spinbutt.mm b/src/cocoa/spinbutt.mm
index 26e6ae1441..5a823ce2ec 100644
--- a/src/cocoa/spinbutt.mm
+++ b/src/cocoa/spinbutt.mm
@@ -9,14 +9,18 @@
 // Licence:   	wxWindows 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 <AppKit/NSStepper.h>
 
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
+
 IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
 BEGIN_EVENT_TABLE(wxSpinButton, wxSpinButtonBase)
 END_EVENT_TABLE()
@@ -28,15 +32,48 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID winid,
 {
     if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
         return false;
-    SetNSControl([[NSStepper alloc] initWithFrame: NSMakeRect(10,10,20,20)]);
+    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);
+
     return true;
 }
 
 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