X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/90b959aee428b26304ee0056864af48775051496..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/mac/spinbutt.cpp diff --git a/src/mac/spinbutt.cpp b/src/mac/spinbutt.cpp index fc4e5e5888..e3beab7322 100644 --- a/src/mac/spinbutt.cpp +++ b/src/mac/spinbutt.cpp @@ -49,10 +49,10 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c MacPreControlCreate( parent , id , "" , pos , size ,style,*( (wxValidator*) NULL ) , name , &bounds , title ) ; - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 100, + m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 100, kControlLittleArrowsProc , (long) this ) ; - wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ; + wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ; MacPostControlCreate() ; @@ -90,13 +90,13 @@ void wxSpinButton::SetRange(int minVal, int maxVal) { m_min = minVal; m_max = maxVal; - SetControlMaximum( m_macControl , maxVal ) ; - SetControlMinimum( m_macControl , minVal ) ; + SetControlMaximum( (ControlHandle) m_macControl , maxVal ) ; + SetControlMinimum((ControlHandle) m_macControl , minVal ) ; } -void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) +void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) { - if ( m_macControl == NULL ) + if ( (ControlHandle) m_macControl == NULL ) return ; int oldValue = m_value ; @@ -142,7 +142,7 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control { m_value = oldValue ; } - SetControlValue( m_macControl , m_value ) ; + SetControlValue( (ControlHandle) m_macControl , m_value ) ; /* always send a thumbtrack event */ if (scrollEvent != wxEVT_SCROLL_THUMBTRACK) @@ -161,17 +161,6 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control wxSize wxSpinButton::DoGetBestSize() const { - if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 ) - { - // vertical control - return wxSize(16, - 2*16); - } - else - { - // horizontal control - return wxSize(2*16, - 16); - } + return wxSize(16,24); }