X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..3ef37e7f4ec5f0688a4fb47e530ca2d30a6bb3ed:/src/mac/carbon/spinbutt.cpp diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp index cbea725592..f8dcca8bd9 100644 --- a/src/mac/carbon/spinbutt.cpp +++ b/src/mac/carbon/spinbutt.cpp @@ -1,48 +1,68 @@ ///////////////////////////////////////////////////////////////////////////// // Name: spinbutt.cpp // Purpose: wxSpinButton -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ #pragma implementation "spinbutt.h" +#pragma implementation "spinbuttbase.h" #endif #include "wx/spinbutt.h" +#include "wx/mac/uma.h" + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxWin macros +// ---------------------------------------------------------------------------- #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) + IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) + IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent) #endif wxSpinButton::wxSpinButton() + : wxSpinButtonBase() { - m_min = 0; - m_max = 100; } bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - long style, const wxString& name) + long style, const wxString& name) { - SetName(name); - - m_windowStyle = style; - - SetParent(parent); + if ( !wxSpinButtonBase::Create(parent, id, pos, size, + style, wxDefaultValidator, name) ) + return false; m_min = 0; m_max = 100; - - m_windowId = (id == -1) ? NewControlId() : id; - - // TODO create spin button - return FALSE; + + if (!parent) + return FALSE; + + Rect bounds ; + Str255 title ; + + MacPreControlCreate( parent , id , wxEmptyString , pos , size ,style,*( (wxValidator*) NULL ) , name , &bounds , title ) ; + + m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 100, + kControlLittleArrowsProc , (long) this ) ; + + wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ; + + MacPostControlCreate() ; + + return TRUE; } - + wxSpinButton::~wxSpinButton() { } @@ -50,29 +70,113 @@ wxSpinButton::~wxSpinButton() // Attributes //////////////////////////////////////////////////////////////////////////// +int wxSpinButton::GetMin() const +{ + return m_min; +} + +int wxSpinButton::GetMax() const +{ + return m_max; +} + int wxSpinButton::GetValue() const { - // TODO - return 0; + return m_value; } void wxSpinButton::SetValue(int val) { - // TODO + m_value = val ; } void wxSpinButton::SetRange(int minVal, int maxVal) { - m_min = minVal; - m_max = maxVal; - // TODO + m_min = minVal; + m_max = maxVal; + SetControl32BitMaximum( (ControlHandle) m_macControl , maxVal ) ; + SetControl32BitMinimum((ControlHandle) m_macControl , minVal ) ; +} + +void wxSpinButton::MacHandleValueChanged( int inc ) +{ + + wxEventType scrollEvent = wxEVT_NULL; + int oldValue = m_value ; + + m_value = oldValue + inc; + + if (m_value < m_min) + { + if ( m_windowStyle & wxSP_WRAP ) + m_value = m_max; + else + m_value = m_min; + } + + if (m_value > m_max) + { + if ( m_windowStyle & wxSP_WRAP ) + m_value = m_min; + else + m_value = m_max; + } + + if ( m_value - oldValue == -1 ) + scrollEvent = wxEVT_SCROLL_LINEDOWN ; + else if ( m_value - oldValue == 1 ) + scrollEvent = wxEVT_SCROLL_LINEUP ; + else + scrollEvent = wxEVT_SCROLL_THUMBTRACK ; + + wxSpinEvent event(scrollEvent, m_windowId); + + event.SetPosition(m_value); + event.SetEventObject( this ); + if ((GetEventHandler()->ProcessEvent( event )) && + !event.IsAllowed() ) + { + m_value = oldValue ; + } + SetControl32BitValue( (ControlHandle) m_macControl , m_value ) ; + + /* always send a thumbtrack event */ + if (scrollEvent != wxEVT_SCROLL_THUMBTRACK) + { + scrollEvent = wxEVT_SCROLL_THUMBTRACK; + wxSpinEvent event2( scrollEvent, GetId()); + event2.SetPosition( m_value ); + event2.SetEventObject( this ); + GetEventHandler()->ProcessEvent( event2 ); + } +} + +void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown)) +{ + if ( (ControlHandle) m_macControl == NULL ) + return ; + + int nScrollInc = 0; + + switch( controlpart ) + { + case kControlUpButtonPart : + nScrollInc = 1; + break ; + case kControlDownButtonPart : + nScrollInc = -1; + break ; + } + MacHandleValueChanged( nScrollInc ) ; + } -// Spin event -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent) +// ---------------------------------------------------------------------------- +// size calculation +// ---------------------------------------------------------------------------- -wxSpinEvent::wxSpinEvent(wxEventType commandType, int id): - wxScrollEvent(commandType, id) +wxSize wxSpinButton::DoGetBestSize() const { + return wxSize(16,24); }