/////////////////////////////////////////////////////////////////////////////
// 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__
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 = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , range,
- kControlProgressBarProc , (long) this ) ;
-
- MacPostControlCreate() ;
-
- return TRUE;
+ m_macIsUserPane = FALSE ;
+
+ if ( !wxGaugeBase::Create(parent, id, range, pos, s, style & 0xE0FFFFFF, validator, name) )
+ return false;
+
+ wxSize size = s ;
+
+ m_rangeMax = range ;
+ m_gaugePos = 0 ;
+
+ if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
+ {
+ size = wxSize( 200 , 16 ) ;
+ }
+
+ Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+ verify_noerr ( CreateProgressBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
+ m_gaugePos , 0 , m_rangeMax , false /* not indeterminate */ , (ControlRef*) &m_macControl ) ) ;
+
+ MacPostControlCreate(pos,size) ;
+
+ return TRUE;
}
void wxGauge::SetShadowWidth(int w)
void wxGauge::SetRange(int r)
{
m_rangeMax = r;
- ::SetControlMaximum( (ControlHandle) m_macControl , m_rangeMax ) ;
+ ::SetControl32BitMaximum( (ControlRef) m_macControl , m_rangeMax ) ;
}
void wxGauge::SetValue(int pos)
{
m_gaugePos = pos;
- ::SetControlValue( (ControlHandle) m_macControl , m_gaugePos ) ;
+ ::SetControl32BitValue( (ControlRef) m_macControl , m_gaugePos ) ;
}
int wxGauge::GetShadowWidth() const