Various compile fixes.

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

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index 7dc3b5e8133e9435f0faec3340983159249815ed..cdaaf58a715b3e6c133fbd58681a322139af3a84 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -19,7 +19,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 #endif
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            int range,
@@ -33,17 +33,15 @@ 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, 
+       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , range, 
                kControlProgressBarProc , (long) this ) ;
        
        MacPostControlCreate() ;
@@ -62,13 +60,13 @@ void wxGauge::SetBezelFace(int w)
 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;
-   ::SetControlValue( m_macControl , m_gaugePos ) ;
+       ::SetControlValue( (ControlHandle) m_macControl , m_gaugePos ) ;
 }
 
 int wxGauge::GetShadowWidth() const