X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519fa7734f2ba15b62a9dd6998671b45bde7389c..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/cocoa/spinbutt.mm?ds=sidebyside diff --git a/src/cocoa/spinbutt.mm b/src/cocoa/spinbutt.mm index 86c8b886af..3f952dc3af 100644 --- a/src/cocoa/spinbutt.mm +++ b/src/cocoa/spinbutt.mm @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/spinbutt.mm +// Name: src/cocoa/spinbutt.mm // Purpose: wxSpinButton // Author: David Elliott // Modified by: // Created: 2003/07/14 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -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,12 +27,14 @@ 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 (note wxSP_HORIZONTAL IS _NOT_ Supported in cocoa) + //flag handling [(NSStepper*)m_cocoaNSView setValueWraps:style & wxSP_WRAP]; //default == true, evidently //final setup @@ -78,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