Fixed OnSetCursor for Mac

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

diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp
index a38962776d062a9a389488a160f2cb7b3041d32d..ad843c3fd955bfced9f470e5d6199a018235305e 100644 (file)
--- a/src/mac/scrolbar.cpp
+++ b/src/mac/scrolbar.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        scrolbar.cpp
 // Purpose:     wxScrollBar
 /////////////////////////////////////////////////////////////////////////////
 // Name:        scrolbar.cpp
 // Purpose:     wxScrollBar

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -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"
 


@@ -38,19 +43,19 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
   if (!parent)
       return FALSE;
     
   if (!parent)
       return FALSE;
     

-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
+    Rect bounds ;
+    Str255 title ;
+    
+    MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ;

 
 

-       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , true , 0 , 0 , 100, 
-               kControlScrollBarLiveProc , (long) this ) ;
-       
-       wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
+    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , true , 0 , 0 , 100, 
+        kControlScrollBarLiveProc , (long) this ) ;
+    
+    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;

 
 

-       ::SetControlAction( (ControlHandle) m_macControl , wxMacLiveScrollbarActionUPP ) ;
+    ::SetControlAction( (ControlHandle) m_macControl , wxMacLiveScrollbarActionUPP ) ;

 
 

-       MacPostControlCreate() ;
+    MacPostControlCreate() ;

 
   return TRUE;
 }
 
   return TRUE;
 }


@@ -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 )


@@ -102,67 +107,70 @@ void wxScrollBar::Command(wxCommandEvent& event)
 
 void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
 
 void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {

-       if ( (ControlHandle) m_macControl == NULL )
-               return ;
-       
-  int position = GetControlValue( (ControlHandle) m_macControl) ;
-  int minPos = GetControlMinimum( (ControlHandle) m_macControl) ;
-  int maxPos = GetControlMaximum( (ControlHandle) m_macControl) ;
-
-  wxEventType scrollEvent = wxEVT_NULL;
-  int nScrollInc;
-
-       switch( controlpart )
-       {
-               case kControlUpButtonPart :
-        nScrollInc = -m_pageSize;
+    if ( (ControlHandle) m_macControl == NULL )
+        return ;
+    
+    int position = GetControl32BitValue( (ControlHandle) m_macControl) ;
+    int minPos = GetControl32BitMinimum( (ControlHandle) m_macControl) ;
+    int maxPos = GetControl32BitMaximum( (ControlHandle) m_macControl) ;
+    
+    wxEventType scrollEvent = wxEVT_NULL;
+    int nScrollInc;
+    
+    switch( controlpart )
+    {
+    case kControlUpButtonPart :
+        nScrollInc = -1;

         scrollEvent = wxEVT_SCROLL_LINEUP;
         scrollEvent = wxEVT_SCROLL_LINEUP;

-                       break ;
-               case kControlDownButtonPart :
-        nScrollInc = m_pageSize;
+        break ;
+    case kControlDownButtonPart :
+        nScrollInc = 1;

         scrollEvent = wxEVT_SCROLL_LINEDOWN;
         scrollEvent = wxEVT_SCROLL_LINEDOWN;

-                       break ;
-               case kControlPageUpPart :
-        nScrollInc = -m_viewSize;
+        break ;
+    case kControlPageUpPart :
+        nScrollInc = -m_pageSize;

         scrollEvent = wxEVT_SCROLL_PAGEUP;
         scrollEvent = wxEVT_SCROLL_PAGEUP;

-                       break ;
-               case kControlPageDownPart :
-        nScrollInc = m_viewSize;
+        break ;
+    case kControlPageDownPart :
+        nScrollInc = m_pageSize;

         scrollEvent = wxEVT_SCROLL_PAGEDOWN;
         scrollEvent = wxEVT_SCROLL_PAGEDOWN;

-                       break ;
-               case kControlIndicatorPart :
+        break ;
+    case kControlIndicatorPart :

         nScrollInc = 0 ;
         scrollEvent = wxEVT_SCROLL_THUMBTRACK;
         nScrollInc = 0 ;
         scrollEvent = wxEVT_SCROLL_THUMBTRACK;

-                       break ;
-       }
-
-  int new_pos = position + nScrollInc;
-
-  if (new_pos < 0)
-      new_pos = 0;
-  if (new_pos > maxPos)
-      new_pos = maxPos;
-       if ( nScrollInc )
-       SetThumbPosition(new_pos);
-       
-  wxScrollEvent event(scrollEvent, m_windowId);
-       if ( m_windowStyle & wxHORIZONTAL )
-       {
-               event.SetOrientation( wxHORIZONTAL ) ;
-       }
-       else
-       {
-               event.SetOrientation( wxVERTICAL ) ;
-       }
-  event.SetPosition(new_pos);
-  event.SetEventObject( this );
-  wxWindow* window = GetParent() ;
-  if (window && window->MacIsWindowScrollbar(this) )
-  {
-       // this is hardcoded
-       window->MacOnScroll(event);
-  }
-  else
-       GetEventHandler()->ProcessEvent(event);
+        break ;
+    default :
+        wxFAIL_MSG(wxT("illegal scrollbar selector"));
+        break ;
+    }
+    
+    int new_pos = position + nScrollInc;
+    
+    if (new_pos < minPos)
+        new_pos = minPos;
+    if (new_pos > maxPos)
+        new_pos = maxPos;
+    if ( nScrollInc )
+        SetThumbPosition(new_pos);
+    
+    wxScrollEvent event(scrollEvent, m_windowId);
+    if ( m_windowStyle & wxHORIZONTAL )
+    {
+        event.SetOrientation( wxHORIZONTAL ) ;
+    }
+    else
+    {
+        event.SetOrientation( wxVERTICAL ) ;
+    }
+    event.SetPosition(new_pos);
+    event.SetEventObject( this );
+    wxWindow* window = GetParent() ;
+    if (window && window->MacIsWindowScrollbar(this) )
+    {
+        // this is hardcoded
+        window->MacOnScroll(event);
+    }
+    else
+        GetEventHandler()->ProcessEvent(event);

 }
 
 }