updated mac sources (CW 5.3 working , CW6 still having code gen problems)

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

diff --git a/src/mac/gauge.cpp b/src/mac/gauge.cpp
index 7dc3b5e8133e9435f0faec3340983159249815ed..67d5dd9c845ff2db660fd5d9efcc6d6cb1a65adf 100644 (file)
--- a/src/mac/gauge.cpp
+++ b/src/mac/gauge.cpp
@@ -33,15 +33,13 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
        Rect bounds ;
        Str255 title ;
        m_rangeMax = range ;
-       m_macHorizontalBorder = 2 ; // additional pixels around the real control
-       m_macVerticalBorder = 2 ;
        
        if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
        {
                size = wxSize( 200 , 16 ) ;
        }
        
-       MacPreControlCreate( parent , id ,  "" , pos , size ,style, 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 , true , 0 , 0 , range, 
                kControlProgressBarProc , (long) this ) ;
@@ -68,7 +66,7 @@ void wxGauge::SetRange(int r)
 void wxGauge::SetValue(int pos)
 {
     m_gaugePos = pos;
-   ::SetControlValue( m_macControl , m_gaugePos ) ;
+       ::SetControlValue( m_macControl , m_gaugePos ) ;
 }
 
 int wxGauge::GetShadowWidth() const