Slider Updates

[wxWidgets.git] / src / mac / gauge.cpp

diff --git a/src/mac/gauge.cpp b/src/mac/gauge.cpp
index 37155cafb03ec2242c9b9cde8cd2e5078d6342d2..adc511023617b4e2ba29c29ae8fe24114288d15a 100644 (file)
--- a/src/mac/gauge.cpp
+++ b/src/mac/gauge.cpp
@@ -33,6 +33,7 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
        Rect bounds ;
        Str255 title ;
        m_rangeMax = range ;
        Rect bounds ;
        Str255 title ;
        m_rangeMax = range ;

+       m_gaugePos = 0 ;

        
        if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
        {
        
        if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
        {


@@ -41,7 +42,7 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style & 0xE0FFFFFF /* no borders on mac */ , validator , name , &bounds , title ) ;
 
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style & 0xE0FFFFFF /* no borders on mac */ , validator , name , &bounds , title ) ;
 

-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , range, 
+       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , range, 

                kControlProgressBarProc , (long) this ) ;
        
        MacPostControlCreate() ;
                kControlProgressBarProc , (long) this ) ;
        
        MacPostControlCreate() ;


@@ -60,13 +61,13 @@ void wxGauge::SetBezelFace(int w)
 void wxGauge::SetRange(int r)
 {
     m_rangeMax = r;
 void wxGauge::SetRange(int r)
 {
     m_rangeMax = r;

-    ::SetControlMaximum( m_macControl , m_rangeMax ) ;
+    ::SetControlMaximum( (ControlHandle) m_macControl , m_rangeMax ) ;

 }
 
 void wxGauge::SetValue(int pos)
 {
     m_gaugePos = pos;
 }
 
 void wxGauge::SetValue(int pos)
 {
     m_gaugePos = pos;

-       ::SetControlValue( m_macControl , m_gaugePos ) ;
+       ::SetControlValue( (ControlHandle) m_macControl , m_gaugePos ) ;

 }
 
 int wxGauge::GetShadowWidth() const
 }
 
 int wxGauge::GetShadowWidth() const