Updated Makefiles for all but Motif; there is either a lock or a CVS problem.

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

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index be0d0d0a3c904d1983126b5abc2aa3339f81f55a..adc511023617b4e2ba29c29ae8fe24114288d15a 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -15,9 +15,11 @@
 
 #include "wx/gauge.h"
 
 
 #include "wx/gauge.h"
 

+#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 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,
 
 bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            int range,


@@ -31,17 +33,16 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
        Rect bounds ;
        Str255 title ;
        m_rangeMax = range ;
        Rect bounds ;
        Str255 title ;
        m_rangeMax = range ;

-       m_macHorizontalBorder = 2 ; // additional pixels around the real control
-       m_macVerticalBorder = 2 ;
+       m_gaugePos = 0 ;

        
        if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
        {
                size = wxSize( 200 , 16 ) ;
        }
        
        
        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() ;
                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