X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..010d343bb28bbfd7a702a3ac60be30d15e132ba3:/src/mac/scrolbar.cpp?ds=inline diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp index 54df181166..eef2a84c54 100644 --- a/src/mac/scrolbar.cpp +++ b/src/mac/scrolbar.cpp @@ -1,25 +1,38 @@ ///////////////////////////////////////////////////////////////////////////// // Name: scrolbar.cpp // Purpose: wxScrollBar -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ #pragma implementation "scrolbar.h" #endif +#include "wx/defs.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" +#endif // WX_PRECOMP + #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 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, @@ -27,21 +40,24 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { - if (!parent) - return FALSE; - parent->AddChild(this); - SetName(name); - SetValidator(validator); + if (!parent) + return FALSE; + + Rect bounds ; + Str255 title ; - m_windowStyle = style; + MacPreControlCreate( parent , id , wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ; - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; + m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , true , 0 , 0 , 100, + kControlScrollBarLiveProc , (long) this ) ; + + wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ; + + ::SetControlAction( (ControlHandle) m_macControl , wxMacLiveScrollbarActionUPP ) ; + + MacPostControlCreate() ; - // TODO create scrollbar - return TRUE; + return TRUE; } wxScrollBar::~wxScrollBar() @@ -50,23 +66,36 @@ wxScrollBar::~wxScrollBar() void wxScrollBar::SetThumbPosition(int viewStart) { - // TODO + ::SetControl32BitValue( (ControlHandle) m_macControl , viewStart ) ; } int wxScrollBar::GetThumbPosition() const { - // TODO - return 0; + return ::GetControl32BitValue( (ControlHandle) m_macControl ) ; } void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize, bool refresh) { - m_viewSize = pageSize; - m_pageSize = thumbSize; + m_pageSize = pageSize; + m_viewSize = thumbSize; m_objectSize = range; - // TODO + int range1 = wxMax((m_objectSize - m_viewSize), 0) ; + + SetControl32BitMaximum( (ControlHandle) m_macControl , range1 ) ; + SetControl32BitMinimum( (ControlHandle) m_macControl , 0 ) ; + SetControl32BitValue( (ControlHandle) m_macControl , position ) ; + + if ( UMAGetAppearanceVersion() >= 0x0110 ) + { + if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress ) + { + SetControlViewSize( (ControlHandle) m_macControl , m_viewSize ) ; + } + } + if ( refresh ) + MacRedrawControl() ; } @@ -76,3 +105,79 @@ void wxScrollBar::Command(wxCommandEvent& event) ProcessCommand(event); } +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; + + // all events have already been reported during mouse down, except for THUMBRELEASE + if ( !mouseStillDown && controlpart !=kControlIndicatorPart ) + return ; + + switch( controlpart ) + { + case kControlUpButtonPart : + nScrollInc = -1; + scrollEvent = wxEVT_SCROLL_LINEUP; + break ; + case kControlDownButtonPart : + nScrollInc = 1; + scrollEvent = wxEVT_SCROLL_LINEDOWN; + break ; + case kControlPageUpPart : + nScrollInc = -m_pageSize; + scrollEvent = wxEVT_SCROLL_PAGEUP; + break ; + case kControlPageDownPart : + nScrollInc = m_pageSize; + scrollEvent = wxEVT_SCROLL_PAGEDOWN; + break ; + case kControlIndicatorPart : + nScrollInc = 0 ; + if ( mouseStillDown ) + scrollEvent = wxEVT_SCROLL_THUMBTRACK; + else + scrollEvent = wxEVT_SCROLL_THUMBRELEASE; + break ; + default : + 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 ) + { + event.SetOrientation( wxHORIZONTAL ) ; + } + else + { + event.SetOrientation( wxVERTICAL ) ; + } + event.SetPosition(new_pos); + event.SetEventObject( this ); + wxWindow* window = GetParent() ; + if (window && window->MacIsWindowScrollbar(this) ) + { + // this is hardcoded + window->MacOnScroll(event); + } + else + GetEventHandler()->ProcessEvent(event); +} +