X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6bc3b8e9680e8aa3d50ae4bb41dad22c6dd3ce1b..b4446c244775324631b8dd2b588ea35f32e71728:/src/mac/classic/spinbutt.cpp diff --git a/src/mac/classic/spinbutt.cpp b/src/mac/classic/spinbutt.cpp index a4e47edc17..b058518a13 100644 --- a/src/mac/classic/spinbutt.cpp +++ b/src/mac/classic/spinbutt.cpp @@ -1,19 +1,22 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: spinbutt.cpp +// Name: src/mac/classic/spinbutt.cpp // Purpose: wxSpinButton // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "spinbutt.h" -#pragma implementation "spinbuttbase.h" +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop #endif +#if wxUSE_SPINBTN + #include "wx/spinbutt.h" #include "wx/mac/uma.h" @@ -25,10 +28,8 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) - IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent) wxSpinButton::wxSpinButton() : wxSpinButtonBase() @@ -44,25 +45,25 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c m_min = 0; m_max = 100; - + if (!parent) - return FALSE; - + return false; + Rect bounds ; Str255 title ; - + MacPreControlCreate( parent , id , wxEmptyString , pos , size ,style,*( (wxValidator*) NULL ) , name , &bounds , title ) ; - - m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 100, + + m_macControl = (WXWidget) ::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; + + return true; } - + wxSpinButton::~wxSpinButton() { } @@ -82,7 +83,12 @@ int wxSpinButton::GetMax() const int wxSpinButton::GetValue() const { - return m_value; + int n = m_value; + + if (n < m_min) n = m_min; + if (n > m_max) n = m_max; + + return n; } void wxSpinButton::SetValue(int val) @@ -100,12 +106,12 @@ void wxSpinButton::SetRange(int minVal, int maxVal) 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 ) @@ -113,7 +119,7 @@ void wxSpinButton::MacHandleValueChanged( int inc ) else m_value = m_min; } - + if (m_value > m_max) { if ( m_windowStyle & wxSP_WRAP ) @@ -121,16 +127,16 @@ void wxSpinButton::MacHandleValueChanged( int inc ) 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 )) && @@ -139,7 +145,7 @@ void wxSpinButton::MacHandleValueChanged( int inc ) m_value = oldValue ; } SetControl32BitValue( (ControlHandle) m_macControl , m_value ) ; - + /* always send a thumbtrack event */ if (scrollEvent != wxEVT_SCROLL_THUMBTRACK) { @@ -151,13 +157,13 @@ void wxSpinButton::MacHandleValueChanged( int inc ) } } -void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown)) +void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown)) { if ( (ControlHandle) m_macControl == NULL ) return ; - + int nScrollInc = 0; - + switch( controlpart ) { case kControlUpButtonPart : @@ -168,7 +174,7 @@ void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart break ; } MacHandleValueChanged( nScrollInc ) ; - + } // ---------------------------------------------------------------------------- @@ -180,3 +186,4 @@ wxSize wxSpinButton::DoGetBestSize() const return wxSize(16,24); } +#endif // wxUSE_SPINBTN