X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..ed60b5022b9438672922d7879980ab7008c62fd6:/src/mac/scrolbar.cpp

diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp
index a432b3e9b1..a38962776d 100644
--- a/src/mac/scrolbar.cpp
+++ b/src/mac/scrolbar.cpp
@@ -13,6 +13,8 @@
 #pragma implementation "scrolbar.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/scrolbar.h"
 #include "wx/mac/uma.h"
 
@@ -41,12 +43,12 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 	
 	MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 
-	m_macControl = UMANewControl( parent->GetMacRootWindow() , &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() ;
 
@@ -59,12 +61,12 @@ wxScrollBar::~wxScrollBar()
 
 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,
@@ -76,17 +78,19 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
 
   	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 UMA_USE_8_6    	
-			SetControlViewSize( m_macControl , m_pageSize ) ;
-#endif
+        if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
+        {
+			SetControlViewSize( (ControlHandle) m_macControl , m_pageSize ) ;
+        }
     }
-    Refresh() ;
+    if ( refresh )
+      MacRedrawControl() ;
 }
 
 
@@ -96,14 +100,14 @@ void wxScrollBar::Command(wxCommandEvent& event)
     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;
@@ -111,19 +115,19 @@ void wxScrollBar::MacHandleControlClick( ControlHandle control , SInt16 controlp
 	switch( controlpart )
 	{
 		case kControlUpButtonPart :
-        nScrollInc = -1;
+        nScrollInc = -m_pageSize;
         scrollEvent = wxEVT_SCROLL_LINEUP;
 			break ;
 		case kControlDownButtonPart :
-        nScrollInc = 1;
+        nScrollInc = m_pageSize;
         scrollEvent = wxEVT_SCROLL_LINEDOWN;
 			break ;
 		case kControlPageUpPart :
-        nScrollInc = -m_pageSize;
+        nScrollInc = -m_viewSize;
         scrollEvent = wxEVT_SCROLL_PAGEUP;
 			break ;
 		case kControlPageDownPart :
-        nScrollInc = m_pageSize;
+        nScrollInc = m_viewSize;
         scrollEvent = wxEVT_SCROLL_PAGEDOWN;
 			break ;
 		case kControlIndicatorPart :
@@ -152,6 +156,13 @@ void wxScrollBar::MacHandleControlClick( ControlHandle control , SInt16 controlp
 	}
   event.SetPosition(new_pos);
   event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
+  wxWindow* window = GetParent() ;
+  if (window && window->MacIsWindowScrollbar(this) )
+  {
+  	// this is hardcoded
+  	window->MacOnScroll(event);
+  }
+  else
+  	GetEventHandler()->ProcessEvent(event);
 }