cast corrected

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

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 54df1811666b81aea8a5c83c27507e8fd2250ee8..978292c9caaae7a9885c64c26810773dacb7930b 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -1,25 +1,38 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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__
 #pragma implementation "scrolbar.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #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/scrolbar.h"

+#include "wx/mac/uma.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 

+BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
+END_EVENT_TABLE()
+

 #endif
 
 #endif
 

+extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
+

 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,


@@ -27,20 +40,22 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-    if (!parent)
-        return FALSE;
-    parent->AddChild(this);
-    SetName(name);
-       SetValidator(validator);
+    m_macIsUserPane = FALSE ;

     
     

-    m_windowStyle = style;
+    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
+        return FALSE;

 
 

-    if ( id == -1 )
-           m_windowId = (int)NewControlId();
-    else
-           m_windowId = id;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    m_macControl = (WXWidget) ::NewControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()) ,
+                                &bounds , "\p" , true , 0 , 0 , 100, 
+                                kControlScrollBarLiveProc , (long) this) ;
+
+    wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ;
+
+    ::SetControlAction( (ControlRef) m_macControl , wxMacLiveScrollbarActionUPP ) ;
+
+    MacPostControlCreate(pos,size) ;

 
 

-    // TODO create scrollbar

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -50,23 +65,36 @@ wxScrollBar::~wxScrollBar()
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {

-    // TODO
+    ::SetControl32BitValue( (ControlRef) m_macControl , viewStart ) ;

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

-    // TODO
-    return 0;
+    return ::GetControl32BitValue( (ControlRef) 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;
 

-    // TODO
+      int range1 = wxMax((m_objectSize - m_viewSize), 0) ;
+
+    SetControl32BitMaximum( (ControlRef) m_macControl , range1 ) ;
+    SetControl32BitMinimum( (ControlRef) m_macControl , 0 ) ;
+    SetControl32BitValue( (ControlRef) m_macControl , position ) ;
+
+    if ( UMAGetAppearanceVersion() >= 0x0110  )
+    {
+        if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress )
+        {
+                SetControlViewSize( (ControlRef) m_macControl , m_viewSize ) ;
+        }
+    }
+    if ( refresh )
+      MacRedrawControl() ;

 }
 
 
 }
 
 


@@ -76,3 +104,79 @@ void wxScrollBar::Command(wxCommandEvent& event)
     ProcessCommand(event);
 }
 
     ProcessCommand(event);
 }
 

+void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) 
+{
+    if ( (ControlRef) m_macControl == NULL )
+        return ;
+    
+    int position = GetControl32BitValue( (ControlRef) m_macControl) ;
+    int minPos = GetControl32BitMinimum( (ControlRef) m_macControl) ;
+    int maxPos = GetControl32BitMaximum( (ControlRef) m_macControl) ;
+    
+    wxEventType scrollEvent = wxEVT_NULL;
+    int nScrollInc = 0;
+    
+    // all events have already been reported during mouse down, except for THUMBRELEASE
+    if ( !mouseStillDown && controlpart !=kControlIndicatorPart )
+        return ;
+    
+    switch( controlpart )
+    {
+    case kControlUpButtonPart :
+        nScrollInc = -1;
+        scrollEvent = wxEVT_SCROLL_LINEUP;
+        break ;
+    case kControlDownButtonPart :
+        nScrollInc = 1;
+        scrollEvent = wxEVT_SCROLL_LINEDOWN;
+        break ;
+    case kControlPageUpPart :
+        nScrollInc = -m_pageSize;
+        scrollEvent = wxEVT_SCROLL_PAGEUP;
+        break ;
+    case kControlPageDownPart :
+        nScrollInc = m_pageSize;
+        scrollEvent = wxEVT_SCROLL_PAGEDOWN;
+        break ;
+    case kControlIndicatorPart :
+        nScrollInc = 0 ;
+        if ( mouseStillDown )
+            scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+        else
+            scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
+        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);
+}
+