X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6511d3078ecd1b1673de4a050a5130de971f77ab..807c0706e65d6d67b15d2acc53b0d41b6654c711:/src/mac/carbon/spinbutt.cpp diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp index b3fd3830b1..c50ab73d6f 100644 --- a/src/mac/carbon/spinbutt.cpp +++ b/src/mac/carbon/spinbutt.cpp @@ -9,12 +9,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "spinbutt.h" #pragma implementation "spinbuttbase.h" #endif -#include "wx/defs.h" +#include "wx/wxprec.h" #if wxUSE_SPINBTN @@ -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;