X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..daebb84bff054d3833baca58a5dc506de56c64a1:/src/mac/classic/scrolbar.cpp?ds=inline diff --git a/src/mac/classic/scrolbar.cpp b/src/mac/classic/scrolbar.cpp index 82d6b72415..fc41820841 100644 --- a/src/mac/classic/scrolbar.cpp +++ b/src/mac/classic/scrolbar.cpp @@ -1,19 +1,19 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: scrolbar.cpp +// Name: src/mac/classic/scrolbar.cpp // Purpose: wxScrollBar // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "scrolbar.h" -#endif +#include "wx/wxprec.h" -#include "wx/defs.h" +#ifdef __BORLANDC__ + #pragma hdrstop +#endif #ifndef WX_PRECOMP #include "wx/intl.h" @@ -23,14 +23,11 @@ #include "wx/scrolbar.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) BEGIN_EVENT_TABLE(wxScrollBar, wxControl) END_EVENT_TABLE() -#endif - extern ControlActionUPP wxMacLiveScrollbarActionUPP ; // Scrollbar @@ -41,15 +38,15 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, const wxString& name) { if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) - return FALSE; + return false; Rect bounds ; Str255 title ; MacPreControlCreate( parent , id , wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ; - m_macControl = ::NewControl(MAC_WXHWND(parent->MacGetRootWindow()) , - &bounds , title , false , 0 , 0 , 100, + m_macControl = (WXWidget) ::NewControl(MAC_WXHWND(parent->MacGetRootWindow()) , + &bounds , title , false , 0 , 0 , 100, kControlScrollBarLiveProc , (long) this) ; wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ; @@ -58,7 +55,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, MacPostControlCreate() ; - return TRUE; + return true; } wxScrollBar::~wxScrollBar() @@ -102,26 +99,26 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS void wxScrollBar::Command(wxCommandEvent& event) { - SetThumbPosition(event.m_commandInt); + SetThumbPosition(event.GetInt()); ProcessCommand(event); } -void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) +void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) { if ( (ControlHandle) m_macControl == NULL ) return ; - + int position = GetControl32BitValue( (ControlHandle) m_macControl) ; int minPos = GetControl32BitMinimum( (ControlHandle) m_macControl) ; int maxPos = GetControl32BitMaximum( (ControlHandle) m_macControl) ; - + wxEventType scrollEvent = wxEVT_NULL; int nScrollInc = 0; - + // all events have already been reported during mouse down, except for THUMBRELEASE if ( !mouseStillDown && controlpart !=kControlIndicatorPart ) return ; - + switch( controlpart ) { case kControlUpButtonPart : @@ -151,16 +148,16 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart wxFAIL_MSG(wxT("illegal scrollbar selector")); break ; } - + int new_pos = position + nScrollInc; - + if (new_pos < minPos) new_pos = minPos; if (new_pos > maxPos) new_pos = maxPos; if ( nScrollInc ) SetThumbPosition(new_pos); - + wxScrollEvent event(scrollEvent, m_windowId); if ( m_windowStyle & wxHORIZONTAL ) { @@ -181,4 +178,3 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart else GetEventHandler()->ProcessEvent(event); } -