fix Borland bug http://news.gmane.org/find-root.php?message_id=%3c43A0B07F.8010204...

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

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 92d6dd1fafe7b9b1f1c27a2b6774ab810d21420f..7a240b834c6ebe2606073bf98d35ce1c22d26e5b 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -1,31 +1,29 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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
+#include "wx/wxprec.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"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 END_EVENT_TABLE()
 

-#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,


@@ -33,24 +31,21 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-  if (!parent)
-      return FALSE;
+    m_macIsUserPane = FALSE ;

     
     

-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
+    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
+        return FALSE;

 
 

-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 100, 
-               kControlScrollBarLiveProc , (long) this ) ;
-       
-       wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

 
 

-       ::SetControlAction( m_macControl , wxMacLiveScrollbarActionUPP ) ;
+    m_peer = new wxMacControl(this) ;
+    verify_noerr ( CreateScrollBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 
+    0 , 0 , 100 , 1 , true /* liveTracking */ , GetwxMacLiveScrollbarActionProc() , m_peer->GetControlRefAddr() ) );
+    

 
 

-       MacPostControlCreate() ;
+    MacPostControlCreate(pos,size) ;

 
 

-  return TRUE;
+    return TRUE;

 }
 
 wxScrollBar::~wxScrollBar()
 }
 
 wxScrollBar::~wxScrollBar()


@@ -59,106 +54,165 @@ wxScrollBar::~wxScrollBar()
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {

-    ::SetControlValue( m_macControl , viewStart ) ;
+    m_peer->SetValue( viewStart ) ;

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

-    return ::GetControlValue( m_macControl ) ;
+    return m_peer->GetValue() ;

 }
 
 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) ;
-
-    SetControlMaximum( m_macControl , range1 ) ;
-    SetControlMinimum(  m_macControl , 0 ) ;
-    SetControlValue(  m_macControl , position ) ;
+   int range1 = wxMax((m_objectSize - m_viewSize), 0) ;

 
 

-    if ( UMAGetAppearanceVersion() >= 0x0110  )
-    {
-#if UMA_USE_8_6        
-                       SetControlViewSize( m_macControl , m_pageSize ) ;
-#endif
-    }
-    Refresh() ;
+    m_peer->SetMaximum( range1 ) ;
+    m_peer->SetMinimum( 0 ) ;
+    m_peer->SetValue( position ) ;
+    m_peer->SetViewSize( m_viewSize ) ;

 }
 
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {
 }
 
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {

-    SetThumbPosition(event.m_commandInt);
+    SetThumbPosition(event.GetInt());

     ProcessCommand(event);
 }
 
     ProcessCommand(event);
 }
 

-void wxScrollBar::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) 

 {
 {

-       if ( m_macControl == NULL )
-               return ;
-       
-  int position = GetControlValue( m_macControl) ;
-  int minPos = GetControlMinimum( m_macControl) ;
-  int maxPos = GetControlMaximum( m_macControl) ;
-
-  wxEventType scrollEvent = wxEVT_NULL;
-  int nScrollInc;
-
-       switch( controlpart )
-       {
-               case kControlUpButtonPart :
+    int position = m_peer->GetValue() ;
+    int minPos = m_peer->GetMinimum() ;
+    int maxPos = m_peer->GetMaximum() ;
+    
+    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;
         nScrollInc = -1;
         scrollEvent = wxEVT_SCROLL_LINEUP;

-                       break ;
-               case kControlDownButtonPart :
+        break ;
+    case kControlDownButtonPart :

         nScrollInc = 1;
         scrollEvent = wxEVT_SCROLL_LINEDOWN;
         nScrollInc = 1;
         scrollEvent = wxEVT_SCROLL_LINEDOWN;

-                       break ;
-               case kControlPageUpPart :
+        break ;
+    case kControlPageUpPart :

         nScrollInc = -m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEUP;
         nScrollInc = -m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEUP;

-                       break ;
-               case kControlPageDownPart :
+        break ;
+    case kControlPageDownPart :

         nScrollInc = m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEDOWN;
         nScrollInc = m_pageSize;
         scrollEvent = wxEVT_SCROLL_PAGEDOWN;

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

         nScrollInc = 0 ;
         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);
+        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);

 }
 
 }
 

+wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) 
+{
+    int position = m_peer->GetValue() ;
+    int minPos = m_peer->GetMinimum() ;
+    int maxPos = m_peer->GetMaximum() ;
+    
+    wxEventType scrollEvent = wxEVT_NULL;
+    int nScrollInc = 0;
+    
+    wxMacCarbonEvent cEvent( (EventRef) mevent ) ;
+    ControlPartCode controlpart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart,typeControlPartCode) ;
+    
+    // all events have already been reported during mouse down, except for THUMBRELEASE
+    if ( controlpart !=kControlIndicatorPart )
+        return eventNotHandledErr ;
+    
+    switch( controlpart )
+    {
+    case kControlIndicatorPart :
+        nScrollInc = 0 ;
+        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);
+    return noErr ;
+}
+
+