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

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index a432b3e9b1..e9d45ce4e5 100644
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -13,6 +13,8 @@
 #pragma implementation "scrolbar.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/scrolbar.h"
 #include "wx/mac/uma.h"
 
@@ -82,9 +84,10 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
 
     if ( UMAGetAppearanceVersion() >= 0x0110  )
     {
-#if UMA_USE_8_6    	
+        if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
+        {
 			SetControlViewSize( m_macControl , m_pageSize ) ;
-#endif
+        }
     }
     Refresh() ;
 }
@@ -111,19 +114,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 +155,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);
 }