fixed typo in prior checkin

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

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 54df1811666b81aea8a5c83c27507e8fd2250ee8..2be39020bdd1038d0d3d7d9aa2780b4b48be2f01 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -1,47 +1,52 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        scrolbar.cpp
 // Purpose:     wxScrollBar
 /////////////////////////////////////////////////////////////////////////////
 // Name:        scrolbar.cpp
 // Purpose:     wxScrollBar

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // 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/wxprec.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif // WX_PRECOMP

 
 #include "wx/scrolbar.h"
 
 #include "wx/scrolbar.h"

+#include "wx/mac/uma.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 

-#endif
+BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
+END_EVENT_TABLE()
+

 
 

-// 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;
-    parent->AddChild(this);
-    SetName(name);
-       SetValidator(validator);
-    
-    m_windowStyle = style;
-
-    if ( id == -1 )
-           m_windowId = (int)NewControlId();
-    else
-           m_windowId = id;
+    m_macIsUserPane = false ;
+
+    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
+        return false;
+
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+
+    m_peer = new wxMacControl(this) ;
+    verify_noerr( CreateScrollBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
+    0 , 0 , 100 , 1 , true /* liveTracking */ , GetwxMacLiveScrollbarActionProc() , m_peer->GetControlRefAddr() ) );

 
 

-    // TODO create scrollbar
-    return TRUE;
+    MacPostControlCreate( pos, size ) ;
+
+    return true;

 }
 
 wxScrollBar::~wxScrollBar()
 }
 
 wxScrollBar::~wxScrollBar()


@@ -50,29 +55,161 @@ wxScrollBar::~wxScrollBar()
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {

-    // TODO
+    m_peer->SetValue( viewStart ) ;

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

-    // TODO
-    return 0;
+    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_viewSize = pageSize;
-    m_pageSize = thumbSize;
+    m_pageSize = pageSize;
+    m_viewSize = thumbSize;

     m_objectSize = range;
 
     m_objectSize = range;
 

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

 
 

+    m_peer->SetMaximum( range1 ) ;
+    m_peer->SetMinimum( 0 ) ;
+    m_peer->SetValue( position ) ;
+    m_peer->SetViewSize( m_viewSize ) ;
+}

 
 void wxScrollBar::Command(wxCommandEvent& event)
 {
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {

-    SetThumbPosition(event.m_commandInt);
+    SetThumbPosition(event.GetInt());

     ProcessCommand(event);
 }
 
     ProcessCommand(event);
 }
 

+void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown )
+{
+    int position = m_peer->GetValue() ;
+    int minPos = m_peer->GetMinimum() ;
+    int maxPos = m_peer->GetMaximum() ;
+
+    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 :
+        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;
+    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) )
+        // 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
+    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;
+    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) )
+        // this is hardcoded
+        window->MacOnScroll(event);
+    else
+        GetEventHandler()->ProcessEvent(event);
+
+    return noErr ;
+}