/////////////////////////////////////////////////////////////////////////////
-// Name: scrolbar.cpp
+// Name: src/mac/carbon/scrolbar.cpp
// Purpose: wxScrollBar
// Author: Stefan Csomor
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "scrolbar.h"
-#endif
-
-#include "wx/defs.h"
+#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
-#endif // WX_PRECOMP
+#endif
#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,
- const wxSize& size, long style,
- const wxValidator& validator,
- const wxString& name)
+bool wxScrollBar::Create( wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator& validator,
+ const wxString& name )
{
- if (!parent)
- return FALSE;
-
- Rect bounds ;
- Str255 title ;
-
- MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ;
+ m_macIsUserPane = false;
+
+ if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
+ return false;
- m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , true , 0 , 0 , 100,
- kControlScrollBarLiveProc , (long) this ) ;
-
- wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
+ Rect bounds = wxMacGetBoundsForControl( this, pos, size );
- ::SetControlAction( (ControlHandle) m_macControl , wxMacLiveScrollbarActionUPP ) ;
+ m_peer = new wxMacControl( this );
+ OSStatus err = CreateScrollBarControl(
+ MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
+ 0, 0, 100, 1, true /* liveTracking */,
+ GetwxMacLiveScrollbarActionProc(),
+ m_peer->GetControlRefAddr() );
+ verify_noerr( err );
- MacPostControlCreate() ;
+ MacPostControlCreate( pos, size );
- return TRUE;
+ return true;
}
wxScrollBar::~wxScrollBar()
{
}
-void wxScrollBar::SetThumbPosition(int viewStart)
+void wxScrollBar::SetThumbPosition( int viewStart )
{
- ::SetControl32BitValue( (ControlHandle) m_macControl , viewStart ) ;
+ m_peer->SetValue( viewStart );
}
int wxScrollBar::GetThumbPosition() const
{
- return ::GetControl32BitValue( (ControlHandle) m_macControl ) ;
+ 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 refresh )
{
m_pageSize = pageSize;
m_viewSize = thumbSize;
m_objectSize = range;
- int range1 = wxMax((m_objectSize - m_viewSize), 0) ;
-
- SetControl32BitMaximum( (ControlHandle) m_macControl , range1 ) ;
- SetControl32BitMinimum( (ControlHandle) m_macControl , 0 ) ;
- SetControl32BitValue( (ControlHandle) m_macControl , position ) ;
+ int range1 = wxMax( (m_objectSize - m_viewSize), 0 );
- if ( UMAGetAppearanceVersion() >= 0x0110 )
- {
- if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
- {
- SetControlViewSize( (ControlHandle) m_macControl , m_viewSize ) ;
- }
- }
- if ( refresh )
- MacRedrawControl() ;
+ m_peer->SetMinimum( 0 );
+ m_peer->SetMaximum( range1 );
+ m_peer->SetValue( position );
+ m_peer->SetViewSize( m_viewSize );
}
-
-void wxScrollBar::Command(wxCommandEvent& event)
+void wxScrollBar::Command( wxCommandEvent& event )
{
- SetThumbPosition(event.m_commandInt);
- ProcessCommand(event);
+ SetThumbPosition( event.GetInt() );
+ ProcessCommand( event );
}
-void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
+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) ;
-
+ int position = m_peer->GetValue();
+ int minPos = m_peer->GetMinimum();
+ int maxPos = m_peer->GetMaximum();
+
wxEventType scrollEvent = wxEVT_NULL;
- int nScrollInc;
-
- switch( controlpart )
+ int nScrollInc = 0;
+
+ // all events have already been reported during mouse down, except for THUMBRELEASE
+ if ( !mouseStillDown && controlpart != kControlIndicatorPart )
+ return;
+
+ switch ( controlpart )
{
- case kControlUpButtonPart :
+ case kControlUpButtonPart:
nScrollInc = -1;
scrollEvent = wxEVT_SCROLL_LINEUP;
- break ;
- case kControlDownButtonPart :
+ break;
+
+ case kControlDownButtonPart:
nScrollInc = 1;
scrollEvent = wxEVT_SCROLL_LINEDOWN;
- break ;
- case kControlPageUpPart :
+ break;
+
+ case kControlPageUpPart:
nScrollInc = -m_pageSize;
scrollEvent = wxEVT_SCROLL_PAGEUP;
- break ;
- case kControlPageDownPart :
+ break;
+
+ case kControlPageDownPart:
nScrollInc = m_pageSize;
scrollEvent = wxEVT_SCROLL_PAGEDOWN;
- break ;
- case kControlIndicatorPart :
- nScrollInc = 0 ;
- scrollEvent = wxEVT_SCROLL_THUMBTRACK;
- break ;
- default :
- wxFAIL_MSG(wxT("illegal scrollbar selector"));
- break ;
+ break;
+
+ case kControlIndicatorPart:
+ nScrollInc = 0;
+ if ( mouseStillDown )
+ scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+ else
+ scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
+ break;
+
+ default:
+ wxFAIL_MSG(wxT("unknown scrollbar selector"));
+ break;
}
-
+
int new_pos = position + nScrollInc;
-
+
if (new_pos < minPos)
new_pos = minPos;
- if (new_pos > maxPos)
+ else if (new_pos > maxPos)
new_pos = maxPos;
+
if ( nScrollInc )
- SetThumbPosition(new_pos);
-
- wxScrollEvent event(scrollEvent, m_windowId);
+ SetThumbPosition( new_pos );
+
+ wxScrollEvent event( scrollEvent, m_windowId );
if ( m_windowStyle & wxHORIZONTAL )
- {
- event.SetOrientation( 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 );
+}
+
+wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler, WXEVENTREF mevent )
+{
+ int position = m_peer->GetValue();
+ int minPos = m_peer->GetMinimum();
+ int maxPos = m_peer->GetMaximum();
+
+ wxEventType scrollEvent = wxEVT_NULL;
+ int nScrollInc = 0;
+
+ wxMacCarbonEvent cEvent( (EventRef)mevent );
+ ControlPartCode controlpart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart, typeControlPartCode);
+
+ // all events have already been reported during mouse down, except for THUMBRELEASE
+ // NB: this may need to be reviewed in light of the fact that scroll wheel events
+ // aren't being handled properly
+ if ( controlpart != kControlIndicatorPart )
+ return eventNotHandledErr;
+
+ switch ( controlpart )
{
- event.SetOrientation( wxVERTICAL ) ;
+ case kControlIndicatorPart:
+ nScrollInc = 0;
+ scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
+ break;
+
+ default:
+ wxFAIL_MSG(wxT("unknown scrollbar selector"));
+ break;
}
- event.SetPosition(new_pos);
+
+ int new_pos = position + nScrollInc;
+
+ if (new_pos < minPos)
+ new_pos = minPos;
+ else 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) )
- {
+ wxWindow* window = GetParent();
+ if (window && window->MacIsWindowScrollbar( this ))
// this is hardcoded
- window->MacOnScroll(event);
- }
+ window->MacOnScroll( event );
else
- GetEventHandler()->ProcessEvent(event);
-}
+ GetEventHandler()->ProcessEvent( event );
+ return noErr;
+}
projects / wxWidgets.git / blobdiff