X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/768d9ec8ca53f44275a6250c44bb69bfc2840e8c..d2e66707deb10dea6f92e3e4092f8a43ef942a5d:/src/cocoa/spinbutt.mm diff --git a/src/cocoa/spinbutt.mm b/src/cocoa/spinbutt.mm index 26e6ae1441..3f952dc3af 100644 --- a/src/cocoa/spinbutt.mm +++ b/src/cocoa/spinbutt.mm @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/spinbutt.mm +// Name: src/cocoa/spinbutt.mm // Purpose: wxSpinButton // Author: David Elliott // Modified by: @@ -9,15 +9,16 @@ // 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(wxSpinButton, wxControl) BEGIN_EVENT_TABLE(wxSpinButton, wxSpinButtonBase) END_EVENT_TABLE() // WX_IMPLEMENT_COCOA_OWNER(wxSpinButton,NSStepper,NSControl,NSView) @@ -26,17 +27,57 @@ 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: NSMakeRect(10,10,20,20)]); + 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); + 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); + HandleWindowEvent(event); } #endif // wxUSE_SPINBTN