reintroducing direct access, clipping to client area in dc

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

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index 19af6c6f41335b01e1b97f092dfbf0c721d186fd..1970134e2f28440b72dd6b0af58b0a8bde27d0c2 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -9,10 +9,14 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "gauge.h"
 #endif
 
+#include "wx/wxprec.h"
+
+#if wxUSE_GAUGE 
+
 #include "wx/gauge.h"
 
 #if !USE_SHARED_LIBRARY
@@ -30,66 +34,68 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
     m_macIsUserPane = FALSE ;
-    
+
     if ( !wxGaugeBase::Create(parent, id, range, pos, s, style & 0xE0FFFFFF, validator, name) )
         return false;
 
     wxSize size = s ;
-
-    m_rangeMax = range ;
-    m_gaugePos = 0 ;
-    
-    if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
+    /*
+    if ( size.x == wxDefaultCoord && size.y == wxDefaultCoord)
     {
         size = wxSize( 200 , 16 ) ;
     }
-    
+    */
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , 0 , range, 
-        kControlProgressBarProc , (long) this ) ;
-    
+    m_peer = new wxMacControl() ;
+    verify_noerr ( CreateProgressBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 
+     GetValue() , 0 , GetRange() , false /* not indeterminate */ , m_peer->GetControlRefAddr() ) );
+
+    if ( GetValue() == 0 )
+        m_peer->SetData<Boolean>( kControlEntireControl , kControlProgressBarAnimatingTag , (Boolean) false ) ;
+
     MacPostControlCreate(pos,size) ;
     
     return TRUE;
 }
 
-void wxGauge::SetShadowWidth(int w)
-{
-}
-
-void wxGauge::SetBezelFace(int w)
-{
-}
-
 void wxGauge::SetRange(int r)
 {
-    m_rangeMax = r;
-    ::SetControl32BitMaximum( (ControlRef) m_macControl , m_rangeMax ) ;
+    // we are going via the base class in case there is 
+    // some change behind the values by it
+    wxGaugeBase::SetRange(r) ;
+    if ( m_peer && m_peer->Ok() )
+        m_peer->SetMaximum( GetRange() ) ;
 }
 
 void wxGauge::SetValue(int pos)
 {
-    m_gaugePos = pos;
-       ::SetControl32BitValue( (ControlRef) m_macControl , m_gaugePos ) ;
-}
-
-int wxGauge::GetShadowWidth() const
-{
-    return 0;
-}
-
-int wxGauge::GetBezelFace() const
-{
-    return 0;
-}
-
-int wxGauge::GetRange() const
-{
-    return m_rangeMax;
+    // we are going via the base class in case there is 
+    // some change behind the values by it
+    wxGaugeBase::SetValue(pos) ;
+    if ( m_peer && m_peer->Ok() )
+    {
+        m_peer->SetValue( GetValue() ) ;
+        // we turn off animation in the unnecessary situations as this is eating a lot of CPU otherwise
+        Boolean shouldAnimate = ( GetValue() > 0 && GetValue() < GetRange() ) ;
+        if ( m_peer->GetData<Boolean>( kControlEntireControl , kControlProgressBarAnimatingTag ) != shouldAnimate )
+        {
+            m_peer->SetData<Boolean>( kControlEntireControl , kControlProgressBarAnimatingTag , shouldAnimate ) ;
+            if ( !shouldAnimate )
+            {
+                Refresh() ;
+            }
+        }
+    }
 }
 
 int wxGauge::GetValue() const
 {
-    return m_gaugePos;
+/*
+    if ( m_peer && m_peer->Ok() )
+        return m_peer->GetValue() ;
+*/
+    return m_gaugePos ;
 }
 
+#endif // wxUSE_GAUGE 
+