wxSYS_COLOUR_WINDOW is better for window backgrounds on PPC/Smartphone

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

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index bfdbe410dce810c2949f8b9908ae499f54ebb75d..c10665e40242a286ed494e5b1b31ed83f45218c0 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -9,10 +9,14 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "gauge.h"
 #endif
 
 #pragma implementation "gauge.h"
 #endif
 

+#include "wx/wxprec.h"
+
+#if wxUSE_GAUGE 
+

 #include "wx/gauge.h"
 
 #if !USE_SHARED_LIBRARY
 #include "wx/gauge.h"
 
 #if !USE_SHARED_LIBRARY


@@ -35,18 +39,20 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
         return false;
 
     wxSize size = s ;
         return false;
 
     wxSize size = s ;

-
-    if ( size.x == wxDefaultSize.x && size.y == wxDefaultSize.y)
+    /*
+    if ( size.x == wxDefaultCoord && size.y == wxDefaultCoord)

     {
         size = wxSize( 200 , 16 ) ;
     }
     {
         size = wxSize( 200 , 16 ) ;
     }

-    
+    */

     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl(this) ;

     verify_noerr ( CreateProgressBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 
     verify_noerr ( CreateProgressBarControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 

-     GetValue() , 0 , GetRange() , false /* not indeterminate */ , *m_peer ) );
-    
-       
+     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;
     MacPostControlCreate(pos,size) ;
     
     return TRUE;


@@ -67,7 +73,19 @@ void wxGauge::SetValue(int pos)
     // some change behind the values by it
     wxGaugeBase::SetValue(pos) ;
     if ( m_peer && m_peer->Ok() )
     // some change behind the values by it
     wxGaugeBase::SetValue(pos) ;
     if ( m_peer && m_peer->Ok() )

+    {

         m_peer->SetValue( GetValue() ) ;
         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
 }
 
 int wxGauge::GetValue() const


@@ -79,3 +97,5 @@ int wxGauge::GetValue() const
     return m_gaugePos ;
 }
 
     return m_gaugePos ;
 }
 

+#endif // wxUSE_GAUGE 
+