X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c041438d3fd313eac34d70f3c9076784104c9698..87f0b1323b7ac77f02133b836c8dfee63b0fd387:/src/cocoa/spinbutt.mm diff --git a/src/cocoa/spinbutt.mm b/src/cocoa/spinbutt.mm index 5a823ce2ec..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: @@ -19,9 +19,6 @@ #import -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) - -IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) BEGIN_EVENT_TABLE(wxSpinButton, wxSpinButtonBase) END_EVENT_TABLE() // WX_IMPLEMENT_COCOA_OWNER(wxSpinButton,NSStepper,NSControl,NSView) @@ -30,10 +27,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) @@ -73,7 +77,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