Fix for problem with wxGetFileKind on WinCE

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

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index 6ffd9dd1a5fe6acbf03f6e9931453a1fcfdf6ddd..a842ded66dc8cc903e1c96b8dbf28ce1aad533d5 100644 (file)
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -52,8 +52,6 @@ END_EVENT_TABLE()
     m_tickFreq = 0;
 }
 
     m_tickFreq = 0;
 }
 

-extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
-

 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
                       int value, int minValue, int maxValue,
                       const wxPoint& pos,
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
                       int value, int minValue, int maxValue,
                       const wxPoint& pos,


@@ -91,10 +89,10 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     while (tickMarks > 20)
         tickMarks /= 5; //keep the number of tickmarks from becoming unwieldly
 
     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 */ ,
     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) {
 
 
     if(style & wxSL_VERTICAL) {