X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f1ae4143271ae63a17e052a1a471d16e9cd8c44..30a936ee4eb950b4b1905b6bd09c90d3ec39fa99:/src/mac/carbon/gauge.cpp?ds=sidebyside diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp index 67d5dd9c84..9c7fc023ae 100644 --- a/src/mac/carbon/gauge.cpp +++ b/src/mac/carbon/gauge.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: gauge.cpp // Purpose: wxGauge class -// 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__ @@ -19,7 +19,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) #endif -#include +#include "wx/mac/uma.h" bool wxGauge::Create(wxWindow *parent, wxWindowID id, int range, @@ -29,63 +29,53 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { - wxSize size = s ; - Rect bounds ; - Str255 title ; - m_rangeMax = range ; - - if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y) - { - size = wxSize( 200 , 16 ) ; - } - - MacPreControlCreate( parent , id , "" , pos , size ,style & 0xE0FFFFFF /* no borders on mac */ , validator , name , &bounds , title ) ; - - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , range, - kControlProgressBarProc , (long) this ) ; - - MacPostControlCreate() ; - - return TRUE; -} - -void wxGauge::SetShadowWidth(int w) -{ -} - -void wxGauge::SetBezelFace(int w) -{ + m_macIsUserPane = FALSE ; + + if ( !wxGaugeBase::Create(parent, id, range, pos, s, style & 0xE0FFFFFF, validator, name) ) + return false; + + wxSize size = s ; + /* + if ( size.x == wxDefaultCoord && size.y == wxDefaultCoord) + { + size = wxSize( 200 , 16 ) ; + } + */ + Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + m_peer = new wxMacControl() ; + verify_noerr ( CreateProgressBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , + GetValue() , 0 , GetRange() , false /* not indeterminate */ , m_peer->GetControlRefAddr() ) ); + + + MacPostControlCreate(pos,size) ; + + return TRUE; } void wxGauge::SetRange(int r) { - m_rangeMax = r; - ::SetControlMaximum( 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() ) + m_peer->SetMaximum( GetRange() ) ; } void wxGauge::SetValue(int pos) { - m_gaugePos = pos; - ::SetControlValue( m_macControl , m_gaugePos ) ; -} - -int wxGauge::GetShadowWidth() const -{ - return 0; -} - -int wxGauge::GetBezelFace() const -{ - return 0; -} - -int wxGauge::GetRange() const -{ - return m_rangeMax; + // we are going via the base class in case there is + // some change behind the values by it + wxGaugeBase::SetValue(pos) ; + if ( m_peer && m_peer->Ok() ) + m_peer->SetValue( GetValue() ) ; } int wxGauge::GetValue() const { - return m_gaugePos; +/* + if ( m_peer && m_peer->Ok() ) + return m_peer->GetValue() ; +*/ + return m_gaugePos ; }