X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/780220b099a8016b02a4b78a1e3f0b0c6849b51f..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/cocoa/slider.mm diff --git a/src/cocoa/slider.mm b/src/cocoa/slider.mm index 888a5d809f..5ab19e01ef 100644 --- a/src/cocoa/slider.mm +++ b/src/cocoa/slider.mm @@ -8,7 +8,7 @@ // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott // (c) 2007 Software 2000 Ltd. -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -26,8 +26,7 @@ #import #import -IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) - BEGIN_EVENT_TABLE(wxSlider, wxSliderBase) +BEGIN_EVENT_TABLE(wxSlider, wxSliderBase) END_EVENT_TABLE() WX_IMPLEMENT_COCOA_OWNER(wxSlider,NSSlider,NSControl,NSView) @@ -88,8 +87,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID winid, // minValue > maxValue not handled, tickMarks set to 0 if ( style & wxSL_AUTOTICKS ) tickMarks = ((maxValue - minValue >= 0) ? (maxValue - minValue) : 0); - // arg2 needed a value, doesnt do anything - SetTickFreq(tickMarks,1); + SetTickFreq(tickMarks); return true; } @@ -111,7 +109,7 @@ void wxSlider::ProcessEventType(wxEventType commandType) { wxScrollEvent event(commandType, GetId(), GetValue(), HasFlag(wxSL_VERTICAL)?wxVERTICAL:wxHORIZONTAL); event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); } static inline wxEventType wxSliderEventTypeForKeyFromEvent(NSEvent *theEvent) @@ -207,7 +205,7 @@ int wxSlider::GetMax() const return [GetNSSlider() maxValue]; } -void wxSlider::SetTickFreq(int n, int pos) +void wxSlider::DoSetTickFreq(int n) { const int numTicks = (n > 0) ? ((GetMax() - GetMin()) / n) + 1 : 0; [GetNSSlider() setNumberOfTickMarks:numTicks];