X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7205570233ce8420b71fa5df368054c8953ff0e4..cd3c2375e6fddd3d478a6776900c21aaeb2d0f08:/src/mac/carbon/scrolbar.cpp

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index c417484f02..9073f70995 100644
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -15,6 +15,11 @@
 
 #include "wx/defs.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif // WX_PRECOMP
+
 #include "wx/scrolbar.h"
 #include "wx/mac/uma.h"
 
@@ -43,12 +48,12 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 	
 	MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 
-	m_macControl = ::NewControl( 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() ;
 
@@ -61,35 +66,36 @@ wxScrollBar::~wxScrollBar()
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {
-    ::SetControlValue( m_macControl , viewStart ) ;
+    ::SetControl32BitValue( (ControlHandle) m_macControl , viewStart ) ;
 }
 
 int wxScrollBar::GetThumbPosition() const
 {
-    return ::GetControlValue( m_macControl ) ;
+    return ::GetControl32BitValue( (ControlHandle) m_macControl ) ;
 }
 
 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;
 
-  	int range1 = wxMax((m_objectSize - m_pageSize), 0) ;
+  	int range1 = wxMax((m_objectSize - m_viewSize), 0) ;
 
-    SetControlMaximum( m_macControl , range1 ) ;
-    SetControlMinimum(  m_macControl , 0 ) ;
-    SetControlValue(  m_macControl , position ) ;
+    SetControl32BitMaximum( (ControlHandle) m_macControl , range1 ) ;
+    SetControl32BitMinimum( (ControlHandle) m_macControl , 0 ) ;
+    SetControl32BitValue( (ControlHandle) m_macControl , position ) ;
 
     if ( UMAGetAppearanceVersion() >= 0x0110  )
     {
         if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
         {
-			SetControlViewSize( m_macControl , m_pageSize ) ;
+			    SetControlViewSize( (ControlHandle) m_macControl , m_viewSize ) ;
         }
     }
-    Refresh() ;
+    if ( refresh )
+      MacRedrawControl() ;
 }
 
 
@@ -99,14 +105,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 = GetControl32BitValue( (ControlHandle) m_macControl) ;
+  int minPos = GetControl32BitMinimum( (ControlHandle) m_macControl) ;
+  int maxPos = GetControl32BitMaximum( (ControlHandle) m_macControl) ;
 
   wxEventType scrollEvent = wxEVT_NULL;
   int nScrollInc;
@@ -114,31 +120,34 @@ void wxScrollBar::MacHandleControlClick( ControlHandle control , SInt16 controlp
 	switch( controlpart )
 	{
 		case kControlUpButtonPart :
-        nScrollInc = -m_pageSize;
+        nScrollInc = -1;
         scrollEvent = wxEVT_SCROLL_LINEUP;
 			break ;
 		case kControlDownButtonPart :
-        nScrollInc = m_pageSize;
+        nScrollInc = 1;
         scrollEvent = wxEVT_SCROLL_LINEDOWN;
 			break ;
 		case kControlPageUpPart :
-        nScrollInc = -m_viewSize;
+        nScrollInc = -m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEUP;
 			break ;
 		case kControlPageDownPart :
-        nScrollInc = m_viewSize;
+        nScrollInc = m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEDOWN;
 			break ;
 		case kControlIndicatorPart :
         nScrollInc = 0 ;
         scrollEvent = wxEVT_SCROLL_THUMBTRACK;
 			break ;
+                default :
+                        wxLogError(_("illegal scrollbar selector %d"), controlpart);
+                        break ;
 	}
 
   int new_pos = position + nScrollInc;
 
-  if (new_pos < 0)
-      new_pos = 0;
+  if (new_pos < minPos)
+      new_pos = minPos;
   if (new_pos > maxPos)
       new_pos = maxPos;
 	if ( nScrollInc )