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 2f77f5e9029e88688ce6825bfb9b53869ddcf9f6..d2422dd7dcb2804b90cb8fa598401e7d0fe8c4f1 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -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,


@@ -49,7 +44,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     m_peer = new wxMacControl(this) ;
     verify_noerr ( CreateScrollBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 
 
     m_peer = new wxMacControl(this) ;
     verify_noerr ( CreateScrollBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 

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

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