new capture handling, can be turned off

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

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index c5a74bc2f4ca3bf55109e693028b121cca9a0fb2..d2422dd7dcb2804b90cb8fa598401e7d0fe8c4f1 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -9,11 +9,11 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "scrolbar.h"
 #endif
 
 #pragma implementation "scrolbar.h"
 #endif
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"

 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"


@@ -23,16 +23,11 @@
 #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,


@@ -47,9 +42,9 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
 
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
 

-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl(this) ;

     verify_noerr ( CreateScrollBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 
     verify_noerr ( CreateScrollBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 

-    0 , 0 , 100 , 1 , true /* liveTracking */ , wxMacLiveScrollbarActionUPP , *m_peer ) );
+    0 , 0 , 100 , 1 , true /* liveTracking */ , GetwxMacLiveScrollbarActionProc() , m_peer->GetControlRefAddr() ) );

     
 
     MacPostControlCreate(pos,size) ;
     
 
     MacPostControlCreate(pos,size) ;


@@ -63,12 +58,12 @@ wxScrollBar::~wxScrollBar()
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {
 
 void wxScrollBar::SetThumbPosition(int viewStart)
 {

-    ::SetControl32BitValue( *m_peer , viewStart ) ;
+    m_peer->SetValue( viewStart ) ;

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

-    return ::GetControl32BitValue( *m_peer ) ;
+    return m_peer->GetValue() ;

 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,


@@ -80,27 +75,24 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
 
    int range1 = wxMax((m_objectSize - m_viewSize), 0) ;
 
 
    int range1 = wxMax((m_objectSize - m_viewSize), 0) ;
 

-    SetControl32BitMaximum( *m_peer , range1 ) ;
-    SetControl32BitMinimum( *m_peer , 0 ) ;
-    SetControl32BitValue( *m_peer , position ) ;
-    SetControlViewSize( *m_peer , m_viewSize ) ;
-
-    if ( refresh )
-      MacRedrawControl() ;
+    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);
 }
 
 void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) 
 {
     ProcessCommand(event);
 }
 
 void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) 
 {

-    int position = GetControl32BitValue( *m_peer) ;
-    int minPos = GetControl32BitMinimum( *m_peer) ;
-    int maxPos = GetControl32BitMaximum( *m_peer) ;
+    int position = m_peer->GetValue() ;
+    int minPos = m_peer->GetMinimum() ;
+    int maxPos = m_peer->GetMaximum() ;

     
     wxEventType scrollEvent = wxEVT_NULL;
     int nScrollInc = 0;
     
     wxEventType scrollEvent = wxEVT_NULL;
     int nScrollInc = 0;


@@ -171,9 +163,9 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
 
 wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) 
 {
 
 wxInt32 wxScrollBar::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) 
 {

-    int position = GetControl32BitValue( *m_peer) ;
-    int minPos = GetControl32BitMinimum( *m_peer) ;
-    int maxPos = GetControl32BitMaximum( *m_peer) ;
+    int position = m_peer->GetValue() ;
+    int minPos = m_peer->GetMinimum() ;
+    int maxPos = m_peer->GetMaximum() ;

     
     wxEventType scrollEvent = wxEVT_NULL;
     int nScrollInc = 0;
     
     wxEventType scrollEvent = wxEVT_NULL;
     int nScrollInc = 0;