X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..ad42b67c35ddcf8df2075ab582c9b64525756d09:/src/mac/carbon/gauge.cpp

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index be0d0d0a3c..cdaaf58a71 100644
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -15,9 +15,11 @@
 
 #include "wx/gauge.h"
 
+#if !USE_SHARED_LIBRARY
 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,
@@ -31,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() ;
@@ -60,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