Only call use uppercase letter if control, alt, or shift is held down,

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

diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp
index 2db4a175bb25a42339c81534f792deb339ef20f5..68d403ae2624b1197ea23ce70a156cc96b7d5677 100644 (file)
--- a/src/mac/scrolbar.cpp
+++ b/src/mac/scrolbar.cpp
@@ -13,14 +13,23 @@
 #pragma implementation "scrolbar.h"
 #endif
 
+#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"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 END_EVENT_TABLE()
 
+#endif
 
 extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
 
@@ -39,12 +48,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() ;
 
@@ -57,34 +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 UMA_USE_8_6        
-                       SetControlViewSize( m_macControl , m_pageSize ) ;
-#endif
+        if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
+        {
+                           SetControlViewSize( (ControlHandle) m_macControl , m_viewSize ) ;
+        }
     }
-    Refresh() ;
+    if ( refresh )
+      MacRedrawControl() ;
 }
 
 
@@ -94,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;
@@ -128,12 +139,15 @@ void wxScrollBar::MacHandleControlClick( ControlHandle control , SInt16 controlp
         nScrollInc = 0 ;
         scrollEvent = wxEVT_SCROLL_THUMBTRACK;
                        break ;
+                default :
+                        wxFAIL_MSG(wxT("illegal scrollbar selector"));
+                        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 )