X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b45ed7a273799b1b360482496a706a211eca6435..3e6858cdcb9278b36446466c346d984e7e306553:/src/mac/carbon/gauge.cpp diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp index 01a557e17c..3793d8ed60 100644 --- a/src/mac/carbon/gauge.cpp +++ b/src/mac/carbon/gauge.cpp @@ -9,87 +9,120 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "gauge.h" -#endif +#include "wx/wxprec.h" + +#if wxUSE_GAUGE #include "wx/gauge.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) -#endif #include "wx/mac/uma.h" -bool wxGauge::Create(wxWindow *parent, wxWindowID id, - int range, - const wxPoint& pos, - const wxSize& s, - long style, - const wxValidator& validator, - const wxString& name) +bool wxGauge::Create( wxWindow *parent, + wxWindowID id, + int range, + const wxPoint& pos, + const wxSize& s, + long style, + const wxValidator& validator, + const wxString& name ) { - if ( !wxGaugeBase::Create(parent, id, range, pos, s, style, validator, name) ) + m_macIsUserPane = false; + + if ( !wxGaugeBase::Create( parent, id, range, pos, s, style & 0xE0FFFFFF, validator, name ) ) return false; - wxSize size = s ; - Rect bounds ; - Str255 title ; - m_rangeMax = range ; - m_gaugePos = 0 ; - - if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y) - { - size = wxSize( 200 , 16 ) ; - } - - MacPreControlCreate( parent , id , wxEmptyString , pos , size ,style & 0xE0FFFFFF /* no borders on mac */ , validator , name , &bounds , title ) ; - - m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , range, - kControlProgressBarProc , (long) this ) ; - - MacPostControlCreate() ; - - return TRUE; -} + wxSize size = s; -void wxGauge::SetShadowWidth(int w) -{ -} +#if 0 + if (size.x == wxDefaultCoord && size.y == wxDefaultCoord) + size = wxSize( 200 , 16 ); +#endif -void wxGauge::SetBezelFace(int w) -{ + Rect bounds = wxMacGetBoundsForControl( this, pos, size ); + m_peer = new wxMacControl( this ); + OSStatus err = CreateProgressBarControl( + MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, + GetValue(), 0, GetRange(), false /* not indeterminate */, m_peer->GetControlRefAddr() ); + verify_noerr( err ); + + if ( GetValue() == 0 ) + m_peer->SetData( kControlEntireControl, kControlProgressBarAnimatingTag, (Boolean)false ); + + MacPostControlCreate( pos, size ); + + return true; } void wxGauge::SetRange(int r) { - m_rangeMax = r; - ::SetControl32BitMaximum( (ControlHandle) m_macControl , m_rangeMax ) ; + // we are going via the base class in case there is + // some change behind the values by it + wxGaugeBase::SetRange( r ) ; + if ( m_peer && m_peer->Ok() ){ + // switch back to determinate mode if not there already + if ( m_peer->GetData( kControlNoPart, kControlProgressBarIndeterminateTag ) != false ) + { + m_peer->SetData( kControlNoPart, kControlProgressBarIndeterminateTag, (Boolean)false ); + } + + m_peer->SetMaximum( GetRange() ) ; + } } void wxGauge::SetValue(int pos) { - m_gaugePos = pos; - ::SetControl32BitValue( (ControlHandle) m_macControl , m_gaugePos ) ; -} + // we are going via the base class in case there is + // some change behind the values by it + wxGaugeBase::SetValue( pos ) ; -int wxGauge::GetShadowWidth() const -{ - return 0; -} + if ( m_peer && m_peer->Ok() ) + { + // switch back to determinate mode if not there already + if ( m_peer->GetData( kControlNoPart, kControlProgressBarIndeterminateTag ) != false ) + { + m_peer->SetData( kControlNoPart, kControlProgressBarIndeterminateTag, (Boolean)false ); + } + + m_peer->SetValue( GetValue() ) ; -int wxGauge::GetBezelFace() const -{ - return 0; + // turn off animation in the unnecessary situations as this is consuming a lot of CPU otherwise + Boolean shouldAnimate = ( GetValue() > 0 && GetValue() < GetRange() ) ; + if ( m_peer->GetData( kControlEntireControl, kControlProgressBarAnimatingTag ) != shouldAnimate ) + { + m_peer->SetData( kControlEntireControl, kControlProgressBarAnimatingTag, shouldAnimate ) ; + if ( !shouldAnimate ) + Refresh() ; + } + } } -int wxGauge::GetRange() const +int wxGauge::GetValue() const { - return m_rangeMax; +#if 0 + if ( m_peer && m_peer->Ok() ) + return m_peer->GetValue() ; +#endif + + return m_gaugePos ; } -int wxGauge::GetValue() const +void wxGauge::Pulse() { - return m_gaugePos; + if ( m_peer && m_peer->Ok() ) + { + if ( m_peer->GetData( kControlNoPart, kControlProgressBarIndeterminateTag ) != true ) + { + m_peer->SetData( kControlNoPart, kControlProgressBarIndeterminateTag, true); + } + + if ( m_peer->GetData( kControlEntireControl, kControlProgressBarAnimatingTag ) != true ) + { + m_peer->SetData( kControlEntireControl, kControlProgressBarAnimatingTag, true ) ; + } + } } +#endif // wxUSE_GAUGE +