fixed crash in HitTest() with y position below the last line

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

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 54df1811666b81aea8a5c83c27507e8fd2250ee8..e9d45ce4e5838b3c1760966e0632ce8cd9412c3a 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -13,13 +13,21 @@
 #pragma implementation "scrolbar.h"
 #endif
 
+#include "wx/defs.h"
+
 #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 +35,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;
     
-    m_windowStyle = style;
+       Rect bounds ;
+       Str255 title ;
+       
+       MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
+
+       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 100, 
+               kControlScrollBarLiveProc , (long) this ) ;
+       
+       wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
 
-    if ( id == -1 )
-           m_windowId = (int)NewControlId();
-    else
-           m_windowId = id;
+       ::SetControlAction( m_macControl , wxMacLiveScrollbarActionUPP ) ;
 
-    // TODO create scrollbar
-    return TRUE;
+       MacPostControlCreate() ;
+
+  return TRUE;
 }
 
 wxScrollBar::~wxScrollBar()
@@ -50,13 +61,12 @@ wxScrollBar::~wxScrollBar()
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {
-    // TODO
+    ::SetControlValue( m_macControl , viewStart ) ;
 }
 
 int wxScrollBar::GetThumbPosition() const
 {
-    // TODO
-    return 0;
+    return ::GetControlValue( m_macControl ) ;
 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
@@ -66,7 +76,20 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
     m_pageSize = thumbSize;
     m_objectSize = range;
 
-    // TODO
+       int range1 = wxMax((m_objectSize - m_pageSize), 0) ;
+
+    SetControlMaximum( m_macControl , range1 ) ;
+    SetControlMinimum(  m_macControl , 0 ) ;
+    SetControlValue(  m_macControl , position ) ;
+
+    if ( UMAGetAppearanceVersion() >= 0x0110  )
+    {
+        if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
+        {
+                       SetControlViewSize( m_macControl , m_pageSize ) ;
+        }
+    }
+    Refresh() ;
 }
 
 
@@ -76,3 +99,69 @@ void wxScrollBar::Command(wxCommandEvent& event)
     ProcessCommand(event);
 }
 
+void wxScrollBar::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+{
+       if ( m_macControl == NULL )
+               return ;
+       
+  int position = GetControlValue( m_macControl) ;
+  int minPos = GetControlMinimum( m_macControl) ;
+  int maxPos = GetControlMaximum( m_macControl) ;
+
+  wxEventType scrollEvent = wxEVT_NULL;
+  int nScrollInc;
+
+       switch( controlpart )
+       {
+               case kControlUpButtonPart :
+        nScrollInc = -m_pageSize;
+        scrollEvent = wxEVT_SCROLL_LINEUP;
+                       break ;
+               case kControlDownButtonPart :
+        nScrollInc = m_pageSize;
+        scrollEvent = wxEVT_SCROLL_LINEDOWN;
+                       break ;
+               case kControlPageUpPart :
+        nScrollInc = -m_viewSize;
+        scrollEvent = wxEVT_SCROLL_PAGEUP;
+                       break ;
+               case kControlPageDownPart :
+        nScrollInc = m_viewSize;
+        scrollEvent = wxEVT_SCROLL_PAGEDOWN;
+                       break ;
+               case kControlIndicatorPart :
+        nScrollInc = 0 ;
+        scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+                       break ;
+       }
+
+  int new_pos = position + nScrollInc;
+
+  if (new_pos < 0)
+      new_pos = 0;
+  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);
+}
+