X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9eddec696f06d65a80e7339b2fae14fcb55f8383..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/mac/carbon/scrolbar.cpp diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp index 02e3d04bef..c7c1263451 100644 --- a/src/mac/carbon/scrolbar.cpp +++ b/src/mac/carbon/scrolbar.cpp @@ -11,13 +11,14 @@ #include "wx/wxprec.h" +#include "wx/scrolbar.h" + #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/log.h" #include "wx/settings.h" #endif -#include "wx/scrolbar.h" #include "wx/mac/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) @@ -68,7 +69,11 @@ int wxScrollBar::GetThumbPosition() const return m_peer->GetValue(); } -void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int pageSize, bool refresh ) +void wxScrollBar::SetScrollbar( int position, + int thumbSize, + int range, + int pageSize, + bool WXUNUSED(refresh) ) { m_pageSize = pageSize; m_viewSize = thumbSize; @@ -88,7 +93,7 @@ void wxScrollBar::Command( wxCommandEvent& event ) ProcessCommand( event ); } -void wxScrollBar::MacHandleControlClick( WXWidget control, wxInt16 controlpart, bool mouseStillDown ) +void wxScrollBar::MacHandleControlClick( WXWidget WXUNUSED(control), wxInt16 controlpart, bool mouseStillDown ) { int position = m_peer->GetValue(); int minPos = m_peer->GetMinimum(); @@ -160,10 +165,10 @@ void wxScrollBar::MacHandleControlClick( WXWidget control, wxInt16 controlpart, // this is hardcoded window->MacOnScroll( event ); else - GetEventHandler()->ProcessEvent( event ); + HandleWindowEvent( event ); } -wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler, WXEVENTREF mevent ) +wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler), WXEVENTREF mevent ) { int position = m_peer->GetValue(); int minPos = m_peer->GetMinimum(); @@ -216,7 +221,7 @@ wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler, WXEVENTREF mevent // this is hardcoded window->MacOnScroll( event ); else - GetEventHandler()->ProcessEvent( event ); + HandleWindowEvent( event ); return noErr; }