corrected preproc condition

[wxWidgets.git] / src / mac / carbon / scrolbar.cpp

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 680bc2f33d19f1c21fa5789e20b3953b240a4c38..08818c04704638f12cb8124264fac6f8bd814775 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -40,23 +40,17 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

+    m_macIsUserPane = FALSE ;
+    

     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return FALSE;
 
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         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, 
-                                kControlScrollBarLiveProc , (long) this) ;
-
-    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

 
 

-    ::SetControlAction( (ControlHandle) m_macControl , wxMacLiveScrollbarActionUPP ) ;
+    verify_noerr ( CreateScrollBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 
+    0 , 0 , 100 , 1 , true /* liveTracking */ , wxMacLiveScrollbarActionUPP , (ControlRef*) &m_macControl ) ) ;

 
 

-    MacPostControlCreate() ;
+    MacPostControlCreate(pos,size) ;

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -67,12 +61,12 @@ wxScrollBar::~wxScrollBar()
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {

-    ::SetControl32BitValue( (ControlHandle) m_macControl , viewStart ) ;
+    ::SetControl32BitValue( (ControlRef) m_macControl , viewStart ) ;

 }
 
 int wxScrollBar::GetThumbPosition() const
 {
 }
 
 int wxScrollBar::GetThumbPosition() const
 {

-    return ::GetControl32BitValue( (ControlHandle) m_macControl ) ;
+    return ::GetControl32BitValue( (ControlRef) m_macControl ) ;

 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,


@@ -82,19 +76,13 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
     m_viewSize = thumbSize;
     m_objectSize = range;
 
     m_viewSize = thumbSize;
     m_objectSize = range;
 

-      int range1 = wxMax((m_objectSize - m_viewSize), 0) ;
+   int range1 = wxMax((m_objectSize - m_viewSize), 0) ;

 
 

-    SetControl32BitMaximum( (ControlHandle) m_macControl , range1 ) ;
-    SetControl32BitMinimum( (ControlHandle) m_macControl , 0 ) ;
-    SetControl32BitValue( (ControlHandle) m_macControl , position ) ;
+    SetControl32BitMaximum( (ControlRef) m_macControl , range1 ) ;
+    SetControl32BitMinimum( (ControlRef) m_macControl , 0 ) ;
+    SetControl32BitValue( (ControlRef) m_macControl , position ) ;
+    SetControlViewSize( (ControlRef) m_macControl , m_viewSize ) ;

 
 

-    if ( UMAGetAppearanceVersion() >= 0x0110  )
-    {
-        if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
-        {
-                SetControlViewSize( (ControlHandle) m_macControl , m_viewSize ) ;
-        }
-    }

     if ( refresh )
       MacRedrawControl() ;
 }
     if ( refresh )
       MacRedrawControl() ;
 }


@@ -108,15 +96,12 @@ void wxScrollBar::Command(wxCommandEvent& 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) ;
+    int position = GetControl32BitValue( (ControlRef) m_macControl) ;
+    int minPos = GetControl32BitMinimum( (ControlRef) m_macControl) ;
+    int maxPos = GetControl32BitMaximum( (ControlRef) m_macControl) ;

     
     wxEventType scrollEvent = wxEVT_NULL;
     
     wxEventType scrollEvent = wxEVT_NULL;

-    int nScrollInc;
+    int nScrollInc = 0;

     
     // all events have already been reported during mouse down, except for THUMBRELEASE
     if ( !mouseStillDown && controlpart !=kControlIndicatorPart )
     
     // all events have already been reported during mouse down, except for THUMBRELEASE
     if ( !mouseStillDown && controlpart !=kControlIndicatorPart )


@@ -182,3 +167,62 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
         GetEventHandler()->ProcessEvent(event);
 }
 
         GetEventHandler()->ProcessEvent(event);
 }
 

+wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) 
+{
+    int position = GetControl32BitValue( (ControlRef) m_macControl) ;
+    int minPos = GetControl32BitMinimum( (ControlRef) m_macControl) ;
+    int maxPos = GetControl32BitMaximum( (ControlRef) m_macControl) ;
+    
+    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
+    if ( controlpart !=kControlIndicatorPart )
+        return eventNotHandledErr ;
+    
+    switch( controlpart )
+    {
+    case kControlIndicatorPart :
+        nScrollInc = 0 ;
+        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);
+    return noErr ;
+}
+
+