MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ;
- m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , true , 0 , 0 , 100,
+ m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , true , 0 , 0 , 100,
kControlScrollBarLiveProc , (long) this ) ;
- wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
+ wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
- ::SetControlAction( m_macControl , wxMacLiveScrollbarActionUPP ) ;
+ ::SetControlAction( (ControlHandle) m_macControl , wxMacLiveScrollbarActionUPP ) ;
MacPostControlCreate() ;
void wxScrollBar::SetThumbPosition(int viewStart)
{
- ::SetControlValue( m_macControl , viewStart ) ;
+ ::SetControlValue( (ControlHandle) m_macControl , viewStart ) ;
}
int wxScrollBar::GetThumbPosition() const
{
- return ::GetControlValue( m_macControl ) ;
+ return ::GetControlValue( (ControlHandle) m_macControl ) ;
}
void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
int range1 = wxMax((m_objectSize - m_pageSize), 0) ;
- SetControlMaximum( m_macControl , range1 ) ;
- SetControlMinimum( m_macControl , 0 ) ;
- SetControlValue( m_macControl , position ) ;
+ SetControlMaximum( (ControlHandle) m_macControl , range1 ) ;
+ SetControlMinimum( (ControlHandle) m_macControl , 0 ) ;
+ SetControlValue( (ControlHandle) m_macControl , position ) ;
if ( UMAGetAppearanceVersion() >= 0x0110 )
{
if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
{
- SetControlViewSize( m_macControl , m_pageSize ) ;
+ SetControlViewSize( (ControlHandle) m_macControl , m_pageSize ) ;
}
}
- Refresh() ;
+ if ( refresh )
+ MacRedrawControl() ;
}
ProcessCommand(event);
}
-void wxScrollBar::MacHandleControlClick( ControlHandle control , SInt16 controlpart )
+void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
{
- if ( m_macControl == NULL )
+ if ( (ControlHandle) m_macControl == NULL )
return ;
- int position = GetControlValue( m_macControl) ;
- int minPos = GetControlMinimum( m_macControl) ;
- int maxPos = GetControlMaximum( m_macControl) ;
+ int position = GetControlValue( (ControlHandle) m_macControl) ;
+ int minPos = GetControlMinimum( (ControlHandle) m_macControl) ;
+ int maxPos = GetControlMaximum( (ControlHandle) m_macControl) ;
wxEventType scrollEvent = wxEVT_NULL;
int nScrollInc;