make sure we catch invalid control refs better

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

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index 9371fb247d26ceb545a6206ecdfda5b74b1c95a9..9fa85e774696c64a396abb7fb042626736b6debb 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -9,54 +9,57 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "gauge.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_GAUGE 
 
 #include "wx/gauge.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-#endif
 
 #include "wx/mac/uma.h"
 
-bool wxGauge::Create(wxWindow *parent, wxWindowID id,
-           int range,
-           const wxPoint& pos,
-           const wxSize& s,
-           long style,
-           const wxValidator& validator,
-           const wxString& name)
+bool wxGauge::Create( wxWindow *parent,
+    wxWindowID id,
+    int range,
+    const wxPoint& pos,
+    const wxSize& s,
+    long style,
+    const wxValidator& validator,
+    const wxString& name )
 {
-    m_macIsUserPane = FALSE ;
+    m_macIsUserPane = false;
 
-    if ( !wxGaugeBase::Create(parent, id, range, pos, s, style & 0xE0FFFFFF, validator, name) )
+    if ( !wxGaugeBase::Create( parent, id, range, pos, s, style & 0xE0FFFFFF, validator, name ) )
         return false;
 
-    wxSize size = s ;
-    /*
-    if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
-    {
-        size = wxSize( 200 , 16 ) ;
-    }
-    */
-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    m_peer = new wxMacControl() ;
-    verify_noerr ( CreateProgressBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 
-     GetValue() , 0 , GetRange() , false /* not indeterminate */ , *m_peer ) );
-    
-       
-    MacPostControlCreate(pos,size) ;
+    wxSize size = s;
+
+#if 0
+    if (size.x == wxDefaultCoord && size.y == wxDefaultCoord)
+        size = wxSize( 200 , 16 );
+#endif
+
+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );
+    m_peer = new wxMacControl( this );
+    OSStatus err = CreateProgressBarControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
+        GetValue(), 0, GetRange(), false /* not indeterminate */, m_peer->GetControlRefAddr() );
+    verify_noerr( err );
+
+    if ( GetValue() == 0 )
+        m_peer->SetData<Boolean>( kControlEntireControl, kControlProgressBarAnimatingTag, (Boolean)false );
+
+    MacPostControlCreate( pos, size );
     
-    return TRUE;
+    return true;
 }
 
 void wxGauge::SetRange(int r)
 {
     // we are going via the base class in case there is 
     // some change behind the values by it
-    wxGaugeBase::SetRange(r) ;
+    wxGaugeBase::SetRange( r ) ;
     if ( m_peer && m_peer->Ok() )
         m_peer->SetMaximum( GetRange() ) ;
 }
@@ -65,17 +68,32 @@ void wxGauge::SetValue(int pos)
 {
     // we are going via the base class in case there is 
     // some change behind the values by it
-    wxGaugeBase::SetValue(pos) ;
+    wxGaugeBase::SetValue( pos ) ;
+
     if ( m_peer && m_peer->Ok() )
+    {
         m_peer->SetValue( GetValue() ) ;
+
+        // turn off animation in the unnecessary situations as this is consuming 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
 {
-/*
+#if 0
     if ( m_peer && m_peer->Ok() )
         return m_peer->GetValue() ;
-*/
+#endif
+
     return m_gaugePos ;
 }
 
+#endif // wxUSE_GAUGE
+