Use wxMBConvUTF8 when G_FILENAME_ENCODING is UTF-8, and set

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

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index 35f00904d4c7a757feeceba15ae19196cf20f989..c50ab73d6f5849de0252d347b1bdb784b2284b3a 100644 (file)
--- 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()
 {
@@ -58,11 +56,11 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
 
-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl(this) ;
     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;