Generalised WinCE fix for other platforms

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

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index 6ffd9dd1a5fe6acbf03f6e9931453a1fcfdf6ddd..b2a8e04737505cd97a893c2f0eb871b3105da2e9 100644 (file)
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -20,12 +20,10 @@
 #include "wx/slider.h"
 #include "wx/mac/uma.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 
 BEGIN_EVENT_TABLE(wxSlider, wxControl)
 END_EVENT_TABLE()
-#endif
 
  // The dimensions of the different styles of sliders (From Aqua document)
 #define wxSLIDER_DIMENSIONACROSS 15
@@ -52,8 +50,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,
@@ -91,10 +87,10 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     while (tickMarks > 20)
         tickMarks /= 5; //keep the number of tickmarks from becoming unwieldly
 
-    m_peer = new wxMacControl() ;
+    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) {