From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 27 Feb 2005 14:44:36 +0000 (+0000)
Subject: scrolling UPP moved
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/cd7800274bd120f099ae712dfd76ea69eaeeed73

scrolling UPP moved


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 2f77f5e902..d1fc325422 100644
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -31,8 +31,6 @@ END_EVENT_TABLE()
 
 #endif
 
-extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
-
 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
@@ -49,7 +47,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     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) ;
diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index 422fea6b02..a842ded66d 100644
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -52,8 +52,6 @@ END_EVENT_TABLE()
     m_tickFreq = 0;
 }
 
-extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
-
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
                       int value, int minValue, int maxValue,
                       const wxPoint& pos,
@@ -94,7 +92,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     m_peer = new wxMacControl(this) ;
     verify_noerr ( CreateSliderControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
         value , minValue , maxValue , kControlSliderPointsDownOrRight , tickMarks , true /* liveTracking */ ,
-        wxMacLiveScrollbarActionUPP , m_peer->GetControlRefAddr() ) );
+        GetwxMacLiveScrollbarActionProc() , m_peer->GetControlRefAddr() ) );
 
 
     if(style & wxSL_VERTICAL) {
diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index 2b432a85a6..c50ab73d6f 100644
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -34,8 +34,6 @@
     IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
 #endif
 
-extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
-
 wxSpinButton::wxSpinButton()
    : wxSpinButtonBase()
 {
@@ -62,7 +60,7 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
     verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 ,
      m_peer->GetControlRefAddr() ) );
 
-    m_peer->SetActionProc( wxMacLiveScrollbarActionUPP ) ;
+    m_peer->SetActionProc( GetwxMacLiveScrollbarActionProc() ) ;
     MacPostControlCreate(pos,size) ;
 
     return true;