X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11573ad88279419c6b2c94f2840372071134e488..fe63109fc4429d3ca70310102f0a5daaee02f861:/src/cocoa/spinbutt.mm?ds=sidebyside diff --git a/src/cocoa/spinbutt.mm b/src/cocoa/spinbutt.mm index 9cc5045947..53ce3b29a6 100644 --- a/src/cocoa/spinbutt.mm +++ b/src/cocoa/spinbutt.mm @@ -6,7 +6,7 @@ // Created: 2003/07/14 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -30,10 +30,17 @@ 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: 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) @@ -56,7 +63,7 @@ int wxSpinButton::GetValue() const void wxSpinButton::SetValue(int value) { - return [(NSStepper*)m_cocoaNSView setIntValue:value]; + [(NSStepper*)m_cocoaNSView setIntValue:value]; } void wxSpinButton::SetRange(int minValue, int maxValue) @@ -73,7 +80,7 @@ void wxSpinButton::CocoaTarget_action() wxSpinEvent event(wxEVT_SCROLL_THUMBTRACK, GetId()); event.SetPosition(GetValue()); event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); } #endif // wxUSE_SPINBTN