bug fixes

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

diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp
index a38962776d062a9a389488a160f2cb7b3041d32d..68d403ae2624b1197ea23ce70a156cc96b7d5677 100644 (file)
--- a/src/mac/scrolbar.cpp
+++ b/src/mac/scrolbar.cpp
@@ -15,6 +15,11 @@
 
 #include "wx/defs.h"
 
 
 #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"
 
 #include "wx/scrolbar.h"
 #include "wx/mac/uma.h"
 


@@ -61,32 +66,32 @@ wxScrollBar::~wxScrollBar()
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {

-    ::SetControlValue( (ControlHandle) m_macControl , viewStart ) ;
+    ::SetControl32BitValue( (ControlHandle) m_macControl , viewStart ) ;

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

-    return ::GetControlValue( (ControlHandle) m_macControl ) ;
+    return ::GetControl32BitValue( (ControlHandle) m_macControl ) ;

 }
 
 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;
 

-       int range1 = wxMax((m_objectSize - m_pageSize), 0) ;
+       int range1 = wxMax((m_objectSize - m_viewSize), 0) ;

 
 

-    SetControlMaximum( (ControlHandle) m_macControl , range1 ) ;
-    SetControlMinimum( (ControlHandle) m_macControl , 0 ) ;
-    SetControlValue( (ControlHandle) 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 )
         {
 
     if ( UMAGetAppearanceVersion() >= 0x0110  )
     {
         if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
         {

-                       SetControlViewSize( (ControlHandle) m_macControl , m_pageSize ) ;
+                           SetControlViewSize( (ControlHandle) m_macControl , m_viewSize ) ;

         }
     }
     if ( refresh )
         }
     }
     if ( refresh )


@@ -105,9 +110,9 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
        if ( (ControlHandle) m_macControl == NULL )
                return ;
        
        if ( (ControlHandle) m_macControl == NULL )
                return ;
        

-  int position = GetControlValue( (ControlHandle) m_macControl) ;
-  int minPos = GetControlMinimum( (ControlHandle) m_macControl) ;
-  int maxPos = GetControlMaximum( (ControlHandle) 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;
 
   wxEventType scrollEvent = wxEVT_NULL;
   int nScrollInc;


@@ -115,31 +120,34 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
        switch( controlpart )
        {
                case kControlUpButtonPart :
        switch( controlpart )
        {
                case kControlUpButtonPart :

-        nScrollInc = -m_pageSize;
+        nScrollInc = -1;

         scrollEvent = wxEVT_SCROLL_LINEUP;
                        break ;
                case kControlDownButtonPart :
         scrollEvent = wxEVT_SCROLL_LINEUP;
                        break ;
                case kControlDownButtonPart :

-        nScrollInc = m_pageSize;
+        nScrollInc = 1;

         scrollEvent = wxEVT_SCROLL_LINEDOWN;
                        break ;
                case kControlPageUpPart :
         scrollEvent = wxEVT_SCROLL_LINEDOWN;
                        break ;
                case kControlPageUpPart :

-        nScrollInc = -m_viewSize;
+        nScrollInc = -m_pageSize;

         scrollEvent = wxEVT_SCROLL_PAGEUP;
                        break ;
                case kControlPageDownPart :
         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 ;
         scrollEvent = wxEVT_SCROLL_PAGEDOWN;
                        break ;
                case kControlIndicatorPart :
         nScrollInc = 0 ;
         scrollEvent = wxEVT_SCROLL_THUMBTRACK;
                        break ;

+                default :
+                        wxFAIL_MSG(wxT("illegal scrollbar selector"));
+                        break ;

        }
 
   int new_pos = position + nScrollInc;
 
        }
 
   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 )
   if (new_pos > maxPos)
       new_pos = maxPos;
        if ( nScrollInc )